* [PATCH] ELF OSABI
@ 2003-09-10 1:09 Matthew Wilcox
2003-09-10 4:41 ` Paul Mundt
0 siblings, 1 reply; 3+ messages in thread
From: Matthew Wilcox @ 2003-09-10 1:09 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
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.
--- include/linux/elf.h 8 Sep 2003 21:42:49 -0000 1.5
+++ include/linux/elf.h 8 Sep 2003 22:00:28 -0000 1.6
@@ -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
--- fs/proc/kcore.c 8 Sep 2003 21:42:37 -0000 1.3
+++ fs/proc/kcore.c 8 Sep 2003 22:00:27 -0000 1.4
@@ -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;
--- fs/binfmt_elf.c 8 Sep 2003 21:42:28 -0000 1.6
+++ fs/binfmt_elf.c 8 Sep 2003 22:00:26 -0000 1.7
@@ -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;
--- arch/mips/kernel/irixelf.c 8 Sep 2003 21:41:38 -0000 1.3
+++ arch/mips/kernel/irixelf.c 8 Sep 2003 22:00:20 -0000 1.4
@@ -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;
--
"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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ELF OSABI
2003-09-10 1:09 [PATCH] ELF OSABI Matthew Wilcox
@ 2003-09-10 4:41 ` Paul Mundt
2003-09-10 11:40 ` Matthew Wilcox
0 siblings, 1 reply; 3+ messages in thread
From: Paul Mundt @ 2003-09-10 4:41 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: Linus Torvalds, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 577 bytes --]
On Wed, Sep 10, 2003 at 02:09:33AM +0100, Matthew Wilcox wrote:
> --- arch/mips/kernel/irixelf.c 8 Sep 2003 21:41:38 -0000 1.3
> +++ arch/mips/kernel/irixelf.c 8 Sep 2003 22:00:20 -0000 1.4
> @@ -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.
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ELF OSABI
2003-09-10 4:41 ` Paul Mundt
@ 2003-09-10 11:40 ` Matthew Wilcox
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Wilcox @ 2003-09-10 11:40 UTC (permalink / raw)
To: Matthew Wilcox, Linus Torvalds, linux-kernel
On Wed, Sep 10, 2003 at 12:41:05AM -0400, Paul Mundt wrote:
> 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.
--- include/linux/elf.h 8 Sep 2003 21:42:49 -0000 1.5
+++ include/linux/elf.h 8 Sep 2003 22:00:28 -0000 1.6
@@ -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
--- fs/proc/kcore.c 8 Sep 2003 21:42:37 -0000 1.3
+++ fs/proc/kcore.c 8 Sep 2003 22:00:27 -0000 1.4
@@ -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;
--- fs/binfmt_elf.c 8 Sep 2003 21:42:28 -0000 1.6
+++ fs/binfmt_elf.c 8 Sep 2003 22:00:26 -0000 1.7
@@ -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;
--- arch/mips/kernel/irixelf.c 8 Sep 2003 21:41:38 -0000 1.3
+++ arch/mips/kernel/irixelf.c 8 Sep 2003 22:00:20 -0000 1.4
@@ -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;
--
"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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-09-10 11:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-09-10 1:09 [PATCH] ELF OSABI Matthew Wilcox
2003-09-10 4:41 ` Paul Mundt
2003-09-10 11:40 ` Matthew Wilcox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox