qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86: Avoid single-argument _Static_assert in <tls.h> 

Older GCC versions do not support this extension.  Fixes commit f1bdee6179
("x86 tls: Use _Static_assert for TLS access size assertion").
This commit is contained in:
Florian Weimer 2020-02-17 11:08:15 +01:00
parent f1bdee6179
commit fe49a73316
3 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sysdeps/i386/nptl/tls.h
View File

@ -256,8 +256,9 @@ tls_fill_user_desc (union user_desc_init *desc,
# define THREAD_GETMEM(descr, member) \ # define THREAD_GETMEM(descr, member) \
({ __typeof (descr->member) __value; \ ({ __typeof (descr->member) __value; \
_Static_assert (sizeof (__value) == 1 \ _Static_assert (sizeof (__value) == 1 \
|| sizeof (__value) == 4 \ || sizeof (__value) == 4 \
|| sizeof (__value) == 8); \ || sizeof (__value) == 8, \
"size of per-thread data"); \
if (sizeof (__value) == 1) \ if (sizeof (__value) == 1) \
asm volatile ("movb %%gs:%P2,%b0" \ asm volatile ("movb %%gs:%P2,%b0" \
: "=q" (__value) \ : "=q" (__value) \
@ -281,8 +282,9 @@ tls_fill_user_desc (union user_desc_init *desc,
# define THREAD_GETMEM_NC(descr, member, idx) \ # define THREAD_GETMEM_NC(descr, member, idx) \
({ __typeof (descr->member[0]) __value; \ ({ __typeof (descr->member[0]) __value; \
_Static_assert (sizeof (__value) == 1 \ _Static_assert (sizeof (__value) == 1 \
|| sizeof (__value) == 4 \ || sizeof (__value) == 4 \
|| sizeof (__value) == 8); \ || sizeof (__value) == 8, \
"size of per-thread data"); \
if (sizeof (__value) == 1) \ if (sizeof (__value) == 1) \
asm volatile ("movb %%gs:%P2(%3),%b0" \ asm volatile ("movb %%gs:%P2(%3),%b0" \
: "=q" (__value) \ : "=q" (__value) \
@ -309,8 +311,9 @@ tls_fill_user_desc (union user_desc_init *desc,
# define THREAD_SETMEM(descr, member, value) \ # define THREAD_SETMEM(descr, member, value) \
({ \ ({ \
_Static_assert (sizeof (descr->member) == 1 \ _Static_assert (sizeof (descr->member) == 1 \
|| sizeof (descr->member) == 4 \ || sizeof (descr->member) == 4 \
|| sizeof (descr->member) == 8); \ || sizeof (descr->member) == 8, \
"size of per-thread data"); \
if (sizeof (descr->member) == 1) \ if (sizeof (descr->member) == 1) \
asm volatile ("movb %b0,%%gs:%P1" : \ asm volatile ("movb %b0,%%gs:%P1" : \
: "iq" (value), \ : "iq" (value), \
@ -333,8 +336,9 @@ tls_fill_user_desc (union user_desc_init *desc,
# define THREAD_SETMEM_NC(descr, member, idx, value) \ # define THREAD_SETMEM_NC(descr, member, idx, value) \
({ \ ({ \
_Static_assert (sizeof (descr->member[0]) == 1 \ _Static_assert (sizeof (descr->member[0]) == 1 \
|| sizeof (descr->member[0]) == 4 \ || sizeof (descr->member[0]) == 4 \
|| sizeof (descr->member[0]) == 8); \ || sizeof (descr->member[0]) == 8, \
"size of per-thread data"); \
if (sizeof (descr->member[0]) == 1) \ if (sizeof (descr->member[0]) == 1) \
asm volatile ("movb %b0,%%gs:%P1(%2)" : \ asm volatile ("movb %b0,%%gs:%P1(%2)" : \
: "iq" (value), \ : "iq" (value), \

20
sysdeps/mach/hurd/i386/tls.h
View File

@ -167,8 +167,9 @@ out:
# define THREAD_GETMEM(descr, member) \ # define THREAD_GETMEM(descr, member) \
({ __typeof (descr->member) __value; \ ({ __typeof (descr->member) __value; \
_Static_assert (sizeof (__value) == 1 \ _Static_assert (sizeof (__value) == 1 \
|| sizeof (__value) == 4 \ || sizeof (__value) == 4 \
|| sizeof (__value) == 8); \ || sizeof (__value) == 8, \
"size of per-thread data"); \
if (sizeof (__value) == 1) \ if (sizeof (__value) == 1) \
asm volatile ("movb %%gs:%P2,%b0" \ asm volatile ("movb %%gs:%P2,%b0" \
: "=q" (__value) \ : "=q" (__value) \
@ -192,8 +193,9 @@ out:
# define THREAD_GETMEM_NC(descr, member, idx) \ # define THREAD_GETMEM_NC(descr, member, idx) \
({ __typeof (descr->member[0]) __value; \ ({ __typeof (descr->member[0]) __value; \
_Static_assert (sizeof (__value) == 1 \ _Static_assert (sizeof (__value) == 1 \
|| sizeof (__value) == 4 \ || sizeof (__value) == 4 \
|| sizeof (__value) == 8); \ || sizeof (__value) == 8, \
"size of per-thread data"); \
if (sizeof (__value) == 1) \ if (sizeof (__value) == 1) \
asm volatile ("movb %%gs:%P2(%3),%b0" \ asm volatile ("movb %%gs:%P2(%3),%b0" \
: "=q" (__value) \ : "=q" (__value) \
@ -220,8 +222,9 @@ out:
# define THREAD_SETMEM(descr, member, value) \ # define THREAD_SETMEM(descr, member, value) \
({ \ ({ \
_Static_assert (sizeof (descr->member) == 1 \ _Static_assert (sizeof (descr->member) == 1 \
|| sizeof (descr->member) == 4 \ || sizeof (descr->member) == 4 \
|| sizeof (descr->member) == 8); \ || sizeof (descr->member) == 8, \
"size of per-thread data"); \
if (sizeof (descr->member) == 1) \ if (sizeof (descr->member) == 1) \
asm volatile ("movb %b0,%%gs:%P1" : \ asm volatile ("movb %b0,%%gs:%P1" : \
: "iq" (value), \ : "iq" (value), \
@ -244,8 +247,9 @@ out:
# define THREAD_SETMEM_NC(descr, member, idx, value) \ # define THREAD_SETMEM_NC(descr, member, idx, value) \
({ \ ({ \
_Static_assert (sizeof (descr->member[0]) == 1 \ _Static_assert (sizeof (descr->member[0]) == 1 \
|| sizeof (descr->member[0]) == 4 \ || sizeof (descr->member[0]) == 4 \
|| sizeof (descr->member[0]) == 8); \ || sizeof (descr->member[0]) == 8, \
"size of per-thread data"); \
if (sizeof (descr->member[0]) == 1) \ if (sizeof (descr->member[0]) == 1) \
asm volatile ("movb %b0,%%gs:%P1(%2)" : \ asm volatile ("movb %b0,%%gs:%P1(%2)" : \
: "iq" (value), \ : "iq" (value), \

20
sysdeps/x86_64/nptl/tls.h
View File

@ -200,8 +200,9 @@ _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
# define THREAD_GETMEM(descr, member) \ # define THREAD_GETMEM(descr, member) \
({ __typeof (descr->member) __value; \ ({ __typeof (descr->member) __value; \
_Static_assert (sizeof (__value) == 1 \ _Static_assert (sizeof (__value) == 1 \
|| sizeof (__value) == 4 \ || sizeof (__value) == 4 \
|| sizeof (__value) == 8); \ || sizeof (__value) == 8, \
"size of per-thread data"); \
if (sizeof (__value) == 1) \ if (sizeof (__value) == 1) \
asm volatile ("movb %%fs:%P2,%b0" \ asm volatile ("movb %%fs:%P2,%b0" \
: "=q" (__value) \ : "=q" (__value) \
@ -223,8 +224,9 @@ _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
# define THREAD_GETMEM_NC(descr, member, idx) \ # define THREAD_GETMEM_NC(descr, member, idx) \
({ __typeof (descr->member[0]) __value; \ ({ __typeof (descr->member[0]) __value; \
_Static_assert (sizeof (__value) == 1 \ _Static_assert (sizeof (__value) == 1 \
|| sizeof (__value) == 4 \ || sizeof (__value) == 4 \
|| sizeof (__value) == 8); \ || sizeof (__value) == 8, \
"size of per-thread data"); \
if (sizeof (__value) == 1) \ if (sizeof (__value) == 1) \
asm volatile ("movb %%fs:%P2(%q3),%b0" \ asm volatile ("movb %%fs:%P2(%q3),%b0" \
: "=q" (__value) \ : "=q" (__value) \
@ -257,8 +259,9 @@ _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
# define THREAD_SETMEM(descr, member, value) \ # define THREAD_SETMEM(descr, member, value) \
({ \ ({ \
_Static_assert (sizeof (descr->member) == 1 \ _Static_assert (sizeof (descr->member) == 1 \
|| sizeof (descr->member) == 4 \ || sizeof (descr->member) == 4 \
|| sizeof (descr->member) == 8); \ || sizeof (descr->member) == 8, \
"size of per-thread data"); \
if (sizeof (descr->member) == 1) \ if (sizeof (descr->member) == 1) \
asm volatile ("movb %b0,%%fs:%P1" : \ asm volatile ("movb %b0,%%fs:%P1" : \
: "iq" (value), \ : "iq" (value), \
@ -279,8 +282,9 @@ _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
# define THREAD_SETMEM_NC(descr, member, idx, value) \ # define THREAD_SETMEM_NC(descr, member, idx, value) \
({ \ ({ \
_Static_assert (sizeof (descr->member[0]) == 1 \ _Static_assert (sizeof (descr->member[0]) == 1 \
|| sizeof (descr->member[0]) == 4 \ || sizeof (descr->member[0]) == 4 \
|| sizeof (descr->member[0]) == 8); \ || sizeof (descr->member[0]) == 8, \
"size of per-thread data"); \
if (sizeof (descr->member[0]) == 1) \ if (sizeof (descr->member[0]) == 1) \
asm volatile ("movb %b0,%%fs:%P1(%q2)" : \ asm volatile ("movb %b0,%%fs:%P1(%q2)" : \
: "iq" (value), \ : "iq" (value), \