diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be47b95cb958..9a8d24f26b75 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-19  Joseph Myers  <joseph@codesourcery.com>
+
+	* c-decl.c (grokdeclarator): Diagnose _Noreturn for non-C1X if
+	pedantic.
+	* c-parser.c (c_parser_declspecs): Include _Noreturn in syntax
+	comment.
+	* ginclude/stdnoreturn.h (noreturn): Don't define for C++.
+
 2011-08-19  Joseph Myers  <joseph@codesourcery.com>
 
 	* opth-gen.awk: Do not declare target save/restore structures and
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index d824e12b5bbc..d683d4e36550 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -5986,7 +5986,18 @@ grokdeclarator (const struct c_declarator *declarator,
 	      /* Record that the function is declared `inline'.  */
 	      DECL_DECLARED_INLINE_P (decl) = 1;
 	    if (declspecs->noreturn_p)
-	      TREE_THIS_VOLATILE (decl) = 1;
+	      {
+		if (!flag_isoc1x)
+		  {
+		    if (flag_isoc99)
+		      pedwarn (loc, OPT_pedantic,
+			       "ISO C99 does not support %<_Noreturn%>");
+		    else
+		      pedwarn (loc, OPT_pedantic,
+			       "ISO C90 does not support %<_Noreturn%>");
+		  }
+		TREE_THIS_VOLATILE (decl) = 1;
+	      }
 	  }
       }
     else
diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index d0f8fba50eae..8d7bb995beb9 100644
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -1905,6 +1905,9 @@ c_parser_static_assert_declaration_no_semi (c_parser *parser)
    C99 6.7.4:
    function-specifier:
      inline
+     _Noreturn
+
+   (_Noreturn is new in C1X.)
 
    C90 6.5.2, C99 6.7.2:
    type-specifier:
diff --git a/gcc/ginclude/stdnoreturn.h b/gcc/ginclude/stdnoreturn.h
index c92537ce2d77..3efbd8a2573e 100644
--- a/gcc/ginclude/stdnoreturn.h
+++ b/gcc/ginclude/stdnoreturn.h
@@ -26,6 +26,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #ifndef _STDNORETURN_H
 #define _STDNORETURN_H
 
+#ifndef __cplusplus
+
 #define noreturn _Noreturn
 
+#endif
+
 #endif	/* stdnoreturn.h */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8d26536a7e7f..23b70e8cdb11 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-19  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.dg/c90-noreturn-1.c, gcc.dg/c99-noreturn-1.c: New tests.
+
 2011-08-19  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* gcc.dg/builtins-67.c: Use dg-add-options c99_runtime.
diff --git a/gcc/testsuite/gcc.dg/c90-noreturn-1.c b/gcc/testsuite/gcc.dg/c90-noreturn-1.c
new file mode 100644
index 000000000000..87b832e067b0
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/c90-noreturn-1.c
@@ -0,0 +1,5 @@
+/* Test _Noreturn not in C90.  */
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1990 -pedantic-errors" } */
+
+_Noreturn void f (void); /* { dg-error "ISO C90 does not support '_Noreturn'" } */
diff --git a/gcc/testsuite/gcc.dg/c99-noreturn-1.c b/gcc/testsuite/gcc.dg/c99-noreturn-1.c
new file mode 100644
index 000000000000..4cbc513595ec
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/c99-noreturn-1.c
@@ -0,0 +1,5 @@
+/* Test _Noreturn not in C99.  */
+/* { dg-do compile } */
+/* { dg-options "-std=iso9899:1999 -pedantic-errors" } */
+
+_Noreturn void f (void); /* { dg-error "ISO C99 does not support '_Noreturn'" } */