public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/arm/morello/main] cheri: elf: Adjust Elf64_auxv_t for capabilities
Date: Thu, 27 Oct 2022 13:54:18 +0000 (GMT)	[thread overview]
Message-ID: <20221027135418.608D03851524@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=429fa3afd26e91598884f687eac20e60a2dc56cc

commit 429fa3afd26e91598884f687eac20e60a2dc56cc
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
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).  */

             reply	other threads:[~2022-10-27 13:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-27 13:54 Szabolcs Nagy [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-11-23 14:44 Szabolcs Nagy
2022-10-26 15:15 Szabolcs Nagy
2022-08-05 19:34 Szabolcs Nagy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221027135418.608D03851524@sourceware.org \
    --to=nsz@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).