From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 106245 invoked by alias); 21 Jun 2018 18:46:36 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 106098 invoked by uid 89); 21 Jun 2018 18:46:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.4 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 spammy=Protection, bitmap X-Spam-Status: No, score=-24.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: gnu.wildebeest.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (212.238.236.112) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 21 Jun 2018 18:46:22 +0000 Received: from librem.wildebeest.org (deer0x15.wildebeest.org [172.31.17.151]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 15DBD300092E; Thu, 21 Jun 2018 20:46:13 +0200 (CEST) Received: by librem.wildebeest.org (Postfix, from userid 1000) id 8C20F141E5D; Thu, 21 Jun 2018 20:46:13 +0200 (CEST) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Mark Wielaard Subject: [COMMITTED] libelf: Sync elf.h from glibc. Date: Thu, 21 Jun 2018 18:46:00 -0000 Message-Id: <20180621184611.20038-1-mark@klomp.org> X-Mailer: git-send-email 2.17.0 X-Spam-Flag: NO X-IsSubscribed: yes X-SW-Source: 2018-q2/txt/msg00251.txt.bz2 Add NT_PPC_PKEY, R_BPF_64_64 and R_BPF_64_32. Remove R_BPF_MAP_FD. Signed-off-by: Mark Wielaard --- backends/ChangeLog | 4 ++++ backends/bpf_reloc.def | 1 - libelf/ChangeLog | 4 ++++ libelf/elf.h | 5 ++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/backends/ChangeLog b/backends/ChangeLog index b34918fa..e97e33d6 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,7 @@ +2018-06-21 Mark Wielaard + + * bpf_reloc.def: Remove MAP_FD. + 2018-06-13 Andreas Schwab * Makefile.am (riscv_SRCS): Add riscv_cfi.c and riscv_regs.c. diff --git a/backends/bpf_reloc.def b/backends/bpf_reloc.def index a410da97..09ac3a6c 100644 --- a/backends/bpf_reloc.def +++ b/backends/bpf_reloc.def @@ -28,4 +28,3 @@ /* NAME, REL|EXEC|DYN */ RELOC_TYPE (NONE, EXEC|DYN) -RELOC_TYPE (MAP_FD, REL|EXEC|DYN) diff --git a/libelf/ChangeLog b/libelf/ChangeLog index ea2b9df8..ec97caaf 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,7 @@ +2018-06-21 Mark Wielaard + + * elf.h: Update from glibc. + 2018-04-19 Andreas Schwab * elf.h: Update from glibc. diff --git a/libelf/elf.h b/libelf/elf.h index f7748983..75043bcb 100644 --- a/libelf/elf.h +++ b/libelf/elf.h @@ -780,6 +780,8 @@ typedef struct Register */ #define NT_PPC_TM_CDSCR 0x10f /* TM checkpointed Data Stream Control Register */ +#define NT_PPC_PKEY 0x110 /* Memory Protection Keys + registers. */ #define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */ #define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */ #define NT_X86_XSTATE 0x202 /* x86 extended state using xsave */ @@ -3848,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. */ -- 2.17.0