summaryrefslogtreecommitdiff
path: root/libelf
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2018-06-21 18:52:53 +0200
committerMark Wielaard <mark@klomp.org>2018-06-21 20:30:19 +0200
commit3e4f78a7be8faec96f89da58ce9849a274aef0c4 (patch)
treed5374cc917fa4b80b741f747deb40f3c8da0bd09 /libelf
parenta8efc328a5a88921e030638c257d36979f19db9f (diff)
downloadelfutils-3e4f78a7be8faec96f89da58ce9849a274aef0c4.tar.gz
libelf: Sync elf.h from glibc.
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>
Diffstat (limited to 'libelf')
-rw-r--r--libelf/ChangeLog4
-rw-r--r--libelf/elf.h5
2 files changed, 8 insertions, 1 deletions
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. */