diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h --- a/sys/arm/include/elf.h +++ b/sys/arm/include/elf.h @@ -78,7 +78,7 @@ #define EF_ARM_EABI_VERSION_UNKNOWN 0 #define EF_ARM_EABI_FREEBSD_MIN 4 -#define ET_DYN_LOAD_ADDR 0x500000 +#define ET_DYN_LOAD_ADDR 0x01001000 /* Flags passed in AT_HWCAP. */ #define HWCAP_SWP 0x00000001 /* Unsupported, never set. */ diff --git a/sys/arm64/include/elf.h b/sys/arm64/include/elf.h --- a/sys/arm64/include/elf.h +++ b/sys/arm64/include/elf.h @@ -86,7 +86,7 @@ #endif #if __ELF_WORD_SIZE == 32 -#define ET_DYN_LOAD_ADDR 0x12000 +#define ET_DYN_LOAD_ADDR 0x01001000 #else #define ET_DYN_LOAD_ADDR 0x100000 #endif diff --git a/sys/x86/include/elf.h b/sys/x86/include/elf.h --- a/sys/x86/include/elf.h +++ b/sys/x86/include/elf.h @@ -32,14 +32,11 @@ #define _MACHINE_ELF_H_ 1 #if defined(__i386__) || defined(_MACHINE_ELF_WANT_32BIT) - -/* - * ELF definitions for the i386 architecture. - */ - +/* ELF definitions for the i386 architecture. */ #include /* Definitions common to all 32 bit architectures. */ #if defined(__ELF_WORD_SIZE) && __ELF_WORD_SIZE == 64 -#include /* Definitions common to all 64 bit architectures. */ +/* Definitions common to all 64 bit architectures. */ +#include #endif #ifndef __ELF_WORD_SIZE @@ -89,7 +86,7 @@ #define ELF_TARG_MACH EM_386 #define ELF_TARG_VER 1 -#define ET_DYN_LOAD_ADDR 0x01001000 +#define ET_DYN_LOAD_ADDR 0x00002000 #elif defined(__amd64__) @@ -150,7 +147,7 @@ #define ELF_TARG_VER 1 #if __ELF_WORD_SIZE == 32 -#define ET_DYN_LOAD_ADDR 0x01001000 +#define ET_DYN_LOAD_ADDR 0x00002000 #else #define ET_DYN_LOAD_ADDR 0x01021000 #endif