diff mbox series

[v2] setjmp: Replace jmp_buf-macros.h with jmp_buf-macros.sym

Message ID 20211119195816.165835-1-adhemerval.zanella@linaro.org
State Committed
Commit bc801b3a40f3a9bc8f24f1d0fdc39413874c3172
Headers show
Series [v2] setjmp: Replace jmp_buf-macros.h with jmp_buf-macros.sym | expand

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Adhemerval Zanella Nov. 19, 2021, 7:58 p.m. UTC
It requires less boilerplate code for newer ports.  The _Static_assert
checks from internal setjmp are moved to its own internal test since
setjmp.h is included early by multiple headers (to generate
rtld-sizes.sym).

The riscv jmp_buf-macros.h check is also redundant, it is already
done by riscv configure.ac.

Checked with a build for the affected architectures.
---
Changes from v1:
  * Move __setjmp_check.c to internal test.
---
 include/setjmp.h                              | 33 -----------
 setjmp/Makefile                               |  3 +
 setjmp/jmp_buf-macros.sym                     | 11 ++++
 setjmp/tst-setjmp-check.c                     | 57 +++++++++++++++++++
 sysdeps/mach/hurd/i386/jmp_buf-macros.h       |  6 --
 .../unix/sysv/linux/aarch64/jmp_buf-macros.h  |  6 --
 .../unix/sysv/linux/alpha/jmp_buf-macros.h    |  6 --
 sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h  |  6 --
 sysdeps/unix/sysv/linux/arm/jmp_buf-macros.h  |  6 --
 sysdeps/unix/sysv/linux/csky/jmp_buf-macros.h |  6 --
 sysdeps/unix/sysv/linux/hppa/jmp_buf-macros.h |  6 --
 sysdeps/unix/sysv/linux/i386/jmp_buf-macros.h |  6 --
 sysdeps/unix/sysv/linux/ia64/jmp_buf-macros.h |  6 --
 .../linux/m68k/coldfire/fpu/jmp_buf-macros.h  |  6 --
 .../m68k/coldfire/nofpu/jmp_buf-macros.h      |  6 --
 .../sysv/linux/m68k/m680x0/jmp_buf-macros.h   |  6 --
 .../sysv/linux/microblaze/jmp_buf-macros.h    |  6 --
 .../sysv/linux/mips/mips32/jmp_buf-macros.h   |  6 --
 .../linux/mips/mips64/n32/jmp_buf-macros.h    |  6 --
 .../linux/mips/mips64/n64/jmp_buf-macros.h    |  6 --
 .../unix/sysv/linux/nios2/jmp_buf-macros.h    |  6 --
 .../linux/powerpc/powerpc32/jmp_buf-macros.h  |  6 --
 .../linux/powerpc/powerpc64/jmp_buf-macros.h  |  6 --
 .../unix/sysv/linux/riscv/jmp_buf-macros.h    | 55 ------------------
 .../sysv/linux/riscv/rv64/jmp_buf-macros.h    | 53 -----------------
 .../sysv/linux/s390/s390-32/jmp_buf-macros.h  |  6 --
 .../sysv/linux/s390/s390-64/jmp_buf-macros.h  |  6 --
 sysdeps/unix/sysv/linux/sh/jmp_buf-macros.h   |  6 --
 .../sysv/linux/sparc/sparc32/jmp_buf-macros.h |  6 --
 .../sysv/linux/sparc/sparc64/jmp_buf-macros.h |  6 --
 sysdeps/unix/sysv/linux/x86/jmp_buf-ssp.sym   |  1 +
 .../sysv/linux/x86_64/64/jmp_buf-macros.h     |  6 --
 .../sysv/linux/x86_64/x32/jmp_buf-macros.h    |  6 --
 33 files changed, 72 insertions(+), 297 deletions(-)
 create mode 100644 setjmp/jmp_buf-macros.sym
 create mode 100644 setjmp/tst-setjmp-check.c
 delete mode 100644 sysdeps/mach/hurd/i386/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/alpha/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/arm/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/csky/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/hppa/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/i386/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/ia64/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/m68k/coldfire/fpu/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/m68k/coldfire/nofpu/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/m68k/m680x0/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/microblaze/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/mips/mips32/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/nios2/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/riscv/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/riscv/rv64/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-32/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/sh/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc32/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/x86_64/64/jmp_buf-macros.h
 delete mode 100644 sysdeps/unix/sysv/linux/x86_64/x32/jmp_buf-macros.h

Comments

Florian Weimer Nov. 19, 2021, 8:34 p.m. UTC | #1
* Adhemerval Zanella:

> It requires less boilerplate code for newer ports.  The _Static_assert
> checks from internal setjmp are moved to its own internal test since
> setjmp.h is included early by multiple headers (to generate
> rtld-sizes.sym).
>
> The riscv jmp_buf-macros.h check is also redundant, it is already
> done by riscv configure.ac.
>
> Checked with a build for the affected architectures.
> ---
> Changes from v1:
>   * Move __setjmp_check.c to internal test.

This version looks okay to me.

Thanks,
Florian
diff mbox series

Patch

diff --git a/include/setjmp.h b/include/setjmp.h
index a3936e611d..26c6775d08 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -31,39 +31,6 @@  libc_hidden_proto (__sigsetjmp)
 extern __typeof (__sigsetjmp) __sigsetjmp attribute_hidden;
 # endif
 
-/* Check jmp_buf sizes, alignments and offsets.  */
-# include <stddef.h>
-# include <jmp_buf-macros.h>
-
-# define SJSTR_HELPER(x) #x
-# define SJSTR(x) SJSTR_HELPER(x)
-
-# define TEST_SIZE(type, size) \
-  _Static_assert (sizeof (type) == size, \
-		  "size of " #type " != " \
-		  SJSTR (size))
-# define TEST_ALIGN(type, align) \
-  _Static_assert (__alignof__ (type) == align , \
-		  "align of " #type " != " \
-		  SJSTR (align))
-# define TEST_OFFSET(type, member, offset) \
-  _Static_assert (offsetof (type, member) == offset, \
-		  "offset of " #member " field of " #type " != " \
-		  SJSTR (offset))
-
-/* Check if jmp_buf have the expected sizes.  */
-TEST_SIZE (jmp_buf, JMP_BUF_SIZE);
-TEST_SIZE (sigjmp_buf, SIGJMP_BUF_SIZE);
-
-/* Check if jmp_buf have the expected alignments.  */
-TEST_ALIGN (jmp_buf, JMP_BUF_ALIGN);
-TEST_ALIGN (sigjmp_buf, SIGJMP_BUF_ALIGN);
-
-/* Check if internal fields in jmp_buf have the expected offsets.  */
-TEST_OFFSET (struct __jmp_buf_tag, __mask_was_saved,
-	     MASK_WAS_SAVED_OFFSET);
-TEST_OFFSET (struct __jmp_buf_tag, __saved_mask,
-	     SAVED_MASK_OFFSET);
 #endif
 
 #endif
diff --git a/setjmp/Makefile b/setjmp/Makefile
index e1ad33c92d..a121892851 100644
--- a/setjmp/Makefile
+++ b/setjmp/Makefile
@@ -31,7 +31,10 @@  routines	:= setjmp sigjmp bsd-setjmp bsd-_setjmp \
 tests		:= tst-setjmp jmpbug bug269-setjmp tst-setjmp-fp \
 		   tst-sigsetjmp tst-setjmp-static
 tests-static	:= tst-setjmp-static
+tests-internal  := \
+       tst-setjmp-check
 
+gen-as-const-headers += jmp_buf-macros.sym
 
 include ../Rules
 
diff --git a/setjmp/jmp_buf-macros.sym b/setjmp/jmp_buf-macros.sym
new file mode 100644
index 0000000000..e43958170d
--- /dev/null
+++ b/setjmp/jmp_buf-macros.sym
@@ -0,0 +1,11 @@ 
+#include <setjmp.h>
+#include <stddef.h>
+
+--
+
+JMP_BUF_SIZE		sizeof (jmp_buf)
+JMP_BUF_ALIGN		_Alignof (jmp_buf)
+SIGJMP_BUF_SIZE		sizeof (sigjmp_buf)
+SIGJMP_BUF_ALIGN	_Alignof (sigjmp_buf)
+MASK_WAS_SAVED_OFFSET	offsetof (struct __jmp_buf_tag, __mask_was_saved)
+SAVED_MASK_OFFSET	offsetof (struct __jmp_buf_tag, __saved_mask)
diff --git a/setjmp/tst-setjmp-check.c b/setjmp/tst-setjmp-check.c
new file mode 100644
index 0000000000..392346c538
--- /dev/null
+++ b/setjmp/tst-setjmp-check.c
@@ -0,0 +1,57 @@ 
+/* Check jmp_buf sizes, alignments and offsets.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <stddef.h>
+#include <setjmp.h>
+#include <jmp_buf-macros.h>
+
+#define SJSTR_HELPER(x) #x
+#define SJSTR(x) SJSTR_HELPER(x)
+
+#define TEST_SIZE(type, size) \
+  _Static_assert (sizeof (type) == size, \
+		  "size of " #type " != " \
+		  SJSTR (size))
+#define TEST_ALIGN(type, align) \
+  _Static_assert (__alignof__ (type) == align , \
+		  "align of " #type " != " \
+		  SJSTR (align))
+#define TEST_OFFSET(type, member, offset) \
+  _Static_assert (offsetof (type, member) == offset, \
+		  "offset of " #member " field of " #type " != " \
+		  SJSTR (offset))
+
+/* Check if jmp_buf have the expected sizes.  */
+TEST_SIZE (jmp_buf, JMP_BUF_SIZE);
+TEST_SIZE (sigjmp_buf, SIGJMP_BUF_SIZE);
+
+/* Check if jmp_buf have the expected alignments.  */
+TEST_ALIGN (jmp_buf, JMP_BUF_ALIGN);
+TEST_ALIGN (sigjmp_buf, SIGJMP_BUF_ALIGN);
+
+/* Check if internal fields in jmp_buf have the expected offsets.  */
+TEST_OFFSET (struct __jmp_buf_tag, __mask_was_saved,
+	     MASK_WAS_SAVED_OFFSET);
+TEST_OFFSET (struct __jmp_buf_tag, __saved_mask,
+	     SAVED_MASK_OFFSET);
+
+int
+main (int argc, char *argv[])
+{
+  return 0;
+}
diff --git a/sysdeps/mach/hurd/i386/jmp_buf-macros.h b/sysdeps/mach/hurd/i386/jmp_buf-macros.h
deleted file mode 100644
index 834f5fb243..0000000000
--- a/sysdeps/mach/hurd/i386/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 32
-#define SIGJMP_BUF_SIZE 32
-#define JMP_BUF_ALIGN 4
-#define SIGJMP_BUF_ALIGN 4
-#define MASK_WAS_SAVED_OFFSET 24
-#define SAVED_MASK_OFFSET 28
diff --git a/sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h
deleted file mode 100644
index 608a7ad1f7..0000000000
--- a/sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 312
-#define SIGJMP_BUF_SIZE 312
-#define JMP_BUF_ALIGN 8
-#define SIGJMP_BUF_ALIGN 8
-#define MASK_WAS_SAVED_OFFSET 176
-#define SAVED_MASK_OFFSET 184
diff --git a/sysdeps/unix/sysv/linux/alpha/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/alpha/jmp_buf-macros.h
deleted file mode 100644
index b595173e6f..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 272
-#define SIGJMP_BUF_SIZE 272
-#define JMP_BUF_ALIGN 8
-#define SIGJMP_BUF_ALIGN 8
-#define MASK_WAS_SAVED_OFFSET 136
-#define SAVED_MASK_OFFSET 144
diff --git a/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h
deleted file mode 100644
index 296f3197ee..0000000000
--- a/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE		(32 + 1 + 64 / (8 * sizeof (unsigned long int))) * sizeof (unsigned long int)
-#define SIGJMP_BUF_SIZE		(32 + 1 + 64 / (8 * sizeof (unsigned long int))) * sizeof (unsigned long int)
-#define JMP_BUF_ALIGN		__alignof__ (unsigned long int)
-#define SIGJMP_BUF_ALIGN	__alignof__ (unsigned long int)
-#define MASK_WAS_SAVED_OFFSET	(32 * sizeof (unsigned long int))
-#define SAVED_MASK_OFFSET	(33 * sizeof (unsigned long int))
diff --git a/sysdeps/unix/sysv/linux/arm/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/arm/jmp_buf-macros.h
deleted file mode 100644
index eb64802525..0000000000
--- a/sysdeps/unix/sysv/linux/arm/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 392
-#define SIGJMP_BUF_SIZE 392
-#define JMP_BUF_ALIGN 8
-#define SIGJMP_BUF_ALIGN 8
-#define MASK_WAS_SAVED_OFFSET 256
-#define SAVED_MASK_OFFSET 260
diff --git a/sysdeps/unix/sysv/linux/csky/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/csky/jmp_buf-macros.h
deleted file mode 100644
index 5a390c7662..0000000000
--- a/sysdeps/unix/sysv/linux/csky/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 268
-#define SIGJMP_BUF_SIZE 268
-#define JMP_BUF_ALIGN 4
-#define SIGJMP_BUF_ALIGN 4
-#define MASK_WAS_SAVED_OFFSET 136
-#define SAVED_MASK_OFFSET 140
diff --git a/sysdeps/unix/sysv/linux/hppa/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/hppa/jmp_buf-macros.h
deleted file mode 100644
index 6ede0d6af7..0000000000
--- a/sysdeps/unix/sysv/linux/hppa/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 304
-#define SIGJMP_BUF_SIZE 304
-#define JMP_BUF_ALIGN 8
-#define SIGJMP_BUF_ALIGN 8
-#define MASK_WAS_SAVED_OFFSET 168
-#define SAVED_MASK_OFFSET 172
diff --git a/sysdeps/unix/sysv/linux/i386/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/i386/jmp_buf-macros.h
deleted file mode 100644
index 554bbed309..0000000000
--- a/sysdeps/unix/sysv/linux/i386/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 156
-#define SIGJMP_BUF_SIZE 156
-#define JMP_BUF_ALIGN 4
-#define SIGJMP_BUF_ALIGN 4
-#define MASK_WAS_SAVED_OFFSET 24
-#define SAVED_MASK_OFFSET 28
diff --git a/sysdeps/unix/sysv/linux/ia64/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/ia64/jmp_buf-macros.h
deleted file mode 100644
index 41788657ec..0000000000
--- a/sysdeps/unix/sysv/linux/ia64/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 704
-#define SIGJMP_BUF_SIZE 704
-#define JMP_BUF_ALIGN 16
-#define SIGJMP_BUF_ALIGN 16
-#define MASK_WAS_SAVED_OFFSET 560
-#define SAVED_MASK_OFFSET 568
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/fpu/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/m68k/coldfire/fpu/jmp_buf-macros.h
deleted file mode 100644
index 9b25281277..0000000000
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/fpu/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 256
-#define SIGJMP_BUF_SIZE 256
-#define JMP_BUF_ALIGN 2
-#define SIGJMP_BUF_ALIGN 2
-#define MASK_WAS_SAVED_OFFSET 124
-#define SAVED_MASK_OFFSET 128
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/nofpu/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/m68k/coldfire/nofpu/jmp_buf-macros.h
deleted file mode 100644
index 24fa289e64..0000000000
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/nofpu/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 192
-#define SIGJMP_BUF_SIZE 192
-#define JMP_BUF_ALIGN 2
-#define SIGJMP_BUF_ALIGN 2
-#define MASK_WAS_SAVED_OFFSET 60
-#define SAVED_MASK_OFFSET 64
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/m68k/m680x0/jmp_buf-macros.h
deleted file mode 100644
index 2f62ecb4b3..0000000000
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 288
-#define SIGJMP_BUF_SIZE 288
-#define JMP_BUF_ALIGN 2
-#define SIGJMP_BUF_ALIGN 2
-#define MASK_WAS_SAVED_OFFSET 156
-#define SAVED_MASK_OFFSET 160
diff --git a/sysdeps/unix/sysv/linux/microblaze/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/microblaze/jmp_buf-macros.h
deleted file mode 100644
index 9c435f7967..0000000000
--- a/sysdeps/unix/sysv/linux/microblaze/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 216
-#define SIGJMP_BUF_SIZE 216
-#define JMP_BUF_ALIGN 4
-#define SIGJMP_BUF_ALIGN 4
-#define MASK_WAS_SAVED_OFFSET 84
-#define SAVED_MASK_OFFSET 88
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/mips/mips32/jmp_buf-macros.h
deleted file mode 100644
index d46d69ecbd..0000000000
--- a/sysdeps/unix/sysv/linux/mips/mips32/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 240
-#define SIGJMP_BUF_SIZE 240
-#define JMP_BUF_ALIGN 8
-#define SIGJMP_BUF_ALIGN 8
-#define MASK_WAS_SAVED_OFFSET 104
-#define SAVED_MASK_OFFSET 108
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/mips/mips64/n32/jmp_buf-macros.h
deleted file mode 100644
index ed0f1232de..0000000000
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 288
-#define SIGJMP_BUF_SIZE 288
-#define JMP_BUF_ALIGN 8
-#define SIGJMP_BUF_ALIGN 8
-#define MASK_WAS_SAVED_OFFSET 152
-#define SAVED_MASK_OFFSET 156
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/mips/mips64/n64/jmp_buf-macros.h
deleted file mode 100644
index 38b5b0636a..0000000000
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 304
-#define SIGJMP_BUF_SIZE 304
-#define JMP_BUF_ALIGN 8
-#define SIGJMP_BUF_ALIGN 8
-#define MASK_WAS_SAVED_OFFSET 168
-#define SAVED_MASK_OFFSET 176
diff --git a/sysdeps/unix/sysv/linux/nios2/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/nios2/jmp_buf-macros.h
deleted file mode 100644
index 1cb9cab420..0000000000
--- a/sysdeps/unix/sysv/linux/nios2/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 172
-#define SIGJMP_BUF_SIZE 172
-#define JMP_BUF_ALIGN 4
-#define SIGJMP_BUF_ALIGN 4
-#define MASK_WAS_SAVED_OFFSET 40
-#define SAVED_MASK_OFFSET 44
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/jmp_buf-macros.h
deleted file mode 100644
index 11b0a8bb00..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 592
-#define SIGJMP_BUF_SIZE 592
-#define JMP_BUF_ALIGN 16
-#define SIGJMP_BUF_ALIGN 16
-#define MASK_WAS_SAVED_OFFSET 448
-#define SAVED_MASK_OFFSET 452
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/jmp_buf-macros.h
deleted file mode 100644
index d3e0d4e146..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 656
-#define SIGJMP_BUF_SIZE 656
-#define JMP_BUF_ALIGN 16
-#define SIGJMP_BUF_ALIGN 16
-#define MASK_WAS_SAVED_OFFSET 512
-#define SAVED_MASK_OFFSET 520
diff --git a/sysdeps/unix/sysv/linux/riscv/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/riscv/jmp_buf-macros.h
deleted file mode 100644
index 46e723b510..0000000000
--- a/sysdeps/unix/sysv/linux/riscv/jmp_buf-macros.h
+++ /dev/null
@@ -1,55 +0,0 @@ 
-/* The jump buffer constants for RISC-V.
-   Copyright (C) 2020-2021 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <https://www.gnu.org/licenses/>.  */
-
-/* Produced by this program:
-
-  #include <stdio.h>
-  #include <unistd.h>
-  #include <setjmp.h>
-  #include <stddef.h>
-
-  int main (int argc, char **argv)
-    {
-      printf ("#define JMP_BUF_SIZE %d\n", sizeof (jmp_buf));
-      printf ("#define JMP_BUF_ALIGN %d\n", __alignof__ (jmp_buf));
-      printf ("#define SIGJMP_BUF_SIZE %d\n", sizeof (sigjmp_buf));
-      printf ("#define SIGJMP_BUF_ALIGN %d\n", __alignof__ (sigjmp_buf));
-      printf ("#define MASK_WAS_SAVED_OFFSET %d\n",
-              offsetof (struct __jmp_buf_tag, __mask_was_saved));
-      printf ("#define SAVED_MASK_OFFSET %d\n",
-              offsetof (struct __jmp_buf_tag, __saved_mask));
-    } */
-
-#if defined __riscv_float_abi_soft
-# define JMP_BUF_SIZE 188
-# define JMP_BUF_ALIGN 4
-# define SIGJMP_BUF_SIZE 188
-# define SIGJMP_BUF_ALIGN 4
-# define MASK_WAS_SAVED_OFFSET 56
-# define SAVED_MASK_OFFSET 60
-#elif defined __riscv_float_abi_double
-# define JMP_BUF_SIZE 288
-# define JMP_BUF_ALIGN 8
-# define SIGJMP_BUF_SIZE 288
-# define SIGJMP_BUF_ALIGN 8
-# define MASK_WAS_SAVED_OFFSET 152
-# define SAVED_MASK_OFFSET 156
-#else
-# error "Unknown RISC-V floating-point ABI"
-#endif
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/riscv/rv64/jmp_buf-macros.h
deleted file mode 100644
index be9199e514..0000000000
--- a/sysdeps/unix/sysv/linux/riscv/rv64/jmp_buf-macros.h
+++ /dev/null
@@ -1,53 +0,0 @@ 
-/* jump buffer constants for RISC-V
-   Copyright (C) 2017-2021 Free Software Foundation, Inc.
-
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <https://www.gnu.org/licenses/>.  */
-
-/* Produced by this program:
-
-   #include <stdio.h>
-   #include <unistd.h>
-   #include <setjmp.h>
-   #include <stddef.h>
-
-   int main (int argc, char **argv)
-   {
-       printf ("#define JMP_BUF_SIZE %d\n", sizeof (jmp_buf));
-       printf ("#define JMP_BUF_ALIGN %d\n", __alignof__ (jmp_buf));
-       printf ("#define SIGJMP_BUF_SIZE %d\n", sizeof (sigjmp_buf));
-       printf ("#define SIGJMP_BUF_ALIGN %d\n", __alignof__ (sigjmp_buf));
-       printf ("#define MASK_WAS_SAVED_OFFSET %d\n", offsetof (struct __jmp_buf_tag, __mask_was_saved));
-       printf ("#define SAVED_MASK_OFFSET %d\n", offsetof (struct __jmp_buf_tag, __saved_mask));
-   } */
-
-#if defined __riscv_float_abi_soft
-# define JMP_BUF_SIZE 248
-# define JMP_BUF_ALIGN 8
-# define SIGJMP_BUF_SIZE 248
-# define SIGJMP_BUF_ALIGN 8
-# define MASK_WAS_SAVED_OFFSET 112
-# define SAVED_MASK_OFFSET 120
-#elif defined __riscv_float_abi_double
-# define JMP_BUF_SIZE 344
-# define JMP_BUF_ALIGN 8
-# define SIGJMP_BUF_SIZE 344
-# define SIGJMP_BUF_ALIGN 8
-# define MASK_WAS_SAVED_OFFSET 208
-# define SAVED_MASK_OFFSET 216
-#else
-# error "Unknown RISC-V floating-point ABI"
-#endif
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/s390/s390-32/jmp_buf-macros.h
deleted file mode 100644
index 0f29ff90d0..0000000000
--- a/sysdeps/unix/sysv/linux/s390/s390-32/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 188
-#define SIGJMP_BUF_SIZE 188
-#define JMP_BUF_ALIGN 4
-#define SIGJMP_BUF_ALIGN 4
-#define MASK_WAS_SAVED_OFFSET 56
-#define SAVED_MASK_OFFSET 60
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/s390/s390-64/jmp_buf-macros.h
deleted file mode 100644
index 4e5f348eaf..0000000000
--- a/sysdeps/unix/sysv/linux/s390/s390-64/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 280
-#define SIGJMP_BUF_SIZE 280
-#define JMP_BUF_ALIGN 8
-#define SIGJMP_BUF_ALIGN 8
-#define MASK_WAS_SAVED_OFFSET 144
-#define SAVED_MASK_OFFSET 152
diff --git a/sysdeps/unix/sysv/linux/sh/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/sh/jmp_buf-macros.h
deleted file mode 100644
index b2bc30db5d..0000000000
--- a/sysdeps/unix/sysv/linux/sh/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 192
-#define SIGJMP_BUF_SIZE 192
-#define JMP_BUF_ALIGN 4
-#define SIGJMP_BUF_ALIGN 4
-#define MASK_WAS_SAVED_OFFSET 60
-#define SAVED_MASK_OFFSET 64
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/sparc/sparc32/jmp_buf-macros.h
deleted file mode 100644
index 388533f88a..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 144
-#define SIGJMP_BUF_SIZE 144
-#define JMP_BUF_ALIGN 4
-#define SIGJMP_BUF_ALIGN 4
-#define MASK_WAS_SAVED_OFFSET 12
-#define SAVED_MASK_OFFSET 16
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/sparc/sparc64/jmp_buf-macros.h
deleted file mode 100644
index e86afd7b3d..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 640
-#define SIGJMP_BUF_SIZE 640
-#define JMP_BUF_ALIGN 16
-#define SIGJMP_BUF_ALIGN 16
-#define MASK_WAS_SAVED_OFFSET 496
-#define SAVED_MASK_OFFSET 504
diff --git a/sysdeps/unix/sysv/linux/x86/jmp_buf-ssp.sym b/sysdeps/unix/sysv/linux/x86/jmp_buf-ssp.sym
index 12829196db..9416ca23df 100644
--- a/sysdeps/unix/sysv/linux/x86/jmp_buf-ssp.sym
+++ b/sysdeps/unix/sysv/linux/x86/jmp_buf-ssp.sym
@@ -1,4 +1,5 @@ 
 #include <setjmpP.h>
+#include <stddef.h>
 #undef __saved_mask
 
 --
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/x86_64/64/jmp_buf-macros.h
deleted file mode 100644
index 3ae63ab5c5..0000000000
--- a/sysdeps/unix/sysv/linux/x86_64/64/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 200
-#define SIGJMP_BUF_SIZE 200
-#define JMP_BUF_ALIGN 8
-#define SIGJMP_BUF_ALIGN 8
-#define MASK_WAS_SAVED_OFFSET 64
-#define SAVED_MASK_OFFSET 72
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/x86_64/x32/jmp_buf-macros.h
deleted file mode 100644
index 2fa8e9ec38..0000000000
--- a/sysdeps/unix/sysv/linux/x86_64/x32/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 200
-#define SIGJMP_BUF_SIZE 200
-#define JMP_BUF_ALIGN 8
-#define SIGJMP_BUF_ALIGN 8
-#define MASK_WAS_SAVED_OFFSET 64
-#define SAVED_MASK_OFFSET 68