public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/arm/morello/main] libio: adjust _IO_FILE / _IO_FILE_complete for 128 bit pointers
@ 2022-08-05 19:30 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-08-05 19:30 UTC (permalink / raw)
  To: glibc-cvs

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

commit f8335dc69af32d65c95cf551d950aafb1254d9ce
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.  */


^ permalink raw reply	[flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] libio: adjust _IO_FILE / _IO_FILE_complete for 128 bit pointers
@ 2022-11-23 14:40 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-11-23 14:40 UTC (permalink / raw)
  To: glibc-cvs

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

commit 8d04c0e9e94144c762b74beacad95b51fd7522cd
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.  */

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] libio: adjust _IO_FILE / _IO_FILE_complete for 128 bit pointers
@ 2022-10-27 13:50 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-10-27 13:50 UTC (permalink / raw)
  To: glibc-cvs

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.  */

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [glibc/arm/morello/main] libio: adjust _IO_FILE / _IO_FILE_complete for 128 bit pointers
@ 2022-10-26 15:11 Szabolcs Nagy
  0 siblings, 0 replies; 4+ messages in thread
From: Szabolcs Nagy @ 2022-10-26 15:11 UTC (permalink / raw)
  To: glibc-cvs

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

commit 4e8ce92d01552195e4b72bd6333916d27032d070
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.  */

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-23 14:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-05 19:30 [glibc/arm/morello/main] libio: adjust _IO_FILE / _IO_FILE_complete for 128 bit pointers Szabolcs Nagy
2022-10-26 15:11 Szabolcs Nagy
2022-10-27 13:50 Szabolcs Nagy
2022-11-23 14:40 Szabolcs Nagy

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).