From: Mark Wielaard <mark@klomp.org>
Date: Sat, 16 Jun 2018 21:34:13 +0000 (+0200)
Subject: elf.h: Add BPF relocation types.
X-Git-Tag: glibc-2.28~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61ab61c2fdf23875a473281d9711ae35473d93f7;p=thirdparty%2Fglibc.git

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>
---

diff --git a/ChangeLog b/ChangeLog
index ff5cbeb2653..03530306564 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 a5b2811ce05..75043bcbf90 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. */