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

Message ID 87blpxse7g.fsf@oldenburg2.str.redhat.com
State New
Headers show
Series
  • [COMMITTED] x86: Avoid single-argument _Static_assert in <tls.h>
Related show

Commit Message

Florian Weimer Feb. 17, 2020, 10:25 a.m.
Older GCC versions do not support this extension.  Fixes commit f1bdee61797
("x86 tls: Use _Static_assert for TLS access size assertion").

-----
 sysdeps/i386/nptl/tls.h      | 20 ++++++++++++--------
 sysdeps/mach/hurd/i386/tls.h | 20 ++++++++++++--------
 sysdeps/x86_64/nptl/tls.h    | 20 ++++++++++++--------
 3 files changed, 36 insertions(+), 24 deletions(-)

Patch

diff --git a/sysdeps/i386/nptl/tls.h b/sysdeps/i386/nptl/tls.h
index 28053a77f3..ec03fc189c 100644
--- a/sysdeps/i386/nptl/tls.h
+++ b/sysdeps/i386/nptl/tls.h
@@ -256,8 +256,9 @@  tls_fill_user_desc (union user_desc_init *desc,
 # define THREAD_GETMEM(descr, member) \
   ({ __typeof (descr->member) __value;					      \
      _Static_assert (sizeof (__value) == 1				      \
-		  || sizeof (__value) == 4				      \
-		  || sizeof (__value) == 8);				      \
+		     || sizeof (__value) == 4				      \
+		     || sizeof (__value) == 8,				      \
+		     "size of per-thread data");			      \
      if (sizeof (__value) == 1)						      \
        asm volatile ("movb %%gs:%P2,%b0"				      \
 		     : "=q" (__value)					      \
@@ -281,8 +282,9 @@  tls_fill_user_desc (union user_desc_init *desc,
 # define THREAD_GETMEM_NC(descr, member, idx) \
   ({ __typeof (descr->member[0]) __value;				      \
      _Static_assert (sizeof (__value) == 1				      \
-		  || sizeof (__value) == 4				      \
-		  || sizeof (__value) == 8);				      \
+		     || sizeof (__value) == 4				      \
+		     || sizeof (__value) == 8,				      \
+		     "size of per-thread data");			      \
      if (sizeof (__value) == 1)						      \
        asm volatile ("movb %%gs:%P2(%3),%b0"				      \
 		     : "=q" (__value)					      \
@@ -309,8 +311,9 @@  tls_fill_user_desc (union user_desc_init *desc,
 # define THREAD_SETMEM(descr, member, value) \
   ({									      \
      _Static_assert (sizeof (descr->member) == 1			      \
-		  || sizeof (descr->member) == 4			      \
-		  || sizeof (descr->member) == 8);			      \
+		     || sizeof (descr->member) == 4			      \
+		     || sizeof (descr->member) == 8,			      \
+		     "size of per-thread data");			      \
      if (sizeof (descr->member) == 1)					      \
        asm volatile ("movb %b0,%%gs:%P1" :				      \
 		     : "iq" (value),					      \
@@ -333,8 +336,9 @@  tls_fill_user_desc (union user_desc_init *desc,
 # define THREAD_SETMEM_NC(descr, member, idx, value) \
   ({									      \
      _Static_assert (sizeof (descr->member[0]) == 1			      \
-		  || sizeof (descr->member[0]) == 4			      \
-		  || sizeof (descr->member[0]) == 8);			      \
+		     || sizeof (descr->member[0]) == 4			      \
+		     || sizeof (descr->member[0]) == 8,			      \
+		     "size of per-thread data");			      \
      if (sizeof (descr->member[0]) == 1)				      \
        asm volatile ("movb %b0,%%gs:%P1(%2)" :				      \
 		     : "iq" (value),					      \
diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h
index ed3d8fd1f2..0c2de054d8 100644
--- a/sysdeps/mach/hurd/i386/tls.h
+++ b/sysdeps/mach/hurd/i386/tls.h
@@ -167,8 +167,9 @@  out:
 # define THREAD_GETMEM(descr, member) \
   ({ __typeof (descr->member) __value;					      \
      _Static_assert (sizeof (__value) == 1				      \
-		  || sizeof (__value) == 4				      \
-		  || sizeof (__value) == 8);				      \
+		     || sizeof (__value) == 4				      \
+		     || sizeof (__value) == 8,				      \
+		     "size of per-thread data");			      \
      if (sizeof (__value) == 1)						      \
        asm volatile ("movb %%gs:%P2,%b0"				      \
 		     : "=q" (__value)					      \
@@ -192,8 +193,9 @@  out:
 # define THREAD_GETMEM_NC(descr, member, idx) \
   ({ __typeof (descr->member[0]) __value;				      \
      _Static_assert (sizeof (__value) == 1				      \
-		  || sizeof (__value) == 4				      \
-		  || sizeof (__value) == 8);				      \
+		     || sizeof (__value) == 4				      \
+		     || sizeof (__value) == 8,				      \
+		     "size of per-thread data");			      \
      if (sizeof (__value) == 1)						      \
        asm volatile ("movb %%gs:%P2(%3),%b0"				      \
 		     : "=q" (__value)					      \
@@ -220,8 +222,9 @@  out:
 # define THREAD_SETMEM(descr, member, value) \
   ({									      \
      _Static_assert (sizeof (descr->member) == 1			      \
-		  || sizeof (descr->member) == 4			      \
-		  || sizeof (descr->member) == 8);			      \
+		     || sizeof (descr->member) == 4			      \
+		     || sizeof (descr->member) == 8,			      \
+		     "size of per-thread data");			      \
      if (sizeof (descr->member) == 1)					      \
        asm volatile ("movb %b0,%%gs:%P1" :				      \
 		     : "iq" (value),					      \
@@ -244,8 +247,9 @@  out:
 # define THREAD_SETMEM_NC(descr, member, idx, value) \
   ({									      \
      _Static_assert (sizeof (descr->member[0]) == 1			      \
-		  || sizeof (descr->member[0]) == 4			      \
-		  || sizeof (descr->member[0]) == 8);			      \
+		     || sizeof (descr->member[0]) == 4			      \
+		     || sizeof (descr->member[0]) == 8,			      \
+		     "size of per-thread data");			      \
      if (sizeof (descr->member[0]) == 1)				      \
        asm volatile ("movb %b0,%%gs:%P1(%2)" :				      \
 		     : "iq" (value),					      \
diff --git a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h
index 5255ff8509..cb60ed4c3c 100644
--- a/sysdeps/x86_64/nptl/tls.h
+++ b/sysdeps/x86_64/nptl/tls.h
@@ -200,8 +200,9 @@  _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
 # define THREAD_GETMEM(descr, member) \
   ({ __typeof (descr->member) __value;					      \
      _Static_assert (sizeof (__value) == 1				      \
-		  || sizeof (__value) == 4				      \
-		  || sizeof (__value) == 8);				      \
+		     || sizeof (__value) == 4				      \
+		     || sizeof (__value) == 8,				      \
+		     "size of per-thread data");			      \
      if (sizeof (__value) == 1)						      \
        asm volatile ("movb %%fs:%P2,%b0"				      \
 		     : "=q" (__value)					      \
@@ -223,8 +224,9 @@  _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
 # define THREAD_GETMEM_NC(descr, member, idx) \
   ({ __typeof (descr->member[0]) __value;				      \
      _Static_assert (sizeof (__value) == 1				      \
-		  || sizeof (__value) == 4				      \
-		  || sizeof (__value) == 8);				      \
+		     || sizeof (__value) == 4				      \
+		     || sizeof (__value) == 8,				      \
+		     "size of per-thread data");			      \
      if (sizeof (__value) == 1)						      \
        asm volatile ("movb %%fs:%P2(%q3),%b0"				      \
 		     : "=q" (__value)					      \
@@ -257,8 +259,9 @@  _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
 # define THREAD_SETMEM(descr, member, value) \
   ({									      \
      _Static_assert (sizeof (descr->member) == 1			      \
-		  || sizeof (descr->member) == 4			      \
-		  || sizeof (descr->member) == 8);			      \
+		     || sizeof (descr->member) == 4			      \
+		     || sizeof (descr->member) == 8,			      \
+		     "size of per-thread data");			      \
      if (sizeof (descr->member) == 1)					      \
        asm volatile ("movb %b0,%%fs:%P1" :				      \
 		     : "iq" (value),					      \
@@ -279,8 +282,9 @@  _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
 # define THREAD_SETMEM_NC(descr, member, idx, value) \
   ({									      \
      _Static_assert (sizeof (descr->member[0]) == 1			      \
-		  || sizeof (descr->member[0]) == 4			      \
-		  || sizeof (descr->member[0]) == 8);			      \
+		     || sizeof (descr->member[0]) == 4			      \
+		     || sizeof (descr->member[0]) == 8,			      \
+		     "size of per-thread data");			      \
      if (sizeof (descr->member[0]) == 1)				      \
        asm volatile ("movb %b0,%%fs:%P1(%q2)" :				      \
 		     : "iq" (value),					      \