authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-10-03 15:19:58+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-10-03 15:19:58+02:00
log69ce7f0e085b5fb3bf7356e9999940c60c79cfe2
tree564b875b1be006deeb3931d4a9252a836b195e44
parent3bcdca07a37d29256c56c2b681d43d74cd0f88b5
parent710a3b37e2f51010dcb37e4d39ba9ac77eddbd82
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #21573 from alexrp/elf-header

Some additions to `std.elf` addressing #19830, plus some zld improvements

3 files changed, 137 insertions(+), 37 deletions(-)

lib/std/elf.zig+90-14
......@@ -453,18 +453,27 @@ pub const ET = enum(u16) {
453453 /// Core file
454454 CORE = 4,
455455
456 /// Beginning of OS-specific codes
457 pub const LOOS = 0xfe00;
458
459 /// End of OS-specific codes
460 pub const HIOS = 0xfeff;
461
456462 /// Beginning of processor-specific codes
457463 pub const LOPROC = 0xff00;
458464
459 /// Processor-specific
465 /// End of processor-specific codes
460466 pub const HIPROC = 0xffff;
461467};
462468
463469/// All integers are native endian.
464470pub const Header = struct {
471 is_64: bool,
465472 endian: std.builtin.Endian,
473 os_abi: OSABI,
474 abi_version: u8,
475 type: ET,
466476 machine: EM,
467 is_64: bool,
468477 entry: u64,
469478 phoff: u64,
470479 shoff: u64,
......@@ -501,6 +510,12 @@ pub const Header = struct {
501510 if (!mem.eql(u8, hdr32.e_ident[0..4], MAGIC)) return error.InvalidElfMagic;
502511 if (hdr32.e_ident[EI_VERSION] != 1) return error.InvalidElfVersion;
503512
513 const is_64 = switch (hdr32.e_ident[EI_CLASS]) {
514 ELFCLASS32 => false,
515 ELFCLASS64 => true,
516 else => return error.InvalidElfClass,
517 };
518
504519 const endian: std.builtin.Endian = switch (hdr32.e_ident[EI_DATA]) {
505520 ELFDATA2LSB => .little,
506521 ELFDATA2MSB => .big,
......@@ -508,11 +523,15 @@ pub const Header = struct {
508523 };
509524 const need_bswap = endian != native_endian;
510525
511 const is_64 = switch (hdr32.e_ident[EI_CLASS]) {
512 ELFCLASS32 => false,
513 ELFCLASS64 => true,
514 else => return error.InvalidElfClass,
515 };
526 const os_abi: OSABI = @enumFromInt(hdr32.e_ident[EI_OSABI]);
527
528 // The meaning of this value depends on `os_abi` so just make it available as `u8`.
529 const abi_version = hdr32.e_ident[EI_ABIVERSION];
530
531 const @"type" = if (need_bswap) blk: {
532 const value = @intFromEnum(hdr32.e_type);
533 break :blk @as(ET, @enumFromInt(@byteSwap(value)));
534 } else hdr32.e_type;
516535
517536 const machine = if (need_bswap) blk: {
518537 const value = @intFromEnum(hdr32.e_machine);
......@@ -520,9 +539,12 @@ pub const Header = struct {
520539 } else hdr32.e_machine;
521540
522541 return @as(Header, .{
542 .is_64 = is_64,
523543 .endian = endian,
544 .os_abi = os_abi,
545 .abi_version = abi_version,
546 .type = @"type",
524547 .machine = machine,
525 .is_64 = is_64,
526548 .entry = int(is_64, need_bswap, hdr32.e_entry, hdr64.e_entry),
527549 .phoff = int(is_64, need_bswap, hdr32.e_phoff, hdr64.e_phoff),
528550 .shoff = int(is_64, need_bswap, hdr32.e_shoff, hdr64.e_shoff),
......@@ -637,7 +659,7 @@ pub fn SectionHeaderIterator(comptime ParseSource: anytype) type {
637659 };
638660}
639661
640pub fn int(is_64: bool, need_bswap: bool, int_32: anytype, int_64: anytype) @TypeOf(int_64) {
662fn int(is_64: bool, need_bswap: bool, int_32: anytype, int_64: anytype) @TypeOf(int_64) {
641663 if (is_64) {
642664 if (need_bswap) {
643665 return @byteSwap(int_64);
......@@ -649,7 +671,7 @@ pub fn int(is_64: bool, need_bswap: bool, int_32: anytype, int_64: anytype) @Typ
649671 }
650672}
651673
652pub fn int32(need_bswap: bool, int_32: anytype, comptime Int64: anytype) Int64 {
674fn int32(need_bswap: bool, int_32: anytype, comptime Int64: anytype) Int64 {
653675 if (need_bswap) {
654676 return @byteSwap(int_32);
655677 } else {
......@@ -657,21 +679,24 @@ pub fn int32(need_bswap: bool, int_32: anytype, comptime Int64: anytype) Int64 {
657679 }
658680}
659681
660pub const EI_NIDENT = 16;
661
662pub const EI_CLASS = 4;
663682pub const ELFCLASSNONE = 0;
664683pub const ELFCLASS32 = 1;
665684pub const ELFCLASS64 = 2;
666685pub const ELFCLASSNUM = 3;
667686
668pub const EI_DATA = 5;
669687pub const ELFDATANONE = 0;
670688pub const ELFDATA2LSB = 1;
671689pub const ELFDATA2MSB = 2;
672690pub const ELFDATANUM = 3;
673691
692pub const EI_CLASS = 4;
693pub const EI_DATA = 5;
674694pub const EI_VERSION = 6;
695pub const EI_OSABI = 7;
696pub const EI_ABIVERSION = 8;
697pub const EI_PAD = 9;
698
699pub const EI_NIDENT = 16;
675700
676701pub const Elf32_Half = u16;
677702pub const Elf64_Half = u16;
......@@ -1094,6 +1119,57 @@ pub const Addr = switch (@sizeOf(usize)) {
10941119};
10951120pub const Half = u16;
10961121
1122pub const OSABI = enum(u8) {
1123 /// UNIX System V ABI
1124 NONE = 0,
1125 /// HP-UX operating system
1126 HPUX = 1,
1127 /// NetBSD
1128 NETBSD = 2,
1129 /// GNU (Hurd/Linux)
1130 GNU = 3,
1131 /// Solaris
1132 SOLARIS = 6,
1133 /// AIX
1134 AIX = 7,
1135 /// IRIX
1136 IRIX = 8,
1137 /// FreeBSD
1138 FREEBSD = 9,
1139 /// TRU64 UNIX
1140 TRU64 = 10,
1141 /// Novell Modesto
1142 MODESTO = 11,
1143 /// OpenBSD
1144 OPENBSD = 12,
1145 /// OpenVMS
1146 OPENVMS = 13,
1147 /// Hewlett-Packard Non-Stop Kernel
1148 NSK = 14,
1149 /// AROS
1150 AROS = 15,
1151 /// FenixOS
1152 FENIXOS = 16,
1153 /// Nuxi CloudABI
1154 CLOUDABI = 17,
1155 /// Stratus Technologies OpenVOS
1156 OPENVOS = 18,
1157 /// NVIDIA CUDA architecture
1158 CUDA = 51,
1159 /// AMD HSA Runtime
1160 AMDGPU_HSA = 64,
1161 /// AMD PAL Runtime
1162 AMDGPU_PAL = 65,
1163 /// AMD Mesa3D Runtime
1164 AMDGPU_MESA3D = 66,
1165 /// ARM
1166 ARM = 97,
1167 /// Standalone (embedded) application
1168 STANDALONE = 255,
1169
1170 _,
1171};
1172
10971173/// Machine architectures.
10981174///
10991175/// See current registered ELF machine architectures at:
src/link/Elf.zig+20-3
......@@ -2584,11 +2584,28 @@ pub fn writeElfHeader(self: *Elf) !void {
25842584 hdr_buf[index] = 1; // ELF version
25852585 index += 1;
25862586
2587 // OS ABI, often set to 0 regardless of target platform
2587 hdr_buf[index] = @intFromEnum(@as(elf.OSABI, switch (target.cpu.arch) {
2588 .amdgcn => switch (target.os.tag) {
2589 .amdhsa => .AMDGPU_HSA,
2590 .amdpal => .AMDGPU_PAL,
2591 .mesa3d => .AMDGPU_MESA3D,
2592 else => .NONE,
2593 },
2594 .msp430 => .STANDALONE,
2595 else => switch (target.os.tag) {
2596 .freebsd, .ps4 => .FREEBSD,
2597 .hermit => .STANDALONE,
2598 .illumos, .solaris => .SOLARIS,
2599 .openbsd => .OPENBSD,
2600 else => .NONE,
2601 },
2602 }));
2603 index += 1;
2604
25882605 // ABI Version, possibly used by glibc but not by static executables
25892606 // padding
2590 @memset(hdr_buf[index..][0..9], 0);
2591 index += 9;
2607 @memset(hdr_buf[index..][0..8], 0);
2608 index += 8;
25922609
25932610 assert(index == 16);
25942611
src/link/MachO.zig+27-20
......@@ -3542,8 +3542,8 @@ pub fn requiresCodeSig(self: MachO) bool {
35423542 const target = self.getTarget();
35433543 return switch (target.cpu.arch) {
35443544 .aarch64 => switch (target.os.tag) {
3545 .macos => true,
3546 .watchos, .tvos, .ios, .visionos => target.abi == .simulator,
3545 .bridgeos, .driverkit, .macos => true,
3546 .ios, .tvos, .visionos, .watchos => target.abi == .simulator,
35473547 else => false,
35483548 },
35493549 .x86_64 => false,
......@@ -4172,36 +4172,38 @@ pub const Platform = struct {
41724172 const cmd = lc.cast(macho.build_version_command).?;
41734173 return .{
41744174 .os_tag = switch (cmd.platform) {
4175 .MACOS => .macos,
4175 .BRIDGEOS => .bridgeos,
4176 .DRIVERKIT => .driverkit,
41764177 .IOS, .IOSSIMULATOR => .ios,
4177 .TVOS, .TVOSSIMULATOR => .tvos,
4178 .WATCHOS, .WATCHOSSIMULATOR => .watchos,
41794178 .MACCATALYST => .ios,
4179 .MACOS => .macos,
4180 .TVOS, .TVOSSIMULATOR => .tvos,
41804181 .VISIONOS, .VISIONOSSIMULATOR => .visionos,
4182 .WATCHOS, .WATCHOSSIMULATOR => .watchos,
41814183 else => @panic("TODO"),
41824184 },
41834185 .abi = switch (cmd.platform) {
41844186 .MACCATALYST => .macabi,
41854187 .IOSSIMULATOR,
41864188 .TVOSSIMULATOR,
4187 .WATCHOSSIMULATOR,
41884189 .VISIONOSSIMULATOR,
4190 .WATCHOSSIMULATOR,
41894191 => .simulator,
41904192 else => .none,
41914193 },
41924194 .version = appleVersionToSemanticVersion(cmd.minos),
41934195 };
41944196 },
4195 .VERSION_MIN_MACOSX,
41964197 .VERSION_MIN_IPHONEOS,
4198 .VERSION_MIN_MACOSX,
41974199 .VERSION_MIN_TVOS,
41984200 .VERSION_MIN_WATCHOS,
41994201 => {
42004202 const cmd = lc.cast(macho.version_min_command).?;
42014203 return .{
42024204 .os_tag = switch (lc.cmd()) {
4203 .VERSION_MIN_MACOSX => .macos,
42044205 .VERSION_MIN_IPHONEOS => .ios,
4206 .VERSION_MIN_MACOSX => .macos,
42054207 .VERSION_MIN_TVOS => .tvos,
42064208 .VERSION_MIN_WATCHOS => .watchos,
42074209 else => unreachable,
......@@ -4228,15 +4230,17 @@ pub const Platform = struct {
42284230
42294231 pub fn toApplePlatform(plat: Platform) macho.PLATFORM {
42304232 return switch (plat.os_tag) {
4231 .macos => .MACOS,
4233 .bridgeos => .BRIDGEOS,
4234 .driverkit => .DRIVERKIT,
42324235 .ios => switch (plat.abi) {
4233 .simulator => .IOSSIMULATOR,
42344236 .macabi => .MACCATALYST,
4237 .simulator => .IOSSIMULATOR,
42354238 else => .IOS,
42364239 },
4240 .macos => .MACOS,
42374241 .tvos => if (plat.abi == .simulator) .TVOSSIMULATOR else .TVOS,
4238 .watchos => if (plat.abi == .simulator) .WATCHOSSIMULATOR else .WATCHOS,
42394242 .visionos => if (plat.abi == .simulator) .VISIONOSSIMULATOR else .VISIONOS,
4243 .watchos => if (plat.abi == .simulator) .WATCHOSSIMULATOR else .WATCHOS,
42404244 else => unreachable,
42414245 };
42424246 }
......@@ -4305,15 +4309,18 @@ const SupportedPlatforms = struct {
43054309// Source: https://github.com/apple-oss-distributions/ld64/blob/59a99ab60399c5e6c49e6945a9e1049c42b71135/src/ld/PlatformSupport.cpp#L52
43064310// zig fmt: off
43074311const supported_platforms = [_]SupportedPlatforms{
4308 .{ .macos, .none, 0xA0E00, 0xA0800 },
4309 .{ .ios, .none, 0xC0000, 0x70000 },
4310 .{ .tvos, .none, 0xC0000, 0x70000 },
4311 .{ .watchos, .none, 0x50000, 0x20000 },
4312 .{ .visionos, .none, 0x10000, 0x10000 },
4313 .{ .ios, .simulator, 0xD0000, 0x80000 },
4314 .{ .tvos, .simulator, 0xD0000, 0x80000 },
4315 .{ .watchos, .simulator, 0x60000, 0x20000 },
4316 .{ .visionos, .simulator, 0x10000, 0x10000 },
4312 .{ .bridgeos, .none, 0x010000, 0x010000 },
4313 .{ .driverkit, .none, 0x130000, 0x130000 },
4314 .{ .ios, .none, 0x0C0000, 0x070000 },
4315 .{ .ios, .macabi, 0x0D0000, 0x0D0000 },
4316 .{ .ios, .simulator, 0x0D0000, 0x080000 },
4317 .{ .macos, .none, 0x0A0E00, 0x0A0800 },
4318 .{ .tvos, .none, 0x0C0000, 0x070000 },
4319 .{ .tvos, .simulator, 0x0D0000, 0x080000 },
4320 .{ .visionos, .none, 0x010000, 0x010000 },
4321 .{ .visionos, .simulator, 0x010000, 0x010000 },
4322 .{ .watchos, .none, 0x050000, 0x020000 },
4323 .{ .watchos, .simulator, 0x060000, 0x020000 },
43174324};
43184325// zig fmt: on
43194326