* libc/include/sys/cdefs.h (_Static_assert): Accommodate gcc >= 4.6.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 797a67188977e294c97ee3588be82ef6b8384a1a..dc77b7e9a6b532d052df39b269638fd7cc9e5871 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-22  Corinna Vinschen  <vinschen@redhat.com>
+
+       * libc/include/sys/cdefs.h (_Static_assert): Accommodate gcc >= 4.6.
+
 2013-05-16  Sebastian Huber <sebastian.huber@embedded-brains.de>
 
        * libc/reent/reent.c (_wrapup_reent): Remove.

diff --git a/newlib/libc/include/sys/cdefs.h b/newlib/libc/include/sys/cdefs.h
index beeea32519ec247ce1c9f598390d0f20c0c437ad..5f0922c7af12161624cbb8d1acaa1a3833969f1d 100644 (file)
--- a/newlib/libc/include/sys/cdefs.h
+++ b/newlib/libc/include/sys/cdefs.h
@@ -267,7 +267,9 @@
 #define        _Alignof(x)             __alignof(x)
 #define        _Noreturn               __dead2
 #define        _Thread_local           __thread
-#ifdef __COUNTER__
+#if __GNUC_PREREQ__(4, 6) && !defined(__cplusplus)
+/*  Do nothing: _Static_assert() works as per C11 */
+#elif defined(__COUNTER__)
 #define        _Static_assert(x, y)    __Static_assert(x, __COUNTER__)
 #define        __Static_assert(x, y)   ___Static_assert(x, y)
 #define        ___Static_assert(x, y)  typedef char __assert_ ## y[(x) ? 1 : -1]