From 74dff42e4ebd48ed6eb0a3b9dac0cc4ea7d50902 Mon Sep 17 00:00:00 2001 From: Sergey Bugaev Date: Wed, 27 Mar 2024 19:18:28 +0300 Subject: Load 64-bit ELFs on all 64-bit ports Not only on x86_64. Message-ID: <20240327161841.95685-5-bugaevc@gmail.com> --- include/mach/exec/elf.h | 4 ++-- kern/exception.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/mach/exec/elf.h b/include/mach/exec/elf.h index 409947c4..9e4f8f7e 100644 --- a/include/mach/exec/elf.h +++ b/include/mach/exec/elf.h @@ -212,7 +212,7 @@ typedef struct elf64_sym { Elf64_Xword st_size; } Elf64_Sym; -#ifdef __x86_64__ +#ifdef __LP64__ #define Elf_Sym Elf64_Sym #define Elf_Shdr Elf64_Shdr #else @@ -349,7 +349,7 @@ typedef struct { #define DT_TEXTREL 22 #define DT_JMPREL 23 -#if defined(__x86_64__) && ! defined(USER32) +#if defined(__LP64__) && ! defined(USER32) typedef Elf64_Ehdr Elf_Ehdr; typedef Elf64_Phdr Elf_Phdr; #else diff --git a/kern/exception.c b/kern/exception.c index 15f29705..7139b466 100644 --- a/kern/exception.c +++ b/kern/exception.c @@ -283,7 +283,7 @@ struct mach_exception { #define INTEGER_T_SIZE_IN_BITS (8 * sizeof(integer_t)) #define INTEGER_T_TYPE MACH_MSG_TYPE_INTEGER_T #define RPC_LONG_INTEGER_T_SIZE_IN_BITS (8 * sizeof(rpc_long_integer_t)) -#if defined(__x86_64__) && !defined(USER32) +#if defined(__LP64__) && !defined(USER32) #define RPC_LONG_INTEGER_T_TYPE MACH_MSG_TYPE_INTEGER_64 #else #define RPC_LONG_INTEGER_T_TYPE MACH_MSG_TYPE_INTEGER_32 -- cgit v1.2.3