about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nptl/pthreadP.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f9e2e18e50..c72be0c301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-21  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* nptl/pthreadP.h (ASSERT_PTHREAD_INTERNAL_SIZE): Add workarond for
+	-Wmissing-braces on GCC 4.9.
+
 2017-11-21  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
 	* sysdeps/s390/s390-64/start.S (_start): Add cfi information for r14.
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 1cc80b6e3a..713000e32d 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -644,7 +644,7 @@ check_stacksize_attr (size_t st)
 		  "sizeof (" #type ") != " #size)
 
 #define ASSERT_PTHREAD_INTERNAL_SIZE(type, internal) 			\
-  _Static_assert (sizeof ((type) { 0 }).__size >= sizeof (internal), 	\
+  _Static_assert (sizeof ((type) { { 0 } }).__size >= sizeof (internal),\
 		  "sizeof (" #type ".__size) < sizeof (" #internal ")")
 
 #define ASSERT_PTHREAD_STRING(x) __STRING (x)