From 5d6749d1f241223353cba6cb637738bb5b698756 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 25 Sep 2018 12:25:44 +0000 Subject: [PATCH] Check pie_enabled target in PIC tests We need to check pie_enabled target in PIC tests to support GCC where PIE is enabled by default when configured with --enable-default-pie. PR testsuite/70150 * gcc.dg/20020312-2.c (dg-additional-options): Set to "-no-pie" for pie_enabled target. * gcc.dg/uninit-19.c: Check pie_enabled for PIC. * gcc.target/i386/pr34256.c: Likewise. From-SVN: r264565 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.dg/20020312-2.c | 1 + gcc/testsuite/gcc.dg/uninit-19.c | 4 ++-- gcc/testsuite/gcc.target/i386/pr34256.c | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 224317927ce..af269f425fc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2018-09-25 H.J. Lu + + PR testsuite/70150 + * gcc.dg/20020312-2.c (dg-additional-options): Set to "-no-pie" + for pie_enabled target. + * gcc.dg/uninit-19.c: Check pie_enabled for PIC. + * gcc.target/i386/pr34256.c: Likewise. + 2018-09-24 Paolo Carlini PR c++/85070 diff --git a/gcc/testsuite/gcc.dg/20020312-2.c b/gcc/testsuite/gcc.dg/20020312-2.c index f8be3ce2964..1a8afd81506 100644 --- a/gcc/testsuite/gcc.dg/20020312-2.c +++ b/gcc/testsuite/gcc.dg/20020312-2.c @@ -7,6 +7,7 @@ /* { dg-do run } */ /* { dg-options "-O -fno-pic" } */ +/* { dg-additional-options "-no-pie" { target pie_enabled } } */ /* { dg-require-effective-target nonlocal_goto } */ extern void abort (void); diff --git a/gcc/testsuite/gcc.dg/uninit-19.c b/gcc/testsuite/gcc.dg/uninit-19.c index 094dc0eb73d..3f5f06af540 100644 --- a/gcc/testsuite/gcc.dg/uninit-19.c +++ b/gcc/testsuite/gcc.dg/uninit-19.c @@ -12,7 +12,7 @@ fn1 (int p1, float *f1, float *f2, float *f3, unsigned char *c1, float *f4, { if (p1 & 8) b[3] = p10[a]; - /* { dg-warning "may be used uninitialized" "" { target { { nonpic } || { hppa*64*-*-* } } } .-1 } */ + /* { dg-warning "may be used uninitialized" "" { target { { nonpic || pie_enabled } || { hppa*64*-*-* } } } .-1 } */ } void @@ -22,5 +22,5 @@ fn2 () if (l & 6) n = &c + m; fn1 (l, &d, &e, &g, &i, &h, &k, n); - /* { dg-warning "may be used uninitialized" "" { target { ! { { nonpic } || { hppa*64*-*-* } } } } .-1 } */ + /* { dg-warning "may be used uninitialized" "" { target { ! { { nonpic || pie_enabled } || { hppa*64*-*-* } } } } .-1 } */ } diff --git a/gcc/testsuite/gcc.target/i386/pr34256.c b/gcc/testsuite/gcc.target/i386/pr34256.c index 992312a4f26..698745765d8 100644 --- a/gcc/testsuite/gcc.target/i386/pr34256.c +++ b/gcc/testsuite/gcc.target/i386/pr34256.c @@ -10,5 +10,5 @@ unsigned long long foo(__m64 m) { return _mm_cvtm64_si64(_mm_add_pi32(x, y)); } -/* { dg-final { scan-assembler-times "mov" 2 { target nonpic } } } */ -/* { dg-final { scan-assembler-times "mov" 4 { target { ! nonpic } } } } */ +/* { dg-final { scan-assembler-times "mov" 2 { target { nonpic || pie_enabled } } } } */ +/* { dg-final { scan-assembler-times "mov" 4 { target { { ! nonpic } && { ! pie_enabled } } } } } */ -- 2.30.2