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 ff5cbeb2653bdefd897b3878399e436f6732ad81..03530306564a91375ca5cb2f33fc7998f4eb94bd 100644 (file)
--- 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 a5b2811ce05440f325e870282f37466bd8543ab2..75043bcbf900db33ce114c1b69562eb538f2bed9 100644 (file)
--- 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. */