From 5a1e3b6c7fb3a3efbd1419673cfa58e600a8a2fd Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Thu, 18 Feb 2010 08:40:01 +0100 Subject: [PATCH] attrib35.C: Fix target selector string. * g++.dg/ext/attrib35.C: Fix target selector string. * g++.dg/ext/attrib36.C: Ditto. * g++.dg/ext/attrib37.C: Ditto. * g++.dg/abi/mangle24.C: Remove stray "*/" from dg directives. * g++.dg/abi/mangle25.C: Ditto. From-SVN: r156859 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/g++.dg/abi/mangle24.C | 10 +++++----- gcc/testsuite/g++.dg/abi/mangle25.C | 8 ++++---- gcc/testsuite/g++.dg/ext/attrib35.C | 2 +- gcc/testsuite/g++.dg/ext/attrib36.C | 3 +-- gcc/testsuite/g++.dg/ext/attrib37.C | 2 +- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d2b7655951d..95f460cb19e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2010-02-18 Uros Bizjak + + * g++.dg/ext/attrib35.C: Fix target selector string. + * g++.dg/ext/attrib36.C: Ditto. + * g++.dg/ext/attrib37.C: Ditto. + * g++.dg/abi/mangle24.C: Remove stray "*/" from dg directives. + * g++.dg/abi/mangle25.C: Ditto. + 2010-02-17 Jason Merrill PR c++/43069 diff --git a/gcc/testsuite/g++.dg/abi/mangle24.C b/gcc/testsuite/g++.dg/abi/mangle24.C index 3a9f629d5bf..1f5c5c1c3de 100644 --- a/gcc/testsuite/g++.dg/abi/mangle24.C +++ b/gcc/testsuite/g++.dg/abi/mangle24.C @@ -3,10 +3,10 @@ // also says that "long double" is mangled as "e", so these conflict on // ia64-hpux where "long double" is "e" and __float80 is "u9__float80". // Origin: Joseph Myers -// { dg-do compile { target i?86-*-* x86_64-*-* ia64-*-* } } */ -// { dg-options "" } */ -// { dg-final { scan-assembler "_Z1fe" { target i?86-*-* x86_64-*-* } } } */ -// { dg-final { scan-assembler "_Z1fe" { target { ia64-*-* && { ! "ia64-*-hpux*" } } } } } */ -// { dg-final { scan-assembler "_Z1fu9__float80" { target ia64-*-hpux* } } } */ +// { dg-do compile { target i?86-*-* x86_64-*-* ia64-*-* } } +// { dg-options "" } +// { dg-final { scan-assembler "_Z1fe" { target i?86-*-* x86_64-*-* } } } +// { dg-final { scan-assembler "_Z1fe" { target { ia64-*-* && { ! "ia64-*-hpux*" } } } } } +// { dg-final { scan-assembler "_Z1fu9__float80" { target ia64-*-hpux* } } } int f(__float80 x) { return 0; } diff --git a/gcc/testsuite/g++.dg/abi/mangle25.C b/gcc/testsuite/g++.dg/abi/mangle25.C index e00ba5c692d..74397f778cc 100644 --- a/gcc/testsuite/g++.dg/abi/mangle25.C +++ b/gcc/testsuite/g++.dg/abi/mangle25.C @@ -5,9 +5,9 @@ // "long double". // Origin: Joseph Myers // { dg-do compile { target ia64-*-* i?86-*-* x86_64-*-* } } -// { dg-options "" } */ -// { dg-final { scan-assembler "_Z1fg" { target i?86-*-* x86_64-*-* } } } */ -// { dg-final { scan-assembler "_Z1fg" { target { ia64-*-* && { ! "ia64-*-hpux*" } } } } } */ -// { dg-final { scan-assembler "_Z1fe" { target ia64-*-hpux* } } } */ +// { dg-options "" } +// { dg-final { scan-assembler "_Z1fg" { target i?86-*-* x86_64-*-* } } } +// { dg-final { scan-assembler "_Z1fg" { target { ia64-*-* && { ! "ia64-*-hpux*" } } } } } +// { dg-final { scan-assembler "_Z1fe" { target ia64-*-hpux* } } } int f(__float128 x) { return 0; } diff --git a/gcc/testsuite/g++.dg/ext/attrib35.C b/gcc/testsuite/g++.dg/ext/attrib35.C index 60c48403e25..63892e1e338 100644 --- a/gcc/testsuite/g++.dg/ext/attrib35.C +++ b/gcc/testsuite/g++.dg/ext/attrib35.C @@ -1,4 +1,4 @@ -// { dg-do compile { target i*86-*-* x86_64-*-* } } +// { dg-do compile { target i?86-*-* x86_64-*-* } } // { dg-options "-O3 -msse2" } // You can make NON-template typedefs with a large alignment. diff --git a/gcc/testsuite/g++.dg/ext/attrib36.C b/gcc/testsuite/g++.dg/ext/attrib36.C index a5197118179..5434cb9eff0 100644 --- a/gcc/testsuite/g++.dg/ext/attrib36.C +++ b/gcc/testsuite/g++.dg/ext/attrib36.C @@ -1,6 +1,5 @@ // PR c++/43031 -// { dg-do compile { target i?86-*-* x86_64-*-* } } -// { dg-require-effective-target ilp32 } +// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } class T; class L { }; diff --git a/gcc/testsuite/g++.dg/ext/attrib37.C b/gcc/testsuite/g++.dg/ext/attrib37.C index ac35587892a..d12c176afd3 100644 --- a/gcc/testsuite/g++.dg/ext/attrib37.C +++ b/gcc/testsuite/g++.dg/ext/attrib37.C @@ -1,5 +1,5 @@ // PR c++/43093 -// { dg-do compile { target i?86-*-* } } +// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } struct S { int x; -- 2.30.2