From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id AC9B2385153D; Wed, 26 Oct 2022 15:11:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC9B2385153D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666797114; bh=7LZhpXiHQQ2JwINFUcAhzhUHQ9BCDBDppvK8D4Eb7Bg=; h=From:To:Subject:Date:From; b=UnRbSURW9J0lHFcasoNYtRMU5hglp01r4b39+tm0Qq+1gWD5Fn6QzI0bOxZaQgFs4 dVvYrUNTTwc8T1qkacdpxwFKL9Fb+XkeJePUjt/M73Ep6cGZcLX2wJPhZ+6c+zYVz8 K4jymm0G5YTyw7QtUagWsiEqJpsUWiWq5H1zXph0= 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: 7c0608e350069c6d23a97742977e2b9e267ebf73 X-Git-Newrev: 4e8ce92d01552195e4b72bd6333916d27032d070 Message-Id: <20221026151154.AC9B2385153D@sourceware.org> Date: Wed, 26 Oct 2022 15:11:53 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4e8ce92d01552195e4b72bd6333916d27032d070 commit 4e8ce92d01552195e4b72bd6333916d27032d070 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. */