From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 332E83858006; Fri, 5 Aug 2022 19:34:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 332E83858006 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: elf: Adjust Elf64_auxv_t for capabilities X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: a4f02d3f689e7ef8de6efb396ada210519ab315e X-Git-Newrev: 8022e6934eaf4faa20bfd8acdd99bea2e687247b Message-Id: <20220805193414.332E83858006@sourceware.org> Date: Fri, 5 Aug 2022 19:34:14 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 19:34:14 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8022e6934eaf4faa20bfd8acdd99bea2e687247b commit 8022e6934eaf4faa20bfd8acdd99bea2e687247b Author: Szabolcs Nagy Date: Thu Jun 10 13:50:17 2021 +0100 cheri: elf: Adjust Elf64_auxv_t for capabilities The Elf64_auxv_t needs to be adjusted for the new capability size. Diff: --- elf/elf.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/elf/elf.h b/elf/elf.h index 741383610e..6ced67f7c1 100644 --- a/elf/elf.h +++ b/elf/elf.h @@ -1159,6 +1159,14 @@ typedef struct typedef struct { +#if defined __CHERI_PURE_CAPABILITY__ + uint64_t a_type; + uint64_t __pad; + union + { + __uintcap_t a_val; + } a_un; +#else uint64_t a_type; /* Entry type */ union { @@ -1167,6 +1175,7 @@ typedef struct though, since it does not work when using 32-bit definitions on 64-bit platforms and vice versa. */ } a_un; +#endif } Elf64_auxv_t; /* Legal values for a_type (entry type). */