From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id DCF933852C4B; Wed, 23 Nov 2022 14:40:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DCF933852C4B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214421; bh=l3CIVTnjWITm4iThlVd8zunrmzEoOMIpKVVa07xLB1w=; h=From:To:Subject:Date:From; b=NwVKHttw2YZC3Lm01z1Y660lTWtrXIUawWUlWRNrYwGh4lGrCHQbuX2ouCK25CJBn Kg8NIhce5haLIq292aJFNmZeQpwb8oYFOLEM3gI9DAMY2VAotVfIhjWwvF9ChKqCEo eqhS0XzthkNtVAJaBiixdJkSBd1k9bEBBtvrjjgc= 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] libio: adjust _IO_FILE / _IO_FILE_complete for 128 bit pointers X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: ad946943cede829e0af07b5e2dd39edbedceebba X-Git-Newrev: 8d04c0e9e94144c762b74beacad95b51fd7522cd Message-Id: <20221123144021.DCF933852C4B@sourceware.org> Date: Wed, 23 Nov 2022 14:40:21 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8d04c0e9e94144c762b74beacad95b51fd7522cd commit 8d04c0e9e94144c762b74beacad95b51fd7522cd Author: Szabolcs Nagy 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. */