From 61ab61c2fdf23875a473281d9711ae35473d93f7 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sat, 16 Jun 2018 23:34:13 +0200 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ elf/elf.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ff5cbeb265..0353030656 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-06-21 Mark Wielaard + + * elf/elf.h (R_BPF_MAP_FD): Removed. + (R_BPF_64_64, R_BPF_64_32): New. + 2018-06-21 Florian Weimer [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. */