[COMMITTED] libelf: Sync elf.h from glibc.

Mark Wielaard mark@klomp.org
Thu Jun 21 18:46:00 GMT 2018


Add NT_PPC_PKEY, R_BPF_64_64 and R_BPF_64_32. Remove R_BPF_MAP_FD.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 backends/ChangeLog     | 4 ++++
 backends/bpf_reloc.def | 1 -
 libelf/ChangeLog       | 4 ++++
 libelf/elf.h           | 5 ++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/backends/ChangeLog b/backends/ChangeLog
index b34918fa..e97e33d6 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-21  Mark Wielaard  <mark@klomp.org>
+
+	* bpf_reloc.def: Remove MAP_FD.
+
 2018-06-13  Andreas Schwab  <schwab@suse.de>
 
 	* Makefile.am (riscv_SRCS): Add riscv_cfi.c and riscv_regs.c.
diff --git a/backends/bpf_reloc.def b/backends/bpf_reloc.def
index a410da97..09ac3a6c 100644
--- a/backends/bpf_reloc.def
+++ b/backends/bpf_reloc.def
@@ -28,4 +28,3 @@
 /*	    NAME,		REL|EXEC|DYN	*/
 
 RELOC_TYPE (NONE,		EXEC|DYN)
-RELOC_TYPE (MAP_FD,		REL|EXEC|DYN)
diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index ea2b9df8..ec97caaf 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-21  Mark Wielaard  <mark@klomp.org>
+
+	* elf.h: Update from glibc.
+
 2018-04-19  Andreas Schwab  <schwab@suse.de>
 
 	* elf.h: Update from glibc.
diff --git a/libelf/elf.h b/libelf/elf.h
index f7748983..75043bcb 100644
--- a/libelf/elf.h
+++ b/libelf/elf.h
@@ -780,6 +780,8 @@ typedef struct
 					   Register */
 #define NT_PPC_TM_CDSCR	0x10f		/* TM checkpointed Data Stream Control
 					   Register */
+#define NT_PPC_PKEY	0x110		/* Memory Protection Keys
+					   registers.  */
 #define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
 #define NT_386_IOPERM	0x201		/* x86 io permission bitmap (1=deny) */
 #define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
@@ -3848,7 +3850,8 @@ enum
 /* BPF specific declarations.  */
 
 #define R_BPF_NONE		0	/* No reloc */
-#define R_BPF_MAP_FD		1	/* Map fd to pointer */
+#define R_BPF_64_64		1
+#define R_BPF_64_32		10
 
 /* Imagination Meta specific relocations. */
 
-- 
2.17.0



More information about the Elfutils-devel mailing list