From b8e724465b5e1e6c479503f219cd725caaa8e781 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 21 Nov 2019 16:14:21 +0000 Subject: Fix failures on Solaris with -fno-common default gcc/testsuite: * gcc.c-torture/execute/20030913-1.c: Rename glob to g. * gcc.c-torture/execute/960218-1.c: Rename glob to gl. * gcc.c-torture/execute/complex-6.c: Rename err to e. * gcc.dg/torture/ssa-pta-fn-1.c: Rename glob to g. libgomp: * testsuite/libgomp.c/pr39591-1.c: Rename err to e. * testsuite/libgomp.c/pr39591-2.c: Likewise. * testsuite/libgomp.c/pr39591-3.c: Likewise. * testsuite/libgomp.c/private-1.c: Likewise. * testsuite/libgomp.c/task-1.c: Likewise. * testsuite/libgomp.c/task-5.c: Renamed err to serr. From-SVN: r278571 --- libgomp/ChangeLog | 9 +++++++++ libgomp/testsuite/libgomp.c/pr39591-1.c | 6 +++--- libgomp/testsuite/libgomp.c/pr39591-2.c | 6 +++--- libgomp/testsuite/libgomp.c/pr39591-3.c | 6 +++--- libgomp/testsuite/libgomp.c/private-1.c | 6 +++--- libgomp/testsuite/libgomp.c/task-1.c | 6 +++--- libgomp/testsuite/libgomp.c/task-5.c | 24 ++++++++++++------------ 7 files changed, 36 insertions(+), 27 deletions(-) (limited to 'libgomp') diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index c739b41..6547830 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,12 @@ +2019-11-21 Rainer Orth + + * testsuite/libgomp.c/pr39591-1.c: Rename err to e. + * testsuite/libgomp.c/pr39591-2.c: Likewise. + * testsuite/libgomp.c/pr39591-3.c: Likewise. + * testsuite/libgomp.c/private-1.c: Likewise. + * testsuite/libgomp.c/task-1.c: Likewise. + * testsuite/libgomp.c/task-5.c: Renamed err to serr. + 2019-11-20 Julian Brown * plugin/plugin-gcn.c (wait_for_queue_nonfull): Don't lock/unlock diff --git a/libgomp/testsuite/libgomp.c/pr39591-1.c b/libgomp/testsuite/libgomp.c/pr39591-1.c index df326f8..a22bc33 100644 --- a/libgomp/testsuite/libgomp.c/pr39591-1.c +++ b/libgomp/testsuite/libgomp.c/pr39591-1.c @@ -3,7 +3,7 @@ extern void abort (void); -int err; +int e; int main (void) @@ -23,10 +23,10 @@ main (void) for (j = 0; j < sizeof array / sizeof array[0]; j++) if (array[j] != 0x55555555) #pragma omp atomic - err++; + e++; } } - if (err) + if (e) abort (); return 0; } diff --git a/libgomp/testsuite/libgomp.c/pr39591-2.c b/libgomp/testsuite/libgomp.c/pr39591-2.c index 2fe6421..ba8b862 100644 --- a/libgomp/testsuite/libgomp.c/pr39591-2.c +++ b/libgomp/testsuite/libgomp.c/pr39591-2.c @@ -3,7 +3,7 @@ extern void abort (void); -int err; +int e; void __attribute__((noinline)) foo (int *array) @@ -14,7 +14,7 @@ foo (int *array) for (j = 0; j < 40; j++) if (array[j] != 0x55555555) #pragma omp atomic - err++; + e++; } } @@ -32,7 +32,7 @@ main (void) for (i = 0; i < 50; i++) foo (array); } - if (err) + if (e) abort (); return 0; } diff --git a/libgomp/testsuite/libgomp.c/pr39591-3.c b/libgomp/testsuite/libgomp.c/pr39591-3.c index 81e8ca8..5905534 100644 --- a/libgomp/testsuite/libgomp.c/pr39591-3.c +++ b/libgomp/testsuite/libgomp.c/pr39591-3.c @@ -3,7 +3,7 @@ extern void abort (void); -int err, a[40]; +int e, a[40]; void __attribute__((noinline)) foo (int *array) @@ -14,7 +14,7 @@ foo (int *array) for (j = 0; j < 40; j++) if (array[j] != 0x55555555) #pragma omp atomic - err++; + e++; } } @@ -33,7 +33,7 @@ main (void) for (i = 0; i < 50; i++) foo (a); } - if (err) + if (e) abort (); return 0; } diff --git a/libgomp/testsuite/libgomp.c/private-1.c b/libgomp/testsuite/libgomp.c/private-1.c index 1d3659b..10c092a 100644 --- a/libgomp/testsuite/libgomp.c/private-1.c +++ b/libgomp/testsuite/libgomp.c/private-1.c @@ -20,7 +20,7 @@ f1 (int i, int j, int k) } int v1 = 1, v2 = 2, v5 = 5; -int err; +int e; void f2 (void) @@ -35,11 +35,11 @@ f2 (void) #pragma omp parallel num_threads(1) firstprivate(v1, v2, v3, v4) { if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6) - err = 1; + e = 1; } if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6) abort (); - if (err) + if (e) abort (); } } diff --git a/libgomp/testsuite/libgomp.c/task-1.c b/libgomp/testsuite/libgomp.c/task-1.c index 66f58a2..d17c3c6 100644 --- a/libgomp/testsuite/libgomp.c/task-1.c +++ b/libgomp/testsuite/libgomp.c/task-1.c @@ -20,7 +20,7 @@ f1 (int i, int j, int k) } int v1 = 1, v2 = 2, v5 = 5; -int err; +int e; void f2 (void) @@ -35,12 +35,12 @@ f2 (void) #pragma omp task { if (++v1 != 8 || ++v2 != 3 || ++v3 != 4 || ++v4 != 5 || ++v5 != 6) - err = 1; + e = 1; } #pragma omp taskwait if (v1 != 7 || v2 != 2 || v3 != 3 || v4 != 4 || v5 != 6) abort (); - if (err) + if (e) abort (); } } diff --git a/libgomp/testsuite/libgomp.c/task-5.c b/libgomp/testsuite/libgomp.c/task-5.c index b152371..bf44ddd 100644 --- a/libgomp/testsuite/libgomp.c/task-5.c +++ b/libgomp/testsuite/libgomp.c/task-5.c @@ -3,42 +3,42 @@ #include #include -int err; +int serr; int main () { int e; -#pragma omp parallel shared(err) +#pragma omp parallel shared(serr) { if (omp_in_final ()) #pragma omp atomic write - err = 1; - #pragma omp task if (0) shared(err) + serr = 1; + #pragma omp task if (0) shared(serr) { if (omp_in_final ()) #pragma omp atomic write - err = 1; - #pragma omp task if (0) shared(err) + serr = 1; + #pragma omp task if (0) shared(serr) if (omp_in_final ()) #pragma omp atomic write - err = 1; + serr = 1; } - #pragma omp task final (1) shared(err) + #pragma omp task final (1) shared(serr) { if (!omp_in_final ()) #pragma omp atomic write - err = 1; + serr = 1; #pragma omp taskyield #pragma omp taskwait - #pragma omp task shared(err) + #pragma omp task shared(serr) if (!omp_in_final ()) #pragma omp atomic write - err = 1; + serr = 1; } } #pragma omp atomic read - e = err; + e = serr; if (e) abort (); return 0; -- cgit v1.1