From c339aa655e58a3ecc22f21354b2d6584509a7dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Fri, 2 Aug 2024 09:22:57 +0200 Subject: [PATCH 1/8] main: Give a more helpful message when we have a minimum glibc version. --- src/main.zig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main.zig b/src/main.zig index d7f7e006db..a023e7d8ec 100644 --- a/src/main.zig +++ b/src/main.zig @@ -3412,6 +3412,14 @@ fn buildOutputType( std.log.info("zig can provide libc for related target {s}-{s}.{d}-{s}", .{ @tagName(t.arch), @tagName(t.os), os_ver.major, @tagName(t.abi), }); + } else if (t.glibc_min) |glibc_min| { + std.log.info("zig can provide libc for related target {s}-{s}-{s}.{d}.{d}", .{ + @tagName(t.arch), + @tagName(t.os), + @tagName(t.abi), + glibc_min.major, + glibc_min.minor, + }); } else { std.log.info("zig can provide libc for related target {s}-{s}-{s}", .{ @tagName(t.arch), @tagName(t.os), @tagName(t.abi), From 948bc91d12e147b46d54d82af5e9a9bc2ce25573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Fri, 2 Aug 2024 09:52:19 +0200 Subject: [PATCH 2/8] std.Target.VersionRange: Make default() respect the minimum glibc version. --- lib/std/Target.zig | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 8d9f596072..87bdffa5a0 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -483,7 +483,21 @@ pub const Os = struct { .min = .{ .major = 4, .minor = 19, .patch = 0 }, .max = .{ .major = 6, .minor = 5, .patch = 7 }, }, - .glibc = .{ .major = 2, .minor = 28, .patch = 0 }, + .glibc = blk: { + const default_min = .{ .major = 2, .minor = 28, .patch = 0 }; + + for (std.zig.target.available_libcs) |libc| { + // We don't know the ABI here. We can get away with not checking it + // for now, but that may not always remain true. + if (libc.os != tag or libc.arch != arch) continue; + + if (libc.glibc_min) |min| { + if (min.order(default_min) == .gt) break :blk min; + } + } + + break :blk default_min; + }, }, }, From 3c2733de6e20926b5113236296177e1b2a576423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Fri, 2 Aug 2024 08:44:09 +0200 Subject: [PATCH 3/8] std.Target: Use a saner default dynamic linker path for riscv. The vast majority of Linux systems will be running these ABIs. --- lib/std/Target.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 87bdffa5a0..de9729a6bc 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -1742,8 +1742,8 @@ pub const DynamicLinker = struct { else => "/lib64/ld-linux-x86-64.so.2", }), - .riscv32 => init("/lib/ld-linux-riscv32-ilp32.so.1"), - .riscv64 => init("/lib/ld-linux-riscv64-lp64.so.1"), + .riscv32 => init("/lib/ld-linux-riscv32-ilp32d.so.1"), + .riscv64 => init("/lib/ld-linux-riscv64-lp64d.so.1"), // Architectures in this list have been verified as not having a standard // dynamic linker path. From 635a3d87de03193f28bb840957e387981365566f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Fri, 2 Aug 2024 08:13:00 +0200 Subject: [PATCH 4/8] glibc: Change riscv32-linux-gnuilp32 target triple to riscv32-linux-gnu. This target triple was weird on multiple levels: * The `ilp32` ABI is the soft float ABI. This is not the main ABI we want to support on RISC-V; rather, we want `ilp32d`. * `gnuilp32` is a bespoke tag that was introduced in Zig. The rest of the world just uses `gnu` for RISC-V target triples. * `gnu_ilp32` is already the name of an ILP32 ABI used on AArch64. `gnuilp32` is too easy to confuse with this. * We don't use this convention for `riscv64-linux-gnu`. * Supporting all RISC-V ABIs with this convention will result in combinatorial explosion; see #20690. --- .../bits/endianness.h | 0 .../bits/environments.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/fcntl.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/fenv.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/floatn.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/link.h | 0 .../bits/long-double.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/procfs.h | 0 .../bits/pthreadtypes-arch.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/rseq.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/setjmp.h | 0 .../bits/sigcontext.h | 0 .../bits/struct_rwlock.h | 0 .../bits/struct_stat.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/time64.h | 0 .../bits/timesize.h | 0 .../bits/typesizes.h | 0 .../bits/wordsize.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/fpu_control.h | 0 .../gnu/lib-names-ilp32.h | 0 .../gnu/lib-names.h | 0 .../gnu/stubs-ilp32.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/gnu/stubs.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/ieee754.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/sys/asm.h | 0 .../sys/cachectl.h | 0 .../sys/ucontext.h | 0 .../{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/sys/user.h | 0 lib/std/zig/target.zig | 2 +- src/target.zig | 1 - tools/process_headers.zig | 2 +- 31 files changed, 2 insertions(+), 3 deletions(-) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/endianness.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/environments.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/fcntl.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/fenv.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/floatn.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/link.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/long-double.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/procfs.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/pthreadtypes-arch.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/rseq.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/setjmp.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/sigcontext.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/struct_rwlock.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/struct_stat.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/time64.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/timesize.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/typesizes.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/bits/wordsize.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/fpu_control.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/gnu/lib-names-ilp32.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/gnu/lib-names.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/gnu/stubs-ilp32.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/gnu/stubs.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/ieee754.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/sys/asm.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/sys/cachectl.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/sys/ucontext.h (100%) rename lib/libc/include/{riscv32-linux-gnuilp32 => riscv32-linux-gnu}/sys/user.h (100%) diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/endianness.h b/lib/libc/include/riscv32-linux-gnu/bits/endianness.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/endianness.h rename to lib/libc/include/riscv32-linux-gnu/bits/endianness.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/environments.h b/lib/libc/include/riscv32-linux-gnu/bits/environments.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/environments.h rename to lib/libc/include/riscv32-linux-gnu/bits/environments.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/fcntl.h b/lib/libc/include/riscv32-linux-gnu/bits/fcntl.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/fcntl.h rename to lib/libc/include/riscv32-linux-gnu/bits/fcntl.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/fenv.h b/lib/libc/include/riscv32-linux-gnu/bits/fenv.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/fenv.h rename to lib/libc/include/riscv32-linux-gnu/bits/fenv.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/floatn.h b/lib/libc/include/riscv32-linux-gnu/bits/floatn.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/floatn.h rename to lib/libc/include/riscv32-linux-gnu/bits/floatn.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/link.h b/lib/libc/include/riscv32-linux-gnu/bits/link.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/link.h rename to lib/libc/include/riscv32-linux-gnu/bits/link.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/long-double.h b/lib/libc/include/riscv32-linux-gnu/bits/long-double.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/long-double.h rename to lib/libc/include/riscv32-linux-gnu/bits/long-double.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/procfs.h b/lib/libc/include/riscv32-linux-gnu/bits/procfs.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/procfs.h rename to lib/libc/include/riscv32-linux-gnu/bits/procfs.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/pthreadtypes-arch.h b/lib/libc/include/riscv32-linux-gnu/bits/pthreadtypes-arch.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/pthreadtypes-arch.h rename to lib/libc/include/riscv32-linux-gnu/bits/pthreadtypes-arch.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/rseq.h b/lib/libc/include/riscv32-linux-gnu/bits/rseq.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/rseq.h rename to lib/libc/include/riscv32-linux-gnu/bits/rseq.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/setjmp.h b/lib/libc/include/riscv32-linux-gnu/bits/setjmp.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/setjmp.h rename to lib/libc/include/riscv32-linux-gnu/bits/setjmp.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/sigcontext.h b/lib/libc/include/riscv32-linux-gnu/bits/sigcontext.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/sigcontext.h rename to lib/libc/include/riscv32-linux-gnu/bits/sigcontext.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/struct_rwlock.h b/lib/libc/include/riscv32-linux-gnu/bits/struct_rwlock.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/struct_rwlock.h rename to lib/libc/include/riscv32-linux-gnu/bits/struct_rwlock.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/struct_stat.h b/lib/libc/include/riscv32-linux-gnu/bits/struct_stat.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/struct_stat.h rename to lib/libc/include/riscv32-linux-gnu/bits/struct_stat.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/time64.h b/lib/libc/include/riscv32-linux-gnu/bits/time64.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/time64.h rename to lib/libc/include/riscv32-linux-gnu/bits/time64.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/timesize.h b/lib/libc/include/riscv32-linux-gnu/bits/timesize.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/timesize.h rename to lib/libc/include/riscv32-linux-gnu/bits/timesize.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/typesizes.h b/lib/libc/include/riscv32-linux-gnu/bits/typesizes.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/typesizes.h rename to lib/libc/include/riscv32-linux-gnu/bits/typesizes.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/bits/wordsize.h b/lib/libc/include/riscv32-linux-gnu/bits/wordsize.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/bits/wordsize.h rename to lib/libc/include/riscv32-linux-gnu/bits/wordsize.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/fpu_control.h b/lib/libc/include/riscv32-linux-gnu/fpu_control.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/fpu_control.h rename to lib/libc/include/riscv32-linux-gnu/fpu_control.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/gnu/lib-names-ilp32.h b/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/gnu/lib-names-ilp32.h rename to lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/gnu/lib-names.h b/lib/libc/include/riscv32-linux-gnu/gnu/lib-names.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/gnu/lib-names.h rename to lib/libc/include/riscv32-linux-gnu/gnu/lib-names.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/gnu/stubs-ilp32.h b/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/gnu/stubs-ilp32.h rename to lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/gnu/stubs.h b/lib/libc/include/riscv32-linux-gnu/gnu/stubs.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/gnu/stubs.h rename to lib/libc/include/riscv32-linux-gnu/gnu/stubs.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/ieee754.h b/lib/libc/include/riscv32-linux-gnu/ieee754.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/ieee754.h rename to lib/libc/include/riscv32-linux-gnu/ieee754.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/sys/asm.h b/lib/libc/include/riscv32-linux-gnu/sys/asm.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/sys/asm.h rename to lib/libc/include/riscv32-linux-gnu/sys/asm.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/sys/cachectl.h b/lib/libc/include/riscv32-linux-gnu/sys/cachectl.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/sys/cachectl.h rename to lib/libc/include/riscv32-linux-gnu/sys/cachectl.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/sys/ucontext.h b/lib/libc/include/riscv32-linux-gnu/sys/ucontext.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/sys/ucontext.h rename to lib/libc/include/riscv32-linux-gnu/sys/ucontext.h diff --git a/lib/libc/include/riscv32-linux-gnuilp32/sys/user.h b/lib/libc/include/riscv32-linux-gnu/sys/user.h similarity index 100% rename from lib/libc/include/riscv32-linux-gnuilp32/sys/user.h rename to lib/libc/include/riscv32-linux-gnu/sys/user.h diff --git a/lib/std/zig/target.zig b/lib/std/zig/target.zig index d86d47ba59..4974e0f22b 100644 --- a/lib/std/zig/target.zig +++ b/lib/std/zig/target.zig @@ -56,7 +56,7 @@ pub const available_libcs = [_]ArchOsAbi{ .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi }, .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf }, .{ .arch = .powerpc, .os = .linux, .abi = .musl }, - .{ .arch = .riscv32, .os = .linux, .abi = .gnuilp32, .glibc_min = .{ .major = 2, .minor = 33, .patch = 0 } }, + .{ .arch = .riscv32, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 33, .patch = 0 } }, .{ .arch = .riscv32, .os = .linux, .abi = .musl }, .{ .arch = .riscv64, .os = .linux, .abi = .gnu, .glibc_min = .{ .major = 2, .minor = 27, .patch = 0 } }, .{ .arch = .riscv64, .os = .linux, .abi = .musl }, diff --git a/src/target.zig b/src/target.zig index 768e4d957e..6cd5967d0e 100644 --- a/src/target.zig +++ b/src/target.zig @@ -369,7 +369,6 @@ pub fn addrSpaceCastIsValid( pub fn llvmMachineAbi(target: std.Target) ?[:0]const u8 { const have_float = switch (target.abi) { - .gnuilp32 => return "ilp32", .gnueabihf, .musleabihf, .eabihf => true, else => false, }; diff --git a/tools/process_headers.zig b/tools/process_headers.zig index a15481afa2..7bed1a91c7 100644 --- a/tools/process_headers.zig +++ b/tools/process_headers.zig @@ -162,7 +162,7 @@ const glibc_targets = [_]LibCTarget{ LibCTarget{ .name = "riscv32-linux-gnu-rv32imac-ilp32", .arch = MultiArch{ .specific = Arch.riscv32 }, - .abi = MultiAbi{ .specific = Abi.gnuilp32 }, + .abi = MultiAbi{ .specific = Abi.gnu }, }, LibCTarget{ .name = "riscv64-linux-gnu-rv64imac-lp64", From 3ebb8806635b8fb707dc0f260be902a9ae592ee0 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 2 Aug 2024 08:35:05 +0200 Subject: [PATCH 5/8] glibc: Replace ilp32/lp64 headers with ilp32d/lp64d. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The former are soft float; the latter are hard float. We primarily care about hard float here. Signed-off-by: Alex Rønne Petersen --- .../gnu/lib-names-ilp32d.h} | 8 ++++---- .../gnu/{stubs-ilp32.h => stubs-ilp32d.h} | 16 +--------------- .../gnu/lib-names-lp64d.h} | 8 ++++---- .../gnu/{stubs-lp64.h => stubs-lp64d.h} | 16 +--------------- 4 files changed, 10 insertions(+), 38 deletions(-) rename lib/libc/include/{riscv64-linux-gnu/gnu/lib-names-lp64.h => riscv32-linux-gnu/gnu/lib-names-ilp32d.h} (80%) rename lib/libc/include/riscv32-linux-gnu/gnu/{stubs-ilp32.h => stubs-ilp32d.h} (63%) rename lib/libc/include/{riscv32-linux-gnu/gnu/lib-names-ilp32.h => riscv64-linux-gnu/gnu/lib-names-lp64d.h} (82%) rename lib/libc/include/riscv64-linux-gnu/gnu/{stubs-lp64.h => stubs-lp64d.h} (63%) diff --git a/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64.h b/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32d.h similarity index 80% rename from lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64.h rename to lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32d.h index facadbf088..5d0f5d7d66 100644 --- a/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64.h +++ b/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32d.h @@ -1,10 +1,10 @@ /* This file is automatically generated. */ #ifndef __GNU_LIB_NAMES_H -# error "Never use directly; include instead." +# error "Never use directly; include instead." #endif -#define LD_LINUX_RISCV64_LP64_SO "ld-linux-riscv64-lp64.so.1" -#define LD_SO "ld-linux-riscv64-lp64.so.1" +#define LD_LINUX_RISCV32_ILP32D_SO "ld-linux-riscv32-ilp32d.so.1" +#define LD_SO "ld-linux-riscv32-ilp32d.so.1" #define LIBANL_SO "libanl.so.1" #define LIBBROKENLOCALE_SO "libBrokenLocale.so.1" #define LIBC_MALLOC_DEBUG_SO "libc_malloc_debug.so.0" @@ -24,4 +24,4 @@ #define LIBRESOLV_SO "libresolv.so.2" #define LIBRT_SO "librt.so.1" #define LIBTHREAD_DB_SO "libthread_db.so.1" -#define LIBUTIL_SO "libutil.so.1" \ No newline at end of file +#define LIBUTIL_SO "libutil.so.1" diff --git a/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h b/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32d.h similarity index 63% rename from lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h rename to lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32d.h index 6ce02418e6..4d4c0d146a 100644 --- a/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32.h +++ b/lib/libc/include/riscv32-linux-gnu/gnu/stubs-ilp32d.h @@ -14,25 +14,11 @@ #define __stub___compat_uselib #define __stub_chflags #define __stub_fchflags -#define __stub_feclearexcept #define __stub_fedisableexcept #define __stub_feenableexcept -#define __stub_fegetenv #define __stub_fegetexcept -#define __stub_fegetexceptflag -#define __stub_fegetmode -#define __stub_fegetround -#define __stub_feholdexcept -#define __stub_feraiseexcept -#define __stub_fesetenv -#define __stub_fesetexcept -#define __stub_fesetexceptflag -#define __stub_fesetmode -#define __stub_fesetround -#define __stub_fetestexcept -#define __stub_feupdateenv #define __stub_gtty #define __stub_revoke #define __stub_setlogin #define __stub_sigreturn -#define __stub_stty \ No newline at end of file +#define __stub_stty diff --git a/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h b/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64d.h similarity index 82% rename from lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h rename to lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64d.h index f7cf1ab8a2..e16743eb16 100644 --- a/lib/libc/include/riscv32-linux-gnu/gnu/lib-names-ilp32.h +++ b/lib/libc/include/riscv64-linux-gnu/gnu/lib-names-lp64d.h @@ -1,10 +1,10 @@ /* This file is automatically generated. */ #ifndef __GNU_LIB_NAMES_H -# error "Never use directly; include instead." +# error "Never use directly; include instead." #endif -#define LD_LINUX_RISCV32_ILP32_SO "ld-linux-riscv32-ilp32.so.1" -#define LD_SO "ld-linux-riscv32-ilp32.so.1" +#define LD_LINUX_RISCV64_LP64D_SO "ld-linux-riscv64-lp64d.so.1" +#define LD_SO "ld-linux-riscv64-lp64d.so.1" #define LIBANL_SO "libanl.so.1" #define LIBBROKENLOCALE_SO "libBrokenLocale.so.1" #define LIBC_MALLOC_DEBUG_SO "libc_malloc_debug.so.0" @@ -24,4 +24,4 @@ #define LIBRESOLV_SO "libresolv.so.2" #define LIBRT_SO "librt.so.1" #define LIBTHREAD_DB_SO "libthread_db.so.1" -#define LIBUTIL_SO "libutil.so.1" \ No newline at end of file +#define LIBUTIL_SO "libutil.so.1" diff --git a/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64.h b/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64d.h similarity index 63% rename from lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64.h rename to lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64d.h index 6ce02418e6..4d4c0d146a 100644 --- a/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64.h +++ b/lib/libc/include/riscv64-linux-gnu/gnu/stubs-lp64d.h @@ -14,25 +14,11 @@ #define __stub___compat_uselib #define __stub_chflags #define __stub_fchflags -#define __stub_feclearexcept #define __stub_fedisableexcept #define __stub_feenableexcept -#define __stub_fegetenv #define __stub_fegetexcept -#define __stub_fegetexceptflag -#define __stub_fegetmode -#define __stub_fegetround -#define __stub_feholdexcept -#define __stub_feraiseexcept -#define __stub_fesetenv -#define __stub_fesetexcept -#define __stub_fesetexceptflag -#define __stub_fesetmode -#define __stub_fesetround -#define __stub_fetestexcept -#define __stub_feupdateenv #define __stub_gtty #define __stub_revoke #define __stub_setlogin #define __stub_sigreturn -#define __stub_stty \ No newline at end of file +#define __stub_stty From 923f114bdb4e1808d7f6f424a292c9775ada6f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Fri, 2 Aug 2024 09:09:48 +0200 Subject: [PATCH 6/8] glibc: Define NO_INITFINI for non-legacy architectures. --- src/glibc.zig | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/glibc.zig b/src/glibc.zig index 85f1828ad4..f61c8e5757 100644 --- a/src/glibc.zig +++ b/src/glibc.zig @@ -164,6 +164,21 @@ pub fn loadMetaData(gpa: Allocator, contents: []const u8) LoadMetaDataError!*ABI return abi; } +fn useElfInitFini(target: std.Target) bool { + // Legacy architectures use _init/_fini. + return switch (target.cpu.arch) { + .arm, .armeb, .thumb, .thumbeb => true, + .aarch64, .aarch64_be => true, + .m68k => true, + .mips, .mipsel, .mips64, .mips64el => true, + .powerpc, .powerpcle, .powerpc64, .powerpc64le => true, + .s390x => true, + .sparc, .sparc64 => true, + .x86, .x86_64 => true, + else => false, + }; +} + pub const CRTFile = enum { crti_o, crtn_o, @@ -369,6 +384,10 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: std.Progre }); try add_include_dirs(comp, arena, &args); + if (!useElfInitFini(target)) { + try args.append("-DNO_INITFINI"); + } + if (target.cpu.arch == .x86) { // This prevents i386/sysdep.h from trying to do some // silly and unnecessary inline asm hack that uses weird From f407778e83b46787b6337a8015d93f3d66334907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Fri, 2 Aug 2024 08:20:53 +0200 Subject: [PATCH 7/8] glibc: Set -frounding-math like upstream. ~Same thing as b03a04c7fca587af0f1caf59881def3c91596728. --- src/glibc.zig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/glibc.zig b/src/glibc.zig index f61c8e5757..2b4b3402d6 100644 --- a/src/glibc.zig +++ b/src/glibc.zig @@ -374,8 +374,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: std.Progre "-std=gnu11", "-fgnu89-inline", "-fmerge-all-constants", - // glibc sets this flag but clang does not support it. - // "-frounding-math", + "-frounding-math", "-fno-stack-protector", "-fno-common", "-fmath-errno", From f43c05690ed7f5a5f2db7dede06bba50016fa857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Fri, 2 Aug 2024 09:11:16 +0200 Subject: [PATCH 8/8] process_headers: Replace ilp32/lp64 with ilp32d/lp64d. The former are soft float; the latter are hard float. We primarily care about hard float here. --- tools/process_headers.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/process_headers.zig b/tools/process_headers.zig index 7bed1a91c7..81333db1f1 100644 --- a/tools/process_headers.zig +++ b/tools/process_headers.zig @@ -160,12 +160,12 @@ const glibc_targets = [_]LibCTarget{ .abi = MultiAbi{ .specific = Abi.gnueabi }, }, LibCTarget{ - .name = "riscv32-linux-gnu-rv32imac-ilp32", + .name = "riscv32-linux-gnu-rv32imafdc-ilp32d", .arch = MultiArch{ .specific = Arch.riscv32 }, .abi = MultiAbi{ .specific = Abi.gnu }, }, LibCTarget{ - .name = "riscv64-linux-gnu-rv64imac-lp64", + .name = "riscv64-linux-gnu-rv64imafdc-lp64d", .arch = MultiArch{ .specific = Arch.riscv64 }, .abi = MultiAbi{ .specific = Abi.gnu }, },