re PR target/49965 (libgomp.c++/reduction-4.C and libgomp.c++/task-8.C FAIL on Solari...

	PR libgomp/49965
	* testsuite/libgomp.c++/task-8.C: Replaced err by errval.

From-SVN: r177428

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index df3cf60992cdf09a5000de33c2353e028ee9f8ec..ea5951a6bdd1fd004f958faec32a915afbc78e71 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       PR libgomp/49965
+       * testsuite/libgomp.c++/task-8.C: Replaced err by errval.
+
 2011-08-03  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/linux/proc.h: New.

diff --git a/libgomp/testsuite/libgomp.c++/task-8.C b/libgomp/testsuite/libgomp.c++/task-8.C
index 3e1b4696b084afc2f33807b432e63ac7758431f6..b523c4d225352a3440293f28cc4a0904158746ce 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/task-8.C
+++ b/libgomp/testsuite/libgomp.c++/task-8.C
@@ -3,42 +3,42 @@
 #include <omp.h>
 #include <cstdlib>
 
-int err;
+int errval;
 
 int
 main ()
 {
   int e;
-#pragma omp parallel shared(err)
+#pragma omp parallel shared(errval)
   {
     if (omp_in_final ())
       #pragma omp atomic write
-       err = 1;
-    #pragma omp task if (0) shared(err)
+       errval = 1;
+    #pragma omp task if (0) shared(errval)
       {
        if (omp_in_final ())
          #pragma omp atomic write
-           err = 1;
-       #pragma omp task if (0) shared(err)
+           errval = 1;
+       #pragma omp task if (0) shared(errval)
          if (omp_in_final ())
            #pragma omp atomic write
-             err = 1;
+             errval = 1;
       }
-    #pragma omp task final (1) shared(err)
+    #pragma omp task final (1) shared(errval)
       {
        if (!omp_in_final ())
          #pragma omp atomic write
-           err = 1;
+           errval = 1;
        #pragma omp taskyield
        #pragma omp taskwait
-       #pragma omp task shared(err)
+       #pragma omp task shared(errval)
          if (!omp_in_final ())
            #pragma omp atomic write
-             err = 1;
+             errval = 1;
       }
   }
   #pragma omp atomic read
-    e = err;
+    e = errval;
   if (e)
     abort ();
 }