From 9dfffd143d46ef363fa752b8db98c581d01755f8 Mon Sep 17 00:00:00 2001 From: krebbel Date: Mon, 23 Feb 2015 08:05:51 +0000 Subject: [PATCH] 2015-02-23 Andreas Krebbel * gcc.target/s390/hotpatch-8.c: Add -march=g5. * gcc.target/s390/hotpatch-9.c: Add -march=g5. * gcc.target/s390/hotpatch-compile-1.c: Fix error message. * gcc.target/s390/hotpatch-compile-10.c: Likewise. * gcc.target/s390/hotpatch-compile-11.c: Likewise. * gcc.target/s390/hotpatch-compile-12.c: Likewise. * gcc.target/s390/hotpatch-compile-13.c: Likewise. * gcc.target/s390/hotpatch-compile-14.c: Likewise. * gcc.target/s390/hotpatch-compile-2.c: Likewise. * gcc.target/s390/hotpatch-compile-3.c: Likewise. * gcc.target/s390/hotpatch-compile-4.c: Likewise. * gcc.target/s390/hotpatch-compile-5.c: Likewise. * gcc.target/s390/hotpatch-compile-6.c: Likewise. * gcc.target/s390/hotpatch-compile-7.c: Likewise. * gcc.target/s390/hotpatch-compile-8.c: Likewise. * gcc.target/s390/hotpatch-compile-9.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220903 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 19 +++++++++++++++++++ gcc/testsuite/gcc.target/s390/hotpatch-8.c | 2 +- gcc/testsuite/gcc.target/s390/hotpatch-9.c | 2 +- gcc/testsuite/gcc.target/s390/hotpatch-compile-1.c | 8 +------- gcc/testsuite/gcc.target/s390/hotpatch-compile-10.c | 4 +--- gcc/testsuite/gcc.target/s390/hotpatch-compile-11.c | 6 +++--- gcc/testsuite/gcc.target/s390/hotpatch-compile-12.c | 6 +++--- gcc/testsuite/gcc.target/s390/hotpatch-compile-13.c | 4 ++-- gcc/testsuite/gcc.target/s390/hotpatch-compile-14.c | 2 +- gcc/testsuite/gcc.target/s390/hotpatch-compile-2.c | 8 +------- gcc/testsuite/gcc.target/s390/hotpatch-compile-3.c | 8 +------- gcc/testsuite/gcc.target/s390/hotpatch-compile-4.c | 8 +------- gcc/testsuite/gcc.target/s390/hotpatch-compile-5.c | 8 +------- gcc/testsuite/gcc.target/s390/hotpatch-compile-6.c | 8 +------- gcc/testsuite/gcc.target/s390/hotpatch-compile-7.c | 4 +--- gcc/testsuite/gcc.target/s390/hotpatch-compile-8.c | 4 +--- gcc/testsuite/gcc.target/s390/hotpatch-compile-9.c | 4 +--- 17 files changed, 40 insertions(+), 65 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 77c891f60c9..9825b1e76a4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,22 @@ +2015-02-23 Andreas Krebbel + + * gcc.target/s390/hotpatch-8.c: Add -march=g5. + * gcc.target/s390/hotpatch-9.c: Add -march=g5. + * gcc.target/s390/hotpatch-compile-1.c: Fix error message. + * gcc.target/s390/hotpatch-compile-10.c: Likewise. + * gcc.target/s390/hotpatch-compile-11.c: Likewise. + * gcc.target/s390/hotpatch-compile-12.c: Likewise. + * gcc.target/s390/hotpatch-compile-13.c: Likewise. + * gcc.target/s390/hotpatch-compile-14.c: Likewise. + * gcc.target/s390/hotpatch-compile-2.c: Likewise. + * gcc.target/s390/hotpatch-compile-3.c: Likewise. + * gcc.target/s390/hotpatch-compile-4.c: Likewise. + * gcc.target/s390/hotpatch-compile-5.c: Likewise. + * gcc.target/s390/hotpatch-compile-6.c: Likewise. + * gcc.target/s390/hotpatch-compile-7.c: Likewise. + * gcc.target/s390/hotpatch-compile-8.c: Likewise. + * gcc.target/s390/hotpatch-compile-9.c: Likewise. + 2015-02-22 Bernd Edlinger PR fortran/64980 diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-8.c b/gcc/testsuite/gcc.target/s390/hotpatch-8.c index 8edcfccb62f..7681eda2bbb 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-8.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-8.c @@ -1,7 +1,7 @@ /* Functional tests for the function hotpatching feature. */ /* { dg-do compile } */ -/* { dg-options "-O3 -mesa -m31 -mhotpatch=0,3 --save-temps" } */ +/* { dg-options "-O3 -mesa -m31 -march=g5 -mhotpatch=0,3 --save-temps" } */ #include diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-9.c b/gcc/testsuite/gcc.target/s390/hotpatch-9.c index 25b377180d6..cf38d3dc66d 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-9.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-9.c @@ -1,7 +1,7 @@ /* Functional tests for the function hotpatching feature. */ /* { dg-do compile } */ -/* { dg-options "-O3 -mesa -m31 -mhotpatch=0,4 --save-temps" } */ +/* { dg-options "-O3 -mesa -m31 -march=g5 -mhotpatch=0,4 --save-temps" } */ #include diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-1.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-1.c index d88e07eb2d6..ca47f6be5de 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-1.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-1.c @@ -2,10 +2,4 @@ /* { dg-do compile } */ /* { dg-options "-O3 -mzarch -mhotpatch=-1,0" } */ - -int main (void) -{ - return 0; -} - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ +/* { dg-error "arguments to .-mhotpatch=n,m. should be non-negative integers" "" { target *-*-* } 1 } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-10.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-10.c index 7bbdc374e1d..8b6441d771e 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-10.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-10.c @@ -5,8 +5,6 @@ __attribute__((hotpatch(0,0,0))) int main (void) -{ +{/* { dg-error "wrong number of arguments specified" } */ return 0; } - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-11.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-11.c index df01230cf55..36c0e225e4d 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-11.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-11.c @@ -3,10 +3,10 @@ /* { dg-do compile } */ /* { dg-options "-O3 -mzarch" } */ +int a; + __attribute__((hotpatch(a,0))) int main (void) -{ +{ /* { dg-error "attribute is not a comma separated pair of non-negative integer constants or too large" } */ return 0; } - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-12.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-12.c index d91e8feb15b..9b5fbd3f927 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-12.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-12.c @@ -3,10 +3,10 @@ /* { dg-do compile } */ /* { dg-options "-O3 -mzarch" } */ +int a; + __attribute__((hotpatch(0,a))) int main (void) -{ +{ /* { dg-error "attribute is not a comma separated pair of non-negative integer constants or too large" } */ return 0; } - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-13.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-13.c index 72f13a04428..a8752412742 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-13.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-13.c @@ -18,12 +18,12 @@ void hp2(void) __attribute__ ((hotpatch(1000001,1000000))) void hp3(void) -{ /* { dg-error " requested 'hotpatch' attribute is not a comma separated pair" } */ +{ /* { dg-error " requested .hotpatch. attribute is not a comma separated pair" } */ printf("hello, world!\n"); } __attribute__ ((hotpatch(1000000,1000001))) void hp4(void) -{ /* { dg-error " requested 'hotpatch' attribute is not a comma separated pair" } */ +{ /* { dg-error " requested .hotpatch. attribute is not a comma separated pair" } */ printf("hello, world!\n"); } diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-14.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-14.c index f3343d33e96..0b5e674d407 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-14.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-14.c @@ -8,4 +8,4 @@ viod main(void) return 0; } -/* { dg-excess-errors "argument to '-mhotpatch=n,m' is too large" } */ +/* { dg-error "argument to .-mhotpatch=n,m. is too large" "" { target *-*-* } 1 } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-2.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-2.c index 95820e493fc..78253f59583 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-2.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-2.c @@ -2,10 +2,4 @@ /* { dg-do compile } */ /* { dg-options "-O3 -mzarch -mhotpatch=0,-1" } */ - -int main (void) -{ - return 0; -} - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ +/* { dg-error "arguments to .-mhotpatch=n,m. should be non-negative integers" "" { target *-*-* } 1 } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-3.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-3.c index bbed9759fbd..6dde22422b0 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-3.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-3.c @@ -2,10 +2,4 @@ /* { dg-do compile } */ /* { dg-options "-O3 -mzarch -mhotpatch=0" } */ - -int main (void) -{ - return 0; -} - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ +/* { dg-error "arguments to .-mhotpatch=n,m. should be non-negative integers" "" { target *-*-* } 1 } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-4.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-4.c index 4d926594a5c..fbb30833775 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-4.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-4.c @@ -2,10 +2,4 @@ /* { dg-do compile } */ /* { dg-options "-O3 -mzarch -mhotpatch=0,0,0" } */ - -int main (void) -{ - return 0; -} - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ +/* { dg-error "arguments to .-mhotpatch=n,m. should be non-negative integers" "" { target *-*-* } 1 } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-5.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-5.c index 46c9004d3e8..dc0ff6775b8 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-5.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-5.c @@ -2,10 +2,4 @@ /* { dg-do compile } */ /* { dg-options "-O3 -mzarch -mhotpatch=a,0" } */ - -int main (void) -{ - return 0; -} - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ +/* { dg-error "arguments to .-mhotpatch=n,m. should be non-negative integers" "" { target *-*-* } 1 } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-6.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-6.c index b28e2055122..d04045eecd5 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-6.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-6.c @@ -2,10 +2,4 @@ /* { dg-do compile } */ /* { dg-options "-O3 -mzarch -mhotpatch=0,a" } */ - -int main (void) -{ - return 0; -} - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ +/* { dg-error "arguments to .-mhotpatch=n,m. should be non-negative integers" "" { target *-*-* } 1 } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-7.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-7.c index 2080eb1f94a..3505703fe8c 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-7.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-7.c @@ -5,8 +5,6 @@ __attribute__((hotpatch(-1,0))) int main (void) -{ +{/* { dg-error "attribute is not a comma separated pair of non-negative integer constants or too large" } */ return 0; } - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-8.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-8.c index 46a38c860c2..fd354313627 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-8.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-8.c @@ -5,8 +5,6 @@ __attribute__((hotpatch(0,-1))) int main (void) -{ +{/* { dg-error "attribute is not a comma separated pair of non-negative integer constants or too large" } */ return 0; } - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-compile-9.c b/gcc/testsuite/gcc.target/s390/hotpatch-compile-9.c index 24226eb3547..dcefbe4aac7 100644 --- a/gcc/testsuite/gcc.target/s390/hotpatch-compile-9.c +++ b/gcc/testsuite/gcc.target/s390/hotpatch-compile-9.c @@ -5,8 +5,6 @@ __attribute__((hotpatch(0))) int main (void) -{ +{/* { dg-error "wrong number of arguments specified" } */ return 0; } - -/* { dg-excess-errors "argument to '-mhotpatch=' should be a non-negative integer" } */ -- 2.11.4.GIT