2 files changed, 5 insertions, 2 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 088a19ac747..8e24ee540cf 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * config.nt (_Noreturn): Don't reference __SUNPRO_C.
+
 2012-06-24  Paul Eggert  <eggert@cs.ucla.edu>
 
         Switch from NO_RETURN to C11's _Noreturn (Bug#11750).
diff --git a/nt/config.nt b/nt/config.nt
index 8c66d3d6ebd..93a7f7b57a7 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -498,8 +498,7 @@ extern char *getenv ();
 /* The _Noreturn keyword of C11.  */
 #if ! (defined _Noreturn \
        || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-      || 0x5110 <= __SUNPRO_C)
+# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__))
 #  define _Noreturn __attribute__ ((__noreturn__))
 # elif defined _MSC_VER && 1200 <= _MSC_VER
 #  define _Noreturn __declspec (noreturn)