From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 608D03851524; Thu, 27 Oct 2022 13:54:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 608D03851524 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666878858; bh=leZjH39PCr2SYz8vVJIWIv6EkGBOghWJaDw0YaqagAM=; h=From:To:Subject:Date:From; b=N8s5oxaJLLn9ZntZou1K2b07GCfwAvkRpzfipV4Uhnq4SXRgNXd2sa5IML0Zw/aOn AjnKkIF1qiUJosSpxSmO/E+dFkzY0gk0OkXoEVoc/6aEW4bI4sY9ZDDqeK4lzV0/x1 p5tOXBLH75l8/BUaTziL6nfhLjE0+TzU7VaUKCUI= 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: 57f37bd95a683d83d2da599b07a81e0c57945c38 X-Git-Newrev: 429fa3afd26e91598884f687eac20e60a2dc56cc Message-Id: <20221027135418.608D03851524@sourceware.org> Date: Thu, 27 Oct 2022 13:54:18 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=429fa3afd26e91598884f687eac20e60a2dc56cc commit 429fa3afd26e91598884f687eac20e60a2dc56cc 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 878dc9bf83..5f0b90f4c4 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). */