From patchwork Sat Jun 16 21:45:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 27896 Received: (qmail 39800 invoked by alias); 16 Jun 2018 21:46:17 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 39637 invoked by uid 89); 16 Jun 2018 21:46:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=conflicts X-HELO: gnu.wildebeest.org From: Mark Wielaard To: libc-alpha@sourceware.org Cc: Yonghong Song , Richard Henderson , Mark Wielaard Subject: [PATCH] elf.h: Add BPF relocation types. Date: Sat, 16 Jun 2018 23:45:15 +0200 Message-Id: <20180616214515.10737-1-mark@klomp.org> 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 its 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 9dd87eebb8..40175d254a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-06-16 Mark Wielaard + + * elf/elf.h (R_BPF_MAP_FD): Removed. + (R_BPF_64_64, R_BPF_64_32): New. + 2018-06-15 Samuel Thibault * include/sys/sendfile.h (__sendfile64): Declare hidden prototype. 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. */