diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8880177b83a..8ce200dd0e5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-05  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	PR c++/7099
+        * g++.dg/warn/noreturn1.C: New test.
+
 2002-07-03  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/6706
diff --git a/gcc/testsuite/g++.dg/warn/noreturn-1.C b/gcc/testsuite/g++.dg/warn/noreturn-1.C
new file mode 100644
index 00000000000..17375d42eb7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/noreturn-1.C
@@ -0,0 +1,71 @@
+// Test that noreturn attributes are properly set.
+// Origin: Kaveh Ghazi <ghazi@caip.rutgers.edu> 2002-06-18.
+// { dg-do compile }
+// { dg-options "-Wall -O2" }
+
+#include <cstdlib>
+
+int foo1 (int i)
+{
+  switch (i)
+    {
+    case 1:
+    case 2:
+      return i;
+    }
+  abort();
+}
+
+int foo2 (int i)
+{
+  switch (i)
+    {
+    case 1:
+    case 2:
+      return i;
+    }
+  std::abort();
+}
+
+int foo3 (int i)
+{
+  switch (i)
+    {
+    case 1:
+    case 2:
+      return i;
+    }
+  exit(1);
+}
+
+int foo4 (int i)
+{
+  switch (i)
+    {
+    case 1:
+    case 2:
+      return i;
+    }
+  std::exit(1);
+}
+
+void __attribute__ ((__noreturn__)) foo5 ()
+{
+  abort();
+}
+
+void __attribute__ ((__noreturn__)) foo6 ()
+{
+  std::abort();
+}
+
+void __attribute__ ((__noreturn__)) foo7 ()
+{
+  exit(1);
+}
+
+void __attribute__ ((__noreturn__)) foo8 ()
+{
+  std::exit(1);
+}
+