diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-11-29 15:28:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-29 15:28:54 -0500 |
| commit | a47aa9dd9d7f950427aacc360f1302e636234bc2 (patch) | |
| tree | a3e4a4fcab9e49f6adb8a5cfdc719f51b5ea4fd4 /src | |
| parent | c3821fe4ca8d98d07454fddf2bf25bfc8d7817f2 (diff) | |
| parent | 78b8ce5095abf6516dc414b8cf487acedbd0ce99 (diff) | |
| download | zig-a47aa9dd9d7f950427aacc360f1302e636234bc2.tar.gz zig-a47aa9dd9d7f950427aacc360f1302e636234bc2.zip | |
Merge pull request #22095 from alexrp/test-llvm-emit
Change `llvm_targets` tests to actually emit objects, and fix bugs found as a result
Diffstat (limited to 'src')
| -rw-r--r-- | src/codegen/llvm.zig | 3 | ||||
| -rw-r--r-- | src/link/MachO.zig | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index 737aa51107..0a755e25a8 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -280,8 +280,7 @@ pub fn targetTriple(allocator: Allocator, target: std.Target) ![]const u8 { .cygnus => "cygnus", .simulator => "simulator", .macabi => "macabi", - .ohos => "ohos", - .ohoseabi => "ohoseabi", + .ohos, .ohoseabi => "ohos", }; try llvm_triple.appendSlice(llvm_abi); diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 1ffcabb1f5..9cfe839ca3 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -4191,7 +4191,11 @@ pub const Platform = struct { return .{ .os_tag = target.os.tag, .abi = target.abi, - .version = target.os.version_range.semver.min, + // This should use semver once we determine the version history. + .version = if (target.os.tag == .bridgeos) + .{ .major = 0, .minor = 0, .patch = 0 } + else + target.os.version_range.semver.min, }; } |