mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-30 12:31:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add jmp_buf-macros.h

Browse Source 
Verify that sizes, alignments and field offsets of jmp_buf as well as
sigjmp_buf are unchanged regardless how struct __jmp_buf_tag is defined.
Since jmp_buf is target specific, jmp_buf-macros.h is added for each
Linux target.  A new target must provides its own jmp_buf-macros.h.

TODO: Hurd needs to provide a jmp_buf-macros.h.

Tested with build-many-glibcs.py.

	* include/setjmp.h [!_ISOMAC]: Include <stddef.h> and
	<jmp_buf-macros.h>.
	[!_ISOMAC] (STR_HELPER): New.
	[!_ISOMAC] (STR): Likewise.
	[!_ISOMAC] (TEST_SIZE): Likewise.
	[!_ISOMAC] (TEST_ALIGN): Likewise.
	[!_ISOMAC] (TEST_OFFSET): Likewise.
	[!_ISOMAC] Add _Static_assert to check sizes, alignments and
	field offsets of jmp_buf as well as sigjmp_buf.
	* sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/alpha/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/arm/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/hppa/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/i386/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/ia64/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/m68k/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/microblaze/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/mips32/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/mips64/n32/jmp_buf-macros.h:
	Likewise.
	* sysdeps/unix/sysv/linux/mips/mips64/n64/jmp_buf-macros.h:
	Likewise.
	* sysdeps/unix/sysv/linux/nios2/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/jmp_buf-macros.h:
	Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/jmp_buf-macros.h:
	Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/sh/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/jmp_buf-macros.h:
	Likewise.
	* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/jmp_buf-macros.h:
	Likewise.
	* sysdeps/unix/sysv/linux/tile/tilepro/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/64/jmp_buf-macros.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/x32/jmp_buf-macros.h: Likewise.
This commit is contained in:
H.J. Lu 2017-11-09 05:09:49 -08:00
parent 3683b423a4
commit 8cb5295d3f
26 changed files with 220 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ChangeLog
View File

@ -1,3 +1,45 @@
2017-11-09 H.J. Lu <hongjiu.lu@intel.com>
* include/setjmp.h [!_ISOMAC]: Include <stddef.h> and
<jmp_buf-macros.h>.
[!_ISOMAC] (STR_HELPER): New.
[!_ISOMAC] (STR): Likewise.
[!_ISOMAC] (TEST_SIZE): Likewise.
[!_ISOMAC] (TEST_ALIGN): Likewise.
[!_ISOMAC] (TEST_OFFSET): Likewise.
[!_ISOMAC] Add _Static_assert to check sizes, alignments and
field offsets of jmp_buf as well as sigjmp_buf.
* sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/arm/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/hppa/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/i386/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/m68k/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/microblaze/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n32/jmp_buf-macros.h:
Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/jmp_buf-macros.h:
Likewise.
* sysdeps/unix/sysv/linux/nios2/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/jmp_buf-macros.h:
Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/jmp_buf-macros.h:
Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/sh/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/jmp_buf-macros.h:
Likewise.
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/jmp_buf-macros.h:
Likewise.
* sysdeps/unix/sysv/linux/tile/tilepro/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/64/jmp_buf-macros.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/x32/jmp_buf-macros.h: Likewise.
2017-11-07 Joseph Myers <joseph@codesourcery.com>
* include/float.h

34
include/setjmp.h
View File

@ -31,6 +31,40 @@ libc_hidden_proto (__sigsetjmp)
# if IS_IN (rtld) && !defined NO_RTLD_HIDDEN
extern __typeof (__sigsetjmp) __sigsetjmp attribute_hidden;
# endif
/* Check jmp_buf sizes, alignments and offsets. */
# include <stddef.h>
# include <jmp_buf-macros.h>
# define STR_HELPER(x) #x
# define STR(x) STR_HELPER(x)
# define TEST_SIZE(type, size) \
_Static_assert (sizeof (type) == size, \
"size of " #type " != " \
STR (size))
# define TEST_ALIGN(type, align) \
_Static_assert (__alignof__ (type) == align , \
"align of " #type " != " \
STR (align))
# define TEST_OFFSET(type, member, offset) \
_Static_assert (offsetof (type, member) == offset, \
"offset of " #member " field of " #type " != " \
STR (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

6
sysdeps/unix/sysv/linux/aarch64/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/alpha/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/arm/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/hppa/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/i386/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/ia64/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/m68k/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/microblaze/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/mips/mips32/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/mips/mips64/n32/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/mips/mips64/n64/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/nios2/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/powerpc/powerpc32/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/powerpc/powerpc64/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/s390/s390-32/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/s390/s390-64/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/sh/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/sparc/sparc32/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/sparc/sparc64/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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 264

6
sysdeps/unix/sysv/linux/tile/tilepro/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#define JMP_BUF_SIZE 260
#define SIGJMP_BUF_SIZE 260
#define JMP_BUF_ALIGN 4
#define SIGJMP_BUF_ALIGN 4
#define MASK_WAS_SAVED_OFFSET 128
#define SAVED_MASK_OFFSET 132

6
sysdeps/unix/sysv/linux/x86_64/64/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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

6
sysdeps/unix/sysv/linux/x86_64/x32/jmp_buf-macros.h Normal file
View File

@ -0,0 +1,6 @@
#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