ELF OSABI
PATCH 1/1 ELF OSABI
This patch fills in the ELF EI_OSABI field. This doesn't matter for most architectures, but PA-RISC uses the Linux flavour of the ABI (since HPUX uses the None flavour). Patch courtesy of Randolph Chung.
linux/elf.h +9 -1
@@ -360,7 +360,8 @@ typedef struct elf64_shdr {#define EI_CLASS 4#define EI_DATA 5#define EI_VERSION 6 -#define EI_PAD 7 +#define EI_OSABI 7 +#define EI_PAD 8#define ELFMAG0 0x7f/* EI_MAG */ #define ELFMAG1 'E'
@@ -381,6 +382,13 @@ typedef struct elf64_shdr {#define EV_NONE 0/* e_version, EI_VERSION */ #define EV_CURRENT 1#define EV_NUM 2 + +#define ELFOSABI_NONE 0 +#define ELFOSABI_LINUX 3 + +#ifndef ELF_OSABI +#define ELF_OSABI ELFOSABI_NONE +#endif /* Notes used in ET_CORE */ #define NT_PRSTATUS 1
proc/kcore.c +1 -0
@@ -175,6 +175,7 @@ static void elf_kcore_store_hdr(char *bu elf->e_ident[EI_CLASS ] =ELF_CLASS ; elf->e_ident[EI_DATA ] =ELF_DATA ; elf->e_ident[EI_VERSION ]=EV_CURRENT ; + elf->e_ident[EI_OSABI ] =ELF_OSABI ;memset (elf->e_ident+EI_PAD ,0 ,EI_NIDENT -EI_PAD ); elf->e_type =ET_CORE ; elf->e_machine =ELF_ARCH ;
binfmt_elf.c +1 -0
@@ -1023,6 +1023,7 @@ static inline void fill_elf_header(struc elf->e_ident[EI_CLASS ] =ELF_CLASS ; elf->e_ident[EI_DATA ] =ELF_DATA ; elf->e_ident[EI_VERSION ] =EV_CURRENT ; + elf->e_ident[EI_OSABI ] =ELF_OSABI ;memset (elf->e_ident+EI_PAD ,0 ,EI_NIDENT -EI_PAD ); elf->e_type =ET_CORE ;
mips/kernel/irixelf.c +1 -0
@@ -1088,6 +1088,7 @@ static int irix_core_dump(long signr, st elf.e_ident[EI_CLASS ] =ELFCLASS32 ; elf.e_ident[EI_DATA ] =ELFDATA2LSB ; elf.e_ident[EI_VERSION ] =EV_CURRENT ; + elf->e_ident[EI_OSABI ] =ELF_OSABI ;memset (elf.e_ident+EI_PAD ,0 ,EI_NIDENT -EI_PAD ); elf.e_type =ET_CORE ;
Signature · 3 lines
"It's not Hollywood. War is real, war is primarily not about defeat or victory, it is about death. I've seen thousands and thousands of dead bodies. Do you think I want to have an academic debate on this subject?" -- Robert Fisk
mips/kernel/irixelf.c static int irix_core_dump(long signr, st · line 1092
Quoted 8 lines · Matthew Wilcox
mips/kernel/irixelf.c +1
-0@@ -1088,6 +1088,7 @@ static int irix_core_dump(long signr, st elf.e_ident[EI_CLASS ] =ELFCLASS32 ; elf.e_ident[EI_DATA ] =ELFDATA2LSB ; elf.e_ident[EI_VERSION ] =EV_CURRENT ; + elf->e_ident[EI_OSABI ] =ELF_OSABI ;memset (elf.e_ident+EI_PAD ,0 ,EI_NIDENT -EI_PAD );
Someone was a bit too hasty here. Perhaps it might be a good idea to change this to elf.e_ident instead.
Quoted 2 lines · Paul Mundt
Someone was a bit too hasty here. Perhaps it might be a good idea to change this to elf.e_ident instead.
Good catch, thanks:
This patch fills in the ELF EI_OSABI field. This doesn't matter for most architectures, but PA-RISC uses the Linux flavour of the ABI (since HPUX uses the None flavour). Patch by Randolph Chung.
linux/elf.h +9 -1
@@ -360,7 +360,8 @@ typedef struct elf64_shdr {#define EI_CLASS 4#define EI_DATA 5#define EI_VERSION 6 -#define EI_PAD 7 +#define EI_OSABI 7 +#define EI_PAD 8#define ELFMAG0 0x7f/* EI_MAG */ #define ELFMAG1 'E'
@@ -381,6 +382,13 @@ typedef struct elf64_shdr {#define EV_NONE 0/* e_version, EI_VERSION */ #define EV_CURRENT 1#define EV_NUM 2 + +#define ELFOSABI_NONE 0 +#define ELFOSABI_LINUX 3 + +#ifndef ELF_OSABI +#define ELF_OSABI ELFOSABI_NONE +#endif /* Notes used in ET_CORE */ #define NT_PRSTATUS 1
proc/kcore.c +1 -0
@@ -175,6 +175,7 @@ static void elf_kcore_store_hdr(char *bu elf->e_ident[EI_CLASS ] =ELF_CLASS ; elf->e_ident[EI_DATA ] =ELF_DATA ; elf->e_ident[EI_VERSION ]=EV_CURRENT ; + elf->e_ident[EI_OSABI ] =ELF_OSABI ;memset (elf->e_ident+EI_PAD ,0 ,EI_NIDENT -EI_PAD ); elf->e_type =ET_CORE ; elf->e_machine =ELF_ARCH ;
binfmt_elf.c +1 -0
@@ -1023,6 +1023,7 @@ static inline void fill_elf_header(struc elf->e_ident[EI_CLASS ] =ELF_CLASS ; elf->e_ident[EI_DATA ] =ELF_DATA ; elf->e_ident[EI_VERSION ] =EV_CURRENT ; + elf->e_ident[EI_OSABI ] =ELF_OSABI ;memset (elf->e_ident+EI_PAD ,0 ,EI_NIDENT -EI_PAD ); elf->e_type =ET_CORE ;
mips/kernel/irixelf.c +1 -0
@@ -1088,6 +1088,7 @@ static int irix_core_dump(long signr, st elf.e_ident[EI_CLASS ] =ELFCLASS32 ; elf.e_ident[EI_DATA ] =ELFDATA2LSB ; elf.e_ident[EI_VERSION ] =EV_CURRENT ; + elf.e_ident[EI_OSABI ] =ELF_OSABI ;memset (elf.e_ident+EI_PAD ,0 ,EI_NIDENT -EI_PAD ); elf.e_type =ET_CORE ;
Signature · 3 lines
"It's not Hollywood. War is real, war is primarily not about defeat or victory, it is about death. I've seen thousands and thousands of dead bodies. Do you think I want to have an academic debate on this subject?" -- Robert Fisk