* testsuite/relro_test.cc: Include <cstdio>, <cstdlib>, and

<exception>.
	(throwing, orig_terminate): New static variables.
	(terminate_handler): New static function.
	(t2): Set terminate handler.

gold/ChangeLog

@@ -1,3 +1,11 @@
+2008-06-09  Ian Lance Taylor  <iant@google.com>
+
+	* testsuite/relro_test.cc: Include <cstdio>, <cstdlib>, and
+	<exception>.
+	(throwing, orig_terminate): New static variables.
+	(terminate_handler): New static function.
+	(t2): Set terminate handler.
+
 2008-06-05  Kris Van Hees  <kris.van.hees@oracle.com>
 
 	PR 6584

gold/testsuite/relro_test.cc

@@ -22,6 +22,9 @@
 
 #include <cassert>
 #include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <exception>
 #include <stdint.h>
 #include <unistd.h>
 
@@ -69,15 +72,42 @@ t1()
   return true;
 }
 
+// Tell terminate handler that we are throwing from a signal handler.
+
+static bool throwing;
+
 // A signal handler for SIGSEGV.
 
 extern "C"
 void
 sigsegv_handler(int)
 {
+  throwing = true;
   throw 0;
 }
 
+// The original terminate handler.
+
+std::terminate_handler orig_terminate;
+
+// Throwing an exception out of a signal handler doesn't always work
+// reliably.  When that happens the program will call terminate.  We
+// set a terminate handler to indicate that the test probably passed.
+
+void
+terminate_handler()
+{
+  if (!throwing)
+    {
+      orig_terminate();
+      ::exit(EXIT_FAILURE);
+    }
+  fprintf(stderr,
+	  "relro_test: terminate called due to failure to throw through signal handler\n");
+  fprintf(stderr, "relro_test: assuming test succeeded\n");
+  ::exit(EXIT_SUCCESS);
+}
+
 // Use a separate function to throw the exception, so that we don't
 // need to use -fnon-call-exceptions.
 
@@ -100,6 +130,7 @@ bool
 t2()
 {
   signal(SIGSEGV, sigsegv_handler);
+  orig_terminate = std::set_terminate(terminate_handler);
 
   try
     {