setjmp: Replace jmp_buf-macros.h with jmp_buf-macros.sym
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
It requires less boilerplate code for newer ports. The _Static_assert
checks from internal setjmp are moved to its own implementation 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.
---
include/setjmp.h | 33 -----------
setjmp/Makefile | 4 +-
setjmp/__setjmp_check.c | 34 ++++++++++++
setjmp/jmp_buf-macros.sym | 11 ++++
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, 49 insertions(+), 298 deletions(-)
create mode 100644 setjmp/__setjmp_check.c
create mode 100644 setjmp/jmp_buf-macros.sym
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
* Adhemerval Zanella via Libc-alpha:
> diff --git a/setjmp/__setjmp_check.c b/setjmp/__setjmp_check.c
> new file mode 100644
> index 0000000000..4be6e432b3
> --- /dev/null
> +++ b/setjmp/__setjmp_check.c
> @@ -0,0 +1,34 @@
> +/* Check jmp_buf sizes, alignments and offsets. */
Shouldn't this be an internal test?
I checked the generated constants against the removed files, and found
no discrepancies, so I think this can go in.
Thanks,
Florian
On 19/11/2021 15:28, Florian Weimer wrote:
> * Adhemerval Zanella via Libc-alpha:
>
>> diff --git a/setjmp/__setjmp_check.c b/setjmp/__setjmp_check.c
>> new file mode 100644
>> index 0000000000..4be6e432b3
>> --- /dev/null
>> +++ b/setjmp/__setjmp_check.c
>> @@ -0,0 +1,34 @@
>> +/* Check jmp_buf sizes, alignments and offsets. */
>
> Shouldn't this be an internal test?
>
> I checked the generated constants against the removed files, and found
> no discrepancies, so I think this can go in.
My understanding is the _Static_assert would be more useful at build time,
specially for cross-compilation.
* Adhemerval Zanella:
> On 19/11/2021 15:28, Florian Weimer wrote:
>> * Adhemerval Zanella via Libc-alpha:
>>
>>> diff --git a/setjmp/__setjmp_check.c b/setjmp/__setjmp_check.c
>>> new file mode 100644
>>> index 0000000000..4be6e432b3
>>> --- /dev/null
>>> +++ b/setjmp/__setjmp_check.c
>>> @@ -0,0 +1,34 @@
>>> +/* Check jmp_buf sizes, alignments and offsets. */
>>
>> Shouldn't this be an internal test?
>>
>> I checked the generated constants against the removed files, and found
>> no discrepancies, so I think this can go in.
>
> My understanding is the _Static_assert would be more useful at build time,
> specially for cross-compilation.
An internal will still have the same effect when cross-compiled.
Thanks,
Florian
On 19/11/2021 15:33, Florian Weimer wrote:
> * Adhemerval Zanella:
>
>> On 19/11/2021 15:28, Florian Weimer wrote:
>>> * Adhemerval Zanella via Libc-alpha:
>>>
>>>> diff --git a/setjmp/__setjmp_check.c b/setjmp/__setjmp_check.c
>>>> new file mode 100644
>>>> index 0000000000..4be6e432b3
>>>> --- /dev/null
>>>> +++ b/setjmp/__setjmp_check.c
>>>> @@ -0,0 +1,34 @@
>>>> +/* Check jmp_buf sizes, alignments and offsets. */
>>>
>>> Shouldn't this be an internal test?
>>>
>>> I checked the generated constants against the removed files, and found
>>> no discrepancies, so I think this can go in.
>>
>> My understanding is the _Static_assert would be more useful at build time,
>> specially for cross-compilation.
>
> An internal will still have the same effect when cross-compiled.
I don't have a strong preference in fact, I think an object consumes slight
less resources through (cpu time to build, disk size).
* Adhemerval Zanella:
> On 19/11/2021 15:33, Florian Weimer wrote:
>> * Adhemerval Zanella:
>>
>>> On 19/11/2021 15:28, Florian Weimer wrote:
>>>> * Adhemerval Zanella via Libc-alpha:
>>>>
>>>>> diff --git a/setjmp/__setjmp_check.c b/setjmp/__setjmp_check.c
>>>>> new file mode 100644
>>>>> index 0000000000..4be6e432b3
>>>>> --- /dev/null
>>>>> +++ b/setjmp/__setjmp_check.c
>>>>> @@ -0,0 +1,34 @@
>>>>> +/* Check jmp_buf sizes, alignments and offsets. */
>>>>
>>>> Shouldn't this be an internal test?
>>>>
>>>> I checked the generated constants against the removed files, and found
>>>> no discrepancies, so I think this can go in.
>>>
>>> My understanding is the _Static_assert would be more useful at build time,
>>> specially for cross-compilation.
>>
>> An internal will still have the same effect when cross-compiled.
>
> I don't have a strong preference in fact, I think an object consumes slight
> less resources through (cpu time to build, disk size).
It consumes space in the installed artifacts, though.
$ ar t libc.a | grep setjmp
setjmp.o
bsd-setjmp.o
bsd-_setjmp.o
__setjmp_check.o
$ readelf -sW libc.so.6 | grep setjmp
304: 0000000000041010 10 FUNC GLOBAL DEFAULT 14 setjmp@@GLIBC_2.2.5
546: 0000000000041020 7 FUNC GLOBAL DEFAULT 14 _setjmp@@GLIBC_2.2.5
1012: 0000000000040f80 87 FUNC GLOBAL DEFAULT 14 __sigsetjmp@@GLIBC_2.2.5
286: 0000000000000000 0 FILE LOCAL DEFAULT ABS __setjmp_check.c
4893: 0000000000040f80 87 FUNC LOCAL DEFAULT 14 __GI___sigsetjmp
5090: 0000000000041020 7 FUNC LOCAL DEFAULT 14 __GI__setjmp
7075: 0000000000040f80 87 FUNC GLOBAL DEFAULT 14 __sigsetjmp
9251: 0000000000041020 7 FUNC GLOBAL DEFAULT 14 _setjmp
9705: 0000000000041010 10 FUNC GLOBAL DEFAULT 14 setjmp
$
Thanks,
Florian
On 19/11/2021 15:38, Florian Weimer wrote:
> * Adhemerval Zanella:
>
>> On 19/11/2021 15:33, Florian Weimer wrote:
>>> * Adhemerval Zanella:
>>>
>>>> On 19/11/2021 15:28, Florian Weimer wrote:
>>>>> * Adhemerval Zanella via Libc-alpha:
>>>>>
>>>>>> diff --git a/setjmp/__setjmp_check.c b/setjmp/__setjmp_check.c
>>>>>> new file mode 100644
>>>>>> index 0000000000..4be6e432b3
>>>>>> --- /dev/null
>>>>>> +++ b/setjmp/__setjmp_check.c
>>>>>> @@ -0,0 +1,34 @@
>>>>>> +/* Check jmp_buf sizes, alignments and offsets. */
>>>>>
>>>>> Shouldn't this be an internal test?
>>>>>
>>>>> I checked the generated constants against the removed files, and found
>>>>> no discrepancies, so I think this can go in.
>>>>
>>>> My understanding is the _Static_assert would be more useful at build time,
>>>> specially for cross-compilation.
>>>
>>> An internal will still have the same effect when cross-compiled.
>>
>> I don't have a strong preference in fact, I think an object consumes slight
>> less resources through (cpu time to build, disk size).
>
> It consumes space in the installed artifacts, though.
>
> $ ar t libc.a | grep setjmp
> setjmp.o
> bsd-setjmp.o
> bsd-_setjmp.o
> __setjmp_check.o
> $ readelf -sW libc.so.6 | grep setjmp
> 304: 0000000000041010 10 FUNC GLOBAL DEFAULT 14 setjmp@@GLIBC_2.2.5
> 546: 0000000000041020 7 FUNC GLOBAL DEFAULT 14 _setjmp@@GLIBC_2.2.5
> 1012: 0000000000040f80 87 FUNC GLOBAL DEFAULT 14 __sigsetjmp@@GLIBC_2.2.5
> 286: 0000000000000000 0 FILE LOCAL DEFAULT ABS __setjmp_check.c
> 4893: 0000000000040f80 87 FUNC LOCAL DEFAULT 14 __GI___sigsetjmp
> 5090: 0000000000041020 7 FUNC LOCAL DEFAULT 14 __GI__setjmp
> 7075: 0000000000040f80 87 FUNC GLOBAL DEFAULT 14 __sigsetjmp
> 9251: 0000000000041020 7 FUNC GLOBAL DEFAULT 14 _setjmp
> 9705: 0000000000041010 10 FUNC GLOBAL DEFAULT 14 setjmp
Hum I forgot to verify this, I will change to an internal test.
* Adhemerval Zanella:
> Hum I forgot to verify this, I will change to an internal test.
Thanks!
Florian
@@ -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
@@ -26,12 +26,14 @@ headers := setjmp.h bits/setjmp.h bits/setjmp2.h \
bits/types/struct___jmp_buf_tag.h
routines := setjmp sigjmp bsd-setjmp bsd-_setjmp \
- longjmp __longjmp jmp-unwind
+ longjmp __longjmp jmp-unwind \
+ __setjmp_check
tests := tst-setjmp jmpbug bug269-setjmp tst-setjmp-fp \
tst-sigsetjmp tst-setjmp-static
tests-static := tst-setjmp-static
+gen-as-const-headers += jmp_buf-macros.sym
include ../Rules
new file mode 100644
@@ -0,0 +1,34 @@
+/* Check jmp_buf sizes, alignments and offsets. */
+#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);
new file mode 100644
@@ -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)
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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))
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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
@@ -1,4 +1,5 @@
#include <setjmpP.h>
+#include <stddef.h>
#undef __saved_mask
--
deleted file mode 100644
@@ -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
deleted file mode 100644
@@ -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