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] libio: adjust _IO_FILE / _IO_FILE_complete for 128 bit pointers
Date: Thu, 27 Oct 2022 13:50:28 +0000 (GMT)	[thread overview]
Message-ID: <20221027135028.693EF384BC2B@sourceware.org> (raw)

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

commit cea2af3fd58088fb3d374f9817ff7c9f31e4cb29
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Mon Jul 26 16:31:38 2021 -0300

    libio: adjust _IO_FILE / _IO_FILE_complete for 128 bit pointers
    
    The size of the reserved space has to be adjusted because it underflows
    with 16 byte pointers.  With the new value there should be enough space
    for 2 more pointers in the struct on CHERI targets.

Diff:
---
 libio/bits/types/struct_FILE.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libio/bits/types/struct_FILE.h b/libio/bits/types/struct_FILE.h
index 1eb429888c..f73d051c0e 100644
--- a/libio/bits/types/struct_FILE.h
+++ b/libio/bits/types/struct_FILE.h
@@ -95,7 +95,9 @@ struct _IO_FILE_complete
   size_t __pad5;
   int _mode;
   /* Make sure we don't get into trouble again.  */
-  char _unused2[15 * sizeof (int) - 4 * sizeof (void *) - sizeof (size_t)];
+  char _unused2[sizeof (void *) == 4 * sizeof (int)
+		? 9 * sizeof (int)
+		: 15 * sizeof (int) - 4 * sizeof (void *) - sizeof (size_t)];
 };
 
 /* These macros are used by bits/stdio.h and internal headers.  */

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

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-27 13:50 Szabolcs Nagy [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-11-23 14:40 Szabolcs Nagy
2022-10-26 15:11 Szabolcs Nagy
2022-08-05 19:30 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=20221027135028.693EF384BC2B@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).