about summary refs log tree commit diff
path: root/setjmp/setjmp.h
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2020-10-05 16:46:46 +0000
committerJoseph Myers <joseph@codesourcery.com>2020-10-05 16:46:46 +0000
commit19302b27bdacfe87e861ff46fc0fbad60dd6602d (patch)
tree9e97cb87089d1bd597ab6ba4fbea20bc556cd229 /setjmp/setjmp.h
parent5bb2e5300b9b7cf1b8b7f2cbcbfca4d4a529082d (diff)
downloadglibc-19302b27bdacfe87e861ff46fc0fbad60dd6602d.tar.gz
glibc-19302b27bdacfe87e861ff46fc0fbad60dd6602d.tar.xz
glibc-19302b27bdacfe87e861ff46fc0fbad60dd6602d.zip
Fix GCC 11 -Warray-parameter warning for __sigsetjmp (bug 26647)
This patch fixes part of bug 26647 (-Werror=array-parameter error
building with GCC 11 because of __sigsetjmp being declared using an
array parameter in one header and a pointer parameter in another).

The fix is to split the struct __jmp_buf_tag definition out to a
separate bits/types/ header so it can be included in pthread.h, so
that pthread.h can declare __sigsetjmp with the type contents visible,
so can use an array (as in setjmp.h) rather than a pointer in the
declaration.

Note that several other build failures with GCC 11 remain.  This does
not fix the jmp_buf-related -Wstringop-overflow errors (also discussed
in bug 26647), or -Warray-parameter errors for other functions (bug
26686), or -Warray-bounds errors (bug 26687).

Tested, with older compilers, natively for x86_64 and with
build-many-glibc.py for aarch64-linux-gnu.  Tested with
build-many-glibcs.py with GCC mainline for aarch64-linux-gnu that this
gets past the -Warray-parameter issue for __sigsetjmp (with the next
build failure being the other one discussed in bug 26647).
Diffstat (limited to 'setjmp/setjmp.h')
-rw-r--r--setjmp/setjmp.h15
1 files changed, 1 insertions, 14 deletions
diff --git a/setjmp/setjmp.h b/setjmp/setjmp.h
index 4e3443c37e..c6c59f4094 100644
--- a/setjmp/setjmp.h
+++ b/setjmp/setjmp.h
@@ -27,20 +27,7 @@
 __BEGIN_DECLS
 
 #include <bits/setjmp.h>		/* Get `__jmp_buf'.  */
-#include <bits/types/__sigset_t.h>
-
-/* Calling environment, plus possibly a saved signal mask.  */
-struct __jmp_buf_tag
-  {
-    /* NOTE: The machine-dependent definitions of `__sigsetjmp'
-       assume that a `jmp_buf' begins with a `__jmp_buf' and that
-       `__mask_was_saved' follows it.  Do not move these members
-       or add others before it.  */
-    __jmp_buf __jmpbuf;		/* Calling environment.  */
-    int __mask_was_saved;	/* Saved the signal mask?  */
-    __sigset_t __saved_mask;	/* Saved signal mask.  */
-  };
-
+#include <bits/types/struct___jmp_buf_tag.h>
 
 typedef struct __jmp_buf_tag jmp_buf[1];