diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-05-14 15:21:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-14 15:21:17 -0400 |
| commit | 826d833416be0fa696cbe8785173997338e185bb (patch) | |
| tree | 25567543887dcd5de646593a66a2d52b3683326d /src | |
| parent | a52e47230718c6e38dfd84ac0571a597ecd9719f (diff) | |
| parent | 90a54f06e507e11ccf07c1378fe4a12b002ec2bd (diff) | |
| download | zig-826d833416be0fa696cbe8785173997338e185bb.tar.gz zig-826d833416be0fa696cbe8785173997338e185bb.zip | |
Merge pull request #8746 from koachan/sparc64-fixes
Various Linux/SPARCv9 fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/glibc.zig | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/glibc.zig b/src/glibc.zig index 6b288ac46d..04673e639b 100644 --- a/src/glibc.zig +++ b/src/glibc.zig @@ -446,10 +446,14 @@ fn start_asm_path(comp: *Compilation, arena: *Allocator, basename: []const u8) ! try result.appendSlice(comp.zig_lib_directory.path.?); try result.appendSlice(s ++ "libc" ++ s ++ "glibc" ++ s ++ "sysdeps" ++ s); if (is_sparc) { - if (is_64) { - try result.appendSlice("sparc" ++ s ++ "sparc64"); + if (mem.eql(u8, basename, "crti.S") or mem.eql(u8, basename, "crtn.S")) { + try result.appendSlice("sparc"); } else { - try result.appendSlice("sparc" ++ s ++ "sparc32"); + if (is_64) { + try result.appendSlice("sparc" ++ s ++ "sparc64"); + } else { + try result.appendSlice("sparc" ++ s ++ "sparc32"); + } } } else if (arch.isARM()) { try result.appendSlice("arm"); |