From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 693EF384BC2B; Thu, 27 Oct 2022 13:50:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 693EF384BC2B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666878628; bh=dZOhCZe4d0rb50Vo3yV+Xq2GPUl6UPvm43eU3fRjC+Y=; h=From:To:Subject:Date:From; b=XNes4us5atYh6ZkSz8IV7cCooZxUA5zZymI2t6+cI56dB4h6p1OVDArOZIfTEyTwb 5VjZuYDsmt3Lp7awsO5wvGFKxhuQYvtDqQHBcEL5UPSd41gMYeuEyXJVqFoOSt0Wia ONT4mNpCiUwHiNiPVxu32MD75FwNSQuJcfIbxUxk= 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: 1604aadbdf88b72dd69183f69fa022f3d90ac20b X-Git-Newrev: cea2af3fd58088fb3d374f9817ff7c9f31e4cb29 Message-Id: <20221027135028.693EF384BC2B@sourceware.org> Date: Thu, 27 Oct 2022 13:50:28 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cea2af3fd58088fb3d374f9817ff7c9f31e4cb29 commit cea2af3fd58088fb3d374f9817ff7c9f31e4cb29 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. */