mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-19 08:30:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix failures on Solaris with -fno-common default

Browse Source 
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
This commit is contained in:
Rainer Orth 2019-11-21 16:14:21 +00:00 committed by Rainer Orth
parent 523cfd52a2
commit b8e724465b
12 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2019-11-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* 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.
2019-11-21 Marek Polacek <polacek@redhat.com>
PR c++/92450 - ICE with invalid nested name specifier.

6
gcc/testsuite/gcc.c-torture/execute/20030913-1.c
View File

@ -1,12 +1,12 @@
/* Assignments via pointers pointing to global variables were being killed
by SSA-DCE. Test contributed by Paul Brook <paul@nowt.org> */
int glob;
int g;
void
fn2(int ** q)
{
*q = &glob;
*q = &g;
}
void test()
@ -21,6 +21,6 @@ void test()
int main()
{
test();
if (glob != 42) abort();
if (g != 42) abort();
exit (0);
}

6
gcc/testsuite/gcc.c-torture/execute/960218-1.c
View File

@ -1,8 +1,8 @@
int glob;
int gl;
g (x)
{
glob = x;
gl = x;
return 0;
}
@ -16,7 +16,7 @@ f (x)
main ()
{
f (3);
if (glob != -4)
if (gl != -4)
abort ();
exit (0);
}

8
gcc/testsuite/gcc.c-torture/execute/complex-6.c
View File

@ -6,7 +6,7 @@
#include <stdlib.h>
#include <stdio.h>
int err;
int e;
#define TEST(TYPE, FUNC) \
__complex__ TYPE \
@ -31,7 +31,7 @@ test_ ## FUNC (void) \
if (res != 1.0 - 2.0i) \
{ \
printf ("test_" #FUNC " failed\n"); \
++err; \
++e; \
} \
}
@ -46,7 +46,7 @@ int
main (void)
{
err = 0;
e = 0;
test_float ();
test_double ();
@ -54,7 +54,7 @@ main (void)
test_int ();
test_long_int ();
if (err != 0)
if (e != 0)
abort ();
return 0;

4
gcc/testsuite/gcc.dg/torture/ssa-pta-fn-1.c
View File

@ -3,7 +3,7 @@
/* { dg-skip-if "" { *-*-* } { "-O0" "-fno-fat-lto-objects" } { "" } } */
extern void abort (void);
int *glob;
int *g;
int dummy;
int * __attribute__((noinline,const))
@ -13,7 +13,7 @@ int * __attribute__((noinline,pure))
foo_pure(int *p) { return p + dummy; }
int * __attribute__((noinline))
foo_normal(int *p) { glob = p; return p; }
foo_normal(int *p) { g = p; return p; }
void test_const(void)
{

9
libgomp/ChangeLog
View File

@ -1,3 +1,12 @@
2019-11-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* 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 <julian@codesourcery.com>
* plugin/plugin-gcn.c (wait_for_queue_nonfull): Don't lock/unlock

6
libgomp/testsuite/libgomp.c/pr39591-1.c
View File

@ -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;
}

6
libgomp/testsuite/libgomp.c/pr39591-2.c
View File

@ -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;
}

6
libgomp/testsuite/libgomp.c/pr39591-3.c
View File

@ -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;
}

6
libgomp/testsuite/libgomp.c/private-1.c
View File

@ -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 ();
}
}

6
libgomp/testsuite/libgomp.c/task-1.c
View File

@ -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 ();
}
}

24
libgomp/testsuite/libgomp.c/task-5.c
View File

@ -3,42 +3,42 @@
#include <omp.h>
#include <stdlib.h>
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;