diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-12-15 18:59:59 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-12-15 19:09:50 -0700 |
| commit | 5b6d26e97bb97d79782f3c77b02a997e361a1497 (patch) | |
| tree | 5f969f672bcdd9c1a10b62fa5428401184587484 /test/tests.zig | |
| parent | e977455f7c5693369d547c4d9b2e0b902f578d65 (diff) | |
| download | zig-5b6d26e97bb97d79782f3c77b02a997e361a1497.tar.gz zig-5b6d26e97bb97d79782f3c77b02a997e361a1497.zip | |
glibc: fix inconsistency of mips ABI mapping
Before this commit, glibc headers did the following mapping:
* (zig) mipsel-linux-gnu => (glibc) mipsel-linux-gnu
* (zig) mipsel-linux-gnu-soft => (glibc) (none)
* (zig) mips-linux-gnu => (glibc) mips-linux-gnu
* (zig) mips-linux-gnu-soft => (glibc) (none)
While the glibc ABI stubs used the (zig) gnueabi and gnueabihf ABIs,
and the stage2 available_libcs array listed:
* (zig) mipsel-linux-gnu
* (zig) mips-linux-gnu
The problem is the mismatch between the ABI component of the headers and
the stubs.
This commit makes the following clarifications:
* (zig) mips-linux-gnueabi means soft-float
* (zig) mipsel-linux-gnueabi means soft-float
* (zig) mips-linux-gnueabihf means hard-float
* (zig) mipsel-linux-gnueabihf means hard-float
Consequently, the glibc headers now do this mapping:
* (zig) mips-linux-gnueabihf => (glibc) mips-linux-gnu
* (zig) mipsel-linux-gnueabihf => (glibc) mipsel-linux-gnu
* (zig) mips-linux-gnueabi => (glibc) mips-linux-gnu-soft
* (zig) mipsel-linux-gnueabi => (glibc) mipsel-linux-gnu-soft
The glibc ABI stubs are unchanged, and the stage2 available_libcs
array's 2 entries are modified and it gains 2 more:
* (zig) mipsel-linux-gnueabi
* (zig) mipsel-linux-gnueabihf
* (zig) mips-linux-gnueabi
* (zig) mips-linux-gnueabihf
Now everything is consistent. Zig no longer recognizes a `mips-linux-gnu`
triple; one must use `mips-linux-gnueabi` (soft float) or
`mips-linux-gnueabihf` (hard float).
Diffstat (limited to 'test/tests.zig')
| -rw-r--r-- | test/tests.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/tests.zig b/test/tests.zig index 99d84d14a7..306f1e829c 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -189,7 +189,7 @@ const test_targets = blk: { // .target = .{ // .cpu_arch = .mips, // .os_tag = .linux, - // .abi = .gnu, + // .abi = .gnueabihf, // }, // .link_libc = true, //}, @@ -216,7 +216,7 @@ const test_targets = blk: { // .target = .{ // .cpu_arch = .mipsel, // .os_tag = .linux, - // .abi = .gnu, + // .abi = .gnueabihf, // }, // .link_libc = true, //}, |