about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2018-06-16 23:34:13 +0200
committerMark Wielaard <mark@klomp.org>2018-06-21 18:38:06 +0200
commit61ab61c2fdf23875a473281d9711ae35473d93f7 (patch)
treee56ecd29e740c34a20a27b06104cef61546a428b
parentf496b28e61d0342f579bf794c71b80e9c7d0b1b5 (diff)
downloadglibc-61ab61c2fdf23875a473281d9711ae35473d93f7.tar.gz
glibc-61ab61c2fdf23875a473281d9711ae35473d93f7.tar.xz
glibc-61ab61c2fdf23875a473281d9711ae35473d93f7.zip
elf.h: Add BPF relocation types.
The BPF ELF format has new relocation types R_BPF_64_64 and R_BPF_64_32.
The existing R_BPF_MAP_FD was an extension that never got implemented.
Remove it, because the constant conflicts with the official R_BPF_64_64.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
-rw-r--r--ChangeLog5
-rw-r--r--elf/elf.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ff5cbeb265..0353030656 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-21  Mark Wielaard  <mark@klomp.org>
+
+	* elf/elf.h (R_BPF_MAP_FD): Removed.
+	(R_BPF_64_64, R_BPF_64_32): New.
+
 2018-06-21  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #23253]
diff --git a/elf/elf.h b/elf/elf.h
index a5b2811ce0..75043bcbf9 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -3850,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. */