Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some initial work on x32 and n32 ABI support #21717

Merged
merged 14 commits into from
Nov 3, 2024
Merged

Some initial work on x32 and n32 ABI support #21717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
243c250
musl: Update the list of architectures with time32 compat helpers.
alexrp Oct 16, 2024
533d8ea
musl: Fix needsCrtiCrtn() for m68k.
alexrp Oct 16, 2024
8045268
std.zig.target: Update musl path helpers to support alternative ABIs.
alexrp Oct 16, 2024
270fbbc
std.Target: Add muslabin32 and muslabi64 tags to Abi.
alexrp Oct 16, 2024
497b502
process_headers: Simplify the code a bit.
alexrp Oct 16, 2024
94cf5b2
process_headers: Add muslabin32 and muslx32 support.
alexrp Oct 16, 2024
3ec27ae
musl: Update headers from musl 1.2.5.
alexrp Oct 16, 2024
ec0e644
musl: Update sources from musl 1.2.5.
alexrp Oct 16, 2024
8baf887
std.zig.target: Add mips64(el)-linux-muslabin32 and x86_64-linux-musl…
alexrp Oct 16, 2024
11915ae
std.zig.target: Change mips64(el)-linux-musl triples to -muslabi64.
alexrp Oct 16, 2024
50cae50
glibc: Fix an LP_SIZE redefinition warning for gnux32.
alexrp Oct 16, 2024
43878f5
glibc: Emit _IO_stdin_used reference in .rodata.
alexrp Oct 16, 2024
d61e4ef
generate_linux_syscalls: Generate syscalls for x32.
alexrp Oct 16, 2024
a5bc9cb
llvm: Fix lowering of gnuilp32 ABI to be gnu_ilp32.
alexrp Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions lib/compiler/aro/aro/target.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,18 @@ pub fn ldEmulationOption(target: std.Target, arm_endianness: ?std.builtin.Endian
.loongarch64 => "elf64loongarch",
.mips => "elf32btsmip",
.mipsel => "elf32ltsmip",
.mips64 => if (target.abi == .gnuabin32) "elf32btsmipn32" else "elf64btsmip",
.mips64el => if (target.abi == .gnuabin32) "elf32ltsmipn32" else "elf64ltsmip",
.x86_64 => if (target.abi == .gnux32 or target.abi == .muslx32) "elf32_x86_64" else "elf_x86_64",
.mips64 => switch (target.abi) {
.gnuabin32, .muslabin32 => "elf32btsmipn32",
else => "elf64btsmip",
},
.mips64el => switch (target.abi) {
.gnuabin32, .muslabin32 => "elf32ltsmipn32",
else => "elf64ltsmip",
},
.x86_64 => switch (target.abi) {
.gnux32, .muslx32 => "elf32_x86_64",
else => "elf_x86_64",
},
.ve => "elf64ve",
.csky => "cskyelf_linux",
else => null,
Expand Down Expand Up @@ -684,13 +693,15 @@ pub fn toLLVMTriple(target: std.Target, buf: []u8) []const u8 {
.gnuf32 => "gnuf32",
.gnusf => "gnusf",
.gnux32 => "gnux32",
.gnuilp32 => "gnuilp32",
.gnuilp32 => "gnu_ilp32",
.code16 => "code16",
.eabi => "eabi",
.eabihf => "eabihf",
.android => "android",
.androideabi => "androideabi",
.musl => "musl",
.muslabin32 => "muslabin32",
.muslabi64 => "muslabi64",
.musleabi => "musleabi",
.musleabihf => "musleabihf",
.muslx32 => "muslx32",
Expand Down
1 change: 1 addition & 0 deletions lib/libc/glibc/sysdeps/x86_64/x32/sysdep.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */

#include <sysdeps/x86_64/sysdep.h>
#undef LP_SIZE
#ifdef __ASSEMBLER__
# define LP_SIZE 4
#else
Expand Down
20 changes: 20 additions & 0 deletions lib/libc/include/aarch64-linux-musl/bits/stdint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
typedef int32_t int_fast16_t;
typedef int32_t int_fast32_t;
typedef uint32_t uint_fast16_t;
typedef uint32_t uint_fast32_t;

#define INT_FAST16_MIN INT32_MIN
#define INT_FAST32_MIN INT32_MIN

#define INT_FAST16_MAX INT32_MAX
#define INT_FAST32_MAX INT32_MAX

#define UINT_FAST16_MAX UINT32_MAX
#define UINT_FAST32_MAX UINT32_MAX

#define INTPTR_MIN INT64_MIN
#define INTPTR_MAX INT64_MAX
#define UINTPTR_MAX UINT64_MAX
#define PTRDIFF_MIN INT64_MIN
#define PTRDIFF_MAX INT64_MAX
#define SIZE_MAX UINT64_MAX
Loading
Loading