| author | |
| committer | |
| log | c01d8c8b20514add5bb7b7a10ab570d2ae72df4d |
| tree | 36c554d3f8ab5fc4bd9b3b5a72fcd5f06e2080e4 |
| parent | 06d9f88f971143db8adca936aa9dddf74f564729 |
4 files changed, 11 insertions(+), 2 deletions(-)
build.zig+2| ... | ... | @@ -489,6 +489,7 @@ pub fn build(b: *std.Build) !void { |
| 489 | 489 | .skip_single_threaded = true, |
| 490 | 490 | .skip_non_native = skip_non_native, |
| 491 | 491 | .skip_libc = true, |
| 492 | .no_builtin = true, | |
| 492 | 493 | })); |
| 493 | 494 | |
| 494 | 495 | test_step.dependOn(tests.addModuleTests(b, .{ |
| ... | ... | @@ -501,6 +502,7 @@ pub fn build(b: *std.Build) !void { |
| 501 | 502 | .skip_single_threaded = true, |
| 502 | 503 | .skip_non_native = skip_non_native, |
| 503 | 504 | .skip_libc = true, |
| 505 | .no_builtin = true, | |
| 504 | 506 | })); |
| 505 | 507 | |
| 506 | 508 | test_step.dependOn(tests.addCompareOutputTests(b, test_filters, optimization_modes)); |
lib/std/Build/Step/Compile.zig+6| ... | ... | @@ -211,6 +211,8 @@ is_linking_libc: bool = false, |
| 211 | 211 | /// Computed during make(). |
| 212 | 212 | is_linking_libcpp: bool = false, |
| 213 | 213 | |
| 214 | no_builtin: bool = false, | |
| 215 | ||
| 214 | 216 | pub const ExpectedCompileErrors = union(enum) { |
| 215 | 217 | contains: []const u8, |
| 216 | 218 | exact: []const []const u8, |
| ... | ... | @@ -1572,6 +1574,10 @@ fn make(step: *Step, prog_node: std.Progress.Node) !void { |
| 1572 | 1574 | } |
| 1573 | 1575 | } |
| 1574 | 1576 | |
| 1577 | if (compile.no_builtin) { | |
| 1578 | try zig_args.append("-fno-builtin"); | |
| 1579 | } | |
| 1580 | ||
| 1575 | 1581 | if (b.sysroot) |sysroot| { |
| 1576 | 1582 | try zig_args.appendSlice(&[_][]const u8{ "--sysroot", sysroot }); |
| 1577 | 1583 | } |
src/codegen/llvm.zig+1-2| ... | ... | @@ -3115,8 +3115,7 @@ pub const Object = struct { |
| 3115 | 3115 | |
| 3116 | 3116 | try variable_index.setInitializer(try o.lowerValue(decl_val), &o.builder); |
| 3117 | 3117 | variable_index.setLinkage(.internal, &o.builder); |
| 3118 | const llvm_miscompiles_const_anon = o.module.getTarget().isDarwin(); | |
| 3119 | if (!llvm_miscompiles_const_anon) variable_index.setMutability(.constant, &o.builder); | |
| 3118 | variable_index.setMutability(.constant, &o.builder); | |
| 3120 | 3119 | variable_index.setUnnamedAddr(.unnamed_addr, &o.builder); |
| 3121 | 3120 | variable_index.setAlignment(alignment.toLlvm(), &o.builder); |
| 3122 | 3121 | return variable_index; |
test/tests.zig+2| ... | ... | @@ -984,6 +984,7 @@ const ModuleTestOptions = struct { |
| 984 | 984 | skip_non_native: bool, |
| 985 | 985 | skip_libc: bool, |
| 986 | 986 | max_rss: usize = 0, |
| 987 | no_builtin: bool = false, | |
| 987 | 988 | }; |
| 988 | 989 | |
| 989 | 990 | pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step { |
| ... | ... | @@ -1070,6 +1071,7 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step { |
| 1070 | 1071 | .pic = test_target.pic, |
| 1071 | 1072 | .strip = test_target.strip, |
| 1072 | 1073 | }); |
| 1074 | if (options.no_builtin) these_tests.no_builtin = true; | |
| 1073 | 1075 | const single_threaded_suffix = if (test_target.single_threaded == true) "-single" else ""; |
| 1074 | 1076 | const backend_suffix = if (test_target.use_llvm == true) |
| 1075 | 1077 | "-llvm" |