6 files changed, 24 insertions, 8 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9d735e7..1c4b83b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2000-05-28  Alexandre Oliva  <aoliva@cygnus.com>
+
+	* g++.old-deja/g++.brendan/code-gen4.C: Include stdio.h and
+	stdlib.h.  Call abort() on failure.
+	* g++.old-deja/g++.law/refs4.C: Likewise.
+	* g++.old-deja/g++.law/temps4.C: Likewise.
+	* g++.old-deja/g++.brendan/complex1.C: Don't assume argc is 1.
+	* gcc.c-torture/execute/20000112-1.c: Include string.h.	
+
 2000-05-27  Zack Weinberg  <zack@wolery.cumb.org>
 
 	Relative to g++.dg/special:
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen4.C b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen4.C
index beb2158..c825a41 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen4.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen4.C
@@ -9,7 +9,8 @@
 //
 // Workaround - declare "f1_arg" as type "short int".
 
-extern "C" int printf (const char *, ...); 
+#include <stdio.h>
+#include <stdlib.h>
 
 short int v2;
 
@@ -25,7 +26,7 @@ int main ()
 	f1 (v1);
 
 	if (v2 != 0x00007777)
-	  printf ("FAIL\n");
+	  abort ();
 	else
 	  printf ("PASS\n");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/complex1.C b/gcc/testsuite/g++.old-deja/g++.brendan/complex1.C
index 74a91b3..1c9c4d2 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/complex1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/complex1.C
@@ -12,14 +12,16 @@ void exit (int);
 
 __complex__ double cd;
 
+int one = 1;
+
 int
-main(int argc, char *argv[])
+main()
 {
   cd = 1.0+90i;
-  cd *= argc;
+  cd *= one;
 
   if (__real__ cd != 1 || __imag__ cd != 90)
-    exit (1);
+    abort ();
 
   exit (0);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/refs4.C b/gcc/testsuite/g++.old-deja/g++.law/refs4.C
index 7e68927..19ea4af 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/refs4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/refs4.C
@@ -1,5 +1,6 @@
 // GROUPS passed references
-extern "C" int printf (const char *, ...);
+#include <stdio.h>
+#include <stdlib.h>
 
 const int& min(const int& tX, const int& tY)
 {
@@ -11,7 +12,7 @@ void foo(const int m, const int n)
 	if (m == 1 && n == 100)
 	  printf("PASS\n");
 	else
-	  printf("FAIL\n");
+	  abort ();
 }
 
 int main()
diff --git a/gcc/testsuite/g++.old-deja/g++.law/temps4.C b/gcc/testsuite/g++.old-deja/g++.law/temps4.C
index 2abf56d..f4a799d 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/temps4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/temps4.C
@@ -7,6 +7,7 @@
 // Date: Wed, 10 Nov 93 14:43:54 CST
 
 #include <stdio.h>
+#include <stdlib.h>
 
 class X {
     int i;
@@ -32,7 +33,7 @@ X foo() {
 main() {
     X x = foo();
     if (did_it)
-	printf ("FAIL\n");
+	abort ();
     else
 	printf ("PASS\n");
 }
diff --git a/gcc/testsuite/gcc.c-torture/execute/20000112-1.c b/gcc/testsuite/gcc.c-torture/execute/20000112-1.c
index 7f6e584..080b662 100644
--- a/gcc/testsuite/gcc.c-torture/execute/20000112-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20000112-1.c
@@ -1,3 +1,5 @@
+#include <string.h>
+
 static int
 special_format (fmt)
      const char *fmt;