authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-09-22 05:04:31+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-09-22 05:04:31+02:00
log26825e95066c104585d248787c0e56ce4e8413e0
treeca505fa2a5cc4a4eff3b66b8e35977bb12940ec9
parentf58200e3f2967a06f343c9fc9dcae9de18def92a
parent16c18b835e16bae7a0f85caa29457f4ae4b7b417
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #25324 from alexrp/freebsd

Some changes to prepare for FreeBSD CI

10 files changed, 165 insertions(+), 6 deletions(-)

ci/x86_64-freebsd-debug.sh created+71
...@@ -0,0 +1,71 @@
1#!/bin/sh
2
3# Requires cmake ninja-build
4
5set -x
6set -e
7
8ARCH="x86_64"
9TARGET="$ARCH-freebsd-none"
10MCPU="baseline"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.312+164c598cd"
12PREFIX="$HOME/deps/$CACHE_BASENAME"
13ZIG="$PREFIX/bin/zig"
14
15# Make the `zig version` number consistent.
16# This will affect the cmake command below.
17git fetch --unshallow || true
18git fetch --tags
19
20# Override the cache directories because they won't actually help other CI runs
21# which will be testing alternate versions of zig, and ultimately would just
22# fill up space on the hard drive for no reason.
23export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
24export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
25
26mkdir build-debug
27cd build-debug
28
29export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
30export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
31
32cmake .. \
33 -DCMAKE_INSTALL_PREFIX="stage3-debug" \
34 -DCMAKE_PREFIX_PATH="$PREFIX" \
35 -DCMAKE_BUILD_TYPE=Debug \
36 -DZIG_TARGET_TRIPLE="$TARGET" \
37 -DZIG_TARGET_MCPU="$MCPU" \
38 -DZIG_STATIC=ON \
39 -DZIG_NO_LIB=ON \
40 -GNinja \
41 -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
42 -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
43# https://github.com/ziglang/zig/issues/22213
44
45# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
46# so that installation and testing do not get affected by them.
47unset CC
48unset CXX
49
50ninja install
51
52stage3-debug/bin/zig build test docs \
53 --maxrss 32212254720 \
54 -Dstatic-llvm \
55 -Dskip-linux \
56 -Dskip-netbsd \
57 -Dskip-windows \
58 -Dskip-macos \
59 -Dtarget=native-native-none \
60 --search-prefix "$PREFIX" \
61 --zig-lib-dir "$PWD/../lib"
62
63stage3-debug/bin/zig build \
64 --prefix stage4-debug \
65 -Denable-llvm \
66 -Dno-lib \
67 -Dtarget=$TARGET \
68 -Duse-zig-libcxx \
69 -Dversion-string="$(stage3-debug/bin/zig version)"
70
71stage4-debug/bin/zig test ../test/behavior.zig
ci/x86_64-freebsd-release.sh created+77
...@@ -0,0 +1,77 @@
1#!/bin/sh
2
3# Requires cmake ninja-build
4
5set -x
6set -e
7
8ARCH="x86_64"
9TARGET="$ARCH-freebsd-none"
10MCPU="baseline"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.312+164c598cd"
12PREFIX="$HOME/deps/$CACHE_BASENAME"
13ZIG="$PREFIX/bin/zig"
14
15# Make the `zig version` number consistent.
16# This will affect the cmake command below.
17git fetch --unshallow || true
18git fetch --tags
19
20# Override the cache directories because they won't actually help other CI runs
21# which will be testing alternate versions of zig, and ultimately would just
22# fill up space on the hard drive for no reason.
23export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
24export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
25
26mkdir build-release
27cd build-release
28
29export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
30export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
31
32cmake .. \
33 -DCMAKE_INSTALL_PREFIX="stage3-release" \
34 -DCMAKE_PREFIX_PATH="$PREFIX" \
35 -DCMAKE_BUILD_TYPE=Release \
36 -DZIG_TARGET_TRIPLE="$TARGET" \
37 -DZIG_TARGET_MCPU="$MCPU" \
38 -DZIG_STATIC=ON \
39 -DZIG_NO_LIB=ON \
40 -GNinja \
41 -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
42 -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
43# https://github.com/ziglang/zig/issues/22213
44
45# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
46# so that installation and testing do not get affected by them.
47unset CC
48unset CXX
49
50ninja install
51
52stage3-release/bin/zig build test docs \
53 --maxrss 32212254720 \
54 -Dstatic-llvm \
55 -Dskip-linux \
56 -Dskip-netbsd \
57 -Dskip-windows \
58 -Dskip-macos \
59 -Dtarget=native-native-none \
60 --search-prefix "$PREFIX" \
61 --zig-lib-dir "$PWD/../lib"
62
63# Ensure that stage3 and stage4 are byte-for-byte identical.
64stage3-release/bin/zig build \
65 --prefix stage4-release \
66 -Denable-llvm \
67 -Dno-lib \
68 -Doptimize=ReleaseFast \
69 -Dstrip \
70 -Dtarget=$TARGET \
71 -Duse-zig-libcxx \
72 -Dversion-string="$(stage3-release/bin/zig version)"
73
74# diff returns an error code if the files differ.
75echo "If the following command fails, it means nondeterminism has been"
76echo "introduced, making stage3 and stage4 no longer byte-for-byte identical."
77diff stage3-release/bin/zig stage4-release/bin/zig
ci/x86_64-linux-release.sh+1
...@@ -65,6 +65,7 @@ stage3-release/bin/zig build test docs \...@@ -65,6 +65,7 @@ stage3-release/bin/zig build test docs \
65 -fqemu \65 -fqemu \
66 -fwasmtime \66 -fwasmtime \
67 -Dstatic-llvm \67 -Dstatic-llvm \
68 -Dskip-freebsd \
68 -Dtarget=native-native-musl \69 -Dtarget=native-native-musl \
69 --search-prefix "$PREFIX" \70 --search-prefix "$PREFIX" \
70 --zig-lib-dir "$PWD/../lib" \71 --zig-lib-dir "$PWD/../lib" \
lib/std/posix/test.zig-1
...@@ -644,7 +644,6 @@ test "sigrtmin/max" {...@@ -644,7 +644,6 @@ test "sigrtmin/max" {
644 try std.testing.expect(posix.sigrtmin() >= 32);644 try std.testing.expect(posix.sigrtmin() >= 32);
645 try std.testing.expect(posix.sigrtmin() >= posix.system.sigrtmin());645 try std.testing.expect(posix.sigrtmin() >= posix.system.sigrtmin());
646 try std.testing.expect(posix.sigrtmin() < posix.system.sigrtmax());646 try std.testing.expect(posix.sigrtmin() < posix.system.sigrtmax());
647 try std.testing.expect(posix.sigrtmax() < posix.NSIG);
648}647}
649648
650test "sigset empty/full" {649test "sigset empty/full" {
src/target.zig+1-1
...@@ -245,7 +245,7 @@ pub fn hasNewLinkerSupport(ofmt: std.Target.ObjectFormat) bool {...@@ -245,7 +245,7 @@ pub fn hasNewLinkerSupport(ofmt: std.Target.ObjectFormat) bool {
245pub fn selfHostedBackendIsAsRobustAsLlvm(target: *const std.Target) bool {245pub fn selfHostedBackendIsAsRobustAsLlvm(target: *const std.Target) bool {
246 if (target.cpu.arch.isSpirV()) return true;246 if (target.cpu.arch.isSpirV()) return true;
247 if (target.cpu.arch == .x86_64 and target.ptrBitWidth() == 64) {247 if (target.cpu.arch == .x86_64 and target.ptrBitWidth() == 64) {
248 if (target.os.tag == .netbsd or target.os.tag == .openbsd) {248 if (target.os.tag.isBSD()) {
249 // Self-hosted linker needs work: https://github.com/ziglang/zig/issues/24341249 // Self-hosted linker needs work: https://github.com/ziglang/zig/issues/24341
250 return false;250 return false;
251 }251 }
test/link/elf.zig+4
...@@ -2,6 +2,9 @@ pub fn testAll(b: *Build, build_opts: BuildOptions) *Step {...@@ -2,6 +2,9 @@ pub fn testAll(b: *Build, build_opts: BuildOptions) *Step {
2 _ = build_opts;2 _ = build_opts;
3 const elf_step = b.step("test-elf", "Run ELF tests");3 const elf_step = b.step("test-elf", "Run ELF tests");
44
5 // https://github.com/ziglang/zig/issues/25323
6 if (builtin.os.tag == .freebsd) return elf_step;
7
5 const default_target = b.resolveTargetQuery(.{8 const default_target = b.resolveTargetQuery(.{
6 .cpu_arch = .x86_64, // TODO relax this once ELF linker is able to handle other archs9 .cpu_arch = .x86_64, // TODO relax this once ELF linker is able to handle other archs
7 .os_tag = .linux,10 .os_tag = .linux,
...@@ -4285,6 +4288,7 @@ const addStaticLibrary = link.addStaticLibrary;...@@ -4285,6 +4288,7 @@ const addStaticLibrary = link.addStaticLibrary;
4285const expectLinkErrors = link.expectLinkErrors;4288const expectLinkErrors = link.expectLinkErrors;
4286const link = @import("link.zig");4289const link = @import("link.zig");
4287const std = @import("std");4290const std = @import("std");
4291const builtin = @import("builtin");
42884292
4289const Build = std.Build;4293const Build = std.Build;
4290const BuildOptions = link.BuildOptions;4294const BuildOptions = link.BuildOptions;
test/src/StackTrace.zig+1-1
...@@ -45,7 +45,7 @@ fn addCaseInner(self: *StackTrace, config: Config, use_llvm: bool) void {...@@ -45,7 +45,7 @@ fn addCaseInner(self: *StackTrace, config: Config, use_llvm: bool) void {
45fn shouldTestNonLlvm(target: *const std.Target) bool {45fn shouldTestNonLlvm(target: *const std.Target) bool {
46 return switch (target.cpu.arch) {46 return switch (target.cpu.arch) {
47 .x86_64 => switch (target.ofmt) {47 .x86_64 => switch (target.ofmt) {
48 .elf => true,48 .elf => !target.os.tag.isBSD(),
49 else => false,49 else => false,
50 },50 },
51 else => false,51 else => false,
test/stack_traces.zig+2
...@@ -803,6 +803,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {...@@ -803,6 +803,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
803 .s390x,803 .s390x,
804 },804 },
805 .exclude_os = &.{805 .exclude_os = &.{
806 .freebsd,
806 .openbsd, // integer overflow807 .openbsd, // integer overflow
807 .windows, // TODO intermittent failures808 .windows, // TODO intermittent failures
808 },809 },
...@@ -847,6 +848,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {...@@ -847,6 +848,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
847 },848 },
848 .ReleaseSafe = .{849 .ReleaseSafe = .{
849 .exclude_os = &.{850 .exclude_os = &.{
851 .freebsd,
850 .windows, // TODO852 .windows, // TODO
851 .linux, // defeated by aggressive inlining853 .linux, // defeated by aggressive inlining
852 .macos, // Broken in LLVM 20.854 .macos, // Broken in LLVM 20.
test/standalone/stack_iterator/build.zig+6-2
...@@ -61,8 +61,12 @@ pub fn build(b: *std.Build) void {...@@ -61,8 +61,12 @@ pub fn build(b: *std.Build) void {
61 .use_llvm = true,61 .use_llvm = true,
62 });62 });
6363
64 const run_cmd = b.addRunArtifact(exe);64 if (builtin.os.tag != .freebsd) {
65 test_step.dependOn(&run_cmd.step);65 const run_cmd = b.addRunArtifact(exe);
66 test_step.dependOn(&run_cmd.step);
67 } else {
68 test_step.dependOn(&exe.step);
69 }
66 }70 }
6771
68 // https://github.com/ziglang/zig/issues/2452272 // https://github.com/ziglang/zig/issues/24522
test/tests.zig+2-1
...@@ -2451,8 +2451,9 @@ pub fn wouldUseLlvm(use_llvm: ?bool, query: std.Target.Query, optimize_mode: Opt...@@ -2451,8 +2451,9 @@ pub fn wouldUseLlvm(use_llvm: ?bool, query: std.Target.Query, optimize_mode: Opt
2451 else => return true,2451 else => return true,
2452 }2452 }
2453 const cpu_arch = query.cpu_arch orelse builtin.cpu.arch;2453 const cpu_arch = query.cpu_arch orelse builtin.cpu.arch;
2454 const os_tag = query.os_tag orelse builtin.os.tag;
2454 switch (cpu_arch) {2455 switch (cpu_arch) {
2455 .x86_64 => if (std.Target.ptrBitWidth_arch_abi(cpu_arch, query.abi orelse .none) != 64) return true,2456 .x86_64 => if (os_tag.isBSD() or std.Target.ptrBitWidth_arch_abi(cpu_arch, query.abi orelse .none) != 64) return true,
2456 .spirv32, .spirv64 => return false,2457 .spirv32, .spirv64 => return false,
2457 else => return true,2458 else => return true,
2458 }2459 }