6 files changed, 18 insertions, 6 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 18874dee48c..b47b75b71ff 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-14  Catherine Moore  <clm@redhat.com>
+
+	* gcc.c-torture/execute/920501-7.c: Check for NO_TRAMPOLINES.
+	* gcc.c-torture/execute/920612-2.c: Likewise.
+	* gcc.c-torture/execute/920428-2.c: Likewise.
+	* gcc-c-torture/execute/va-arg-11.c: Call exit.
+	* gcc.c-torture/execute/va-arg-21.c: Likewise.
+
 2000-12-13  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
 	* gcc.dg/pack-test-1.c: Compile on powerpc*-*-eabi* too.
@@ -33,6 +41,7 @@
         * gcc.dg/cpp/redef2.c: Update.   
         * gcc.dg/cpp/skipping.c: New test. 
 
+>>>>>>> 1.929
 2000-12-07  Geoffrey Keating  <geoffk@redhat.com>
 
 	* g++.old-deja/g++.other/eh3.C: New testcase.
diff --git a/gcc/testsuite/gcc.c-torture/execute/920428-2.c b/gcc/testsuite/gcc.c-torture/execute/920428-2.c
index 118ba968314..f8c2e5f782c 100644
--- a/gcc/testsuite/gcc.c-torture/execute/920428-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/920428-2.c
@@ -1,4 +1,4 @@
-#ifndef NO_LABEL_VALUES
+#if !defined (NO_LABEL_VALUES) && !defined (NO_TRAMPOLINES)
 s(i){if(i>0){__label__ l1;int f(int i){if(i==2)goto l1;return 0;}return f(i);l1:;}return 1;}
 x(){return s(0)==1&&s(1)==0&&s(2)==1;}
 main(){if(x()!=1)abort();exit(0);}
diff --git a/gcc/testsuite/gcc.c-torture/execute/920501-7.c b/gcc/testsuite/gcc.c-torture/execute/920501-7.c
index d9f5ba7da79..c23717d797e 100644
--- a/gcc/testsuite/gcc.c-torture/execute/920501-7.c
+++ b/gcc/testsuite/gcc.c-torture/execute/920501-7.c
@@ -4,7 +4,7 @@
 #define DEPTH 1000
 #endif
 
-#ifndef NO_LABEL_VALUES
+#if ! defined (NO_LABEL_VALUES) && !defined (NO_TRAMPOLINES)
 x(a)
 {
   __label__ xlab;
@@ -22,7 +22,7 @@ x(a)
 
 main ()
 {
-#ifndef NO_LABEL_VALUES
+#if ! defined (NO_LABEL_VALUES) && !defined (NO_TRAMPOLINES)
   if (x (DEPTH) != DEPTH)
     abort ();
 #endif
diff --git a/gcc/testsuite/gcc.c-torture/execute/920612-2.c b/gcc/testsuite/gcc.c-torture/execute/920612-2.c
index 2667093491f..9bbdce2e0ad 100644
--- a/gcc/testsuite/gcc.c-torture/execute/920612-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/920612-2.c
@@ -7,6 +7,9 @@ main ()
 	i++, x--;
       return x;
     }
-  a (2);
+#ifndef NO_TRAMPOLINES
+  if (a (2) != 0)
+    abort ();
+#endif
   exit (0);
 }
diff --git a/gcc/testsuite/gcc.c-torture/execute/va-arg-11.c b/gcc/testsuite/gcc.c-torture/execute/va-arg-11.c
index 349c125ed50..b178b880d45 100644
--- a/gcc/testsuite/gcc.c-torture/execute/va-arg-11.c
+++ b/gcc/testsuite/gcc.c-torture/execute/va-arg-11.c
@@ -25,5 +25,5 @@ main (void)
 {
   if (foo (5, 4, 3, 2, 1, 0))
     abort ();
-  return 0;
+  exit (0);
 }
diff --git a/gcc/testsuite/gcc.c-torture/execute/va-arg-21.c b/gcc/testsuite/gcc.c-torture/execute/va-arg-21.c
index 8c9802a372d..044541ba81d 100644
--- a/gcc/testsuite/gcc.c-torture/execute/va-arg-21.c
+++ b/gcc/testsuite/gcc.c-torture/execute/va-arg-21.c
@@ -44,5 +44,5 @@ doit (const char *s, ...)
 int main()
 {
   doit ("%s", "hello world\n");
-  return 0;
+  exit (0);
 }