2011-01-07 Kai Tietz <kai.tietz@onevision.com>

        * g++.dg/ext/dllexport-MI1.C: Adjust test.
        * g++.dg/ext/dllimport-MI1.C: Likewise.
        * g++.dg/ext/dllimport1.C: Add test for x86_64-*-mingw*.
        * g++.dg/ext/dllimport10.C: Likewise.
        * g++.dg/ext/dllimport11.C: Likewise.
        * g++.dg/ext/dllimport12.C: Likewise.
        * g++.dg/ext/dllimport13.C: Likewise.
        * g++.dg/ext/dllimport2.C: Likewise.
        * g++.dg/ext/dllimport3.C: Likewise.
        * g++.dg/ext/dllimport4.C: Likewise.
        * g++.dg/ext/dllimport5.C: Likewise.
        * g++.dg/ext/dllimport6.C: Likewise.
        * g++.dg/ext/dllimport8.C: Likewise.
        * g++.dg/ext/dllimport9.C: Likewise.
        * g++.dg/ext/selectany2.C: Enable test for x86_64-*-mingw*
        targets, too. Additionally enable test for i?86-*-mingw*.
        * g++.dg/ext/selectany1.C: Likewise.
        Remove guard variable check.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168572 138bc75d-0d04-0410-961f-82ee72b054a4

17 files changed, 47 insertions, 27 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 49e7001d00b..c95b4db2023 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,24 @@
+2011-01-07  Kai Tietz  <kai.tietz@onevision.com>
+
+	* g++.dg/ext/dllexport-MI1.C: Adjust test.
+	* g++.dg/ext/dllimport-MI1.C: Likewise.
+	* g++.dg/ext/dllimport1.C: Add test for x86_64-*-mingw*.
+	* g++.dg/ext/dllimport10.C: Likewise.
+	* g++.dg/ext/dllimport11.C: Likewise.
+	* g++.dg/ext/dllimport12.C: Likewise.
+	* g++.dg/ext/dllimport13.C: Likewise.
+	* g++.dg/ext/dllimport2.C: Likewise.
+	* g++.dg/ext/dllimport3.C: Likewise.
+	* g++.dg/ext/dllimport4.C: Likewise.
+	* g++.dg/ext/dllimport5.C: Likewise.
+	* g++.dg/ext/dllimport6.C: Likewise.
+	* g++.dg/ext/dllimport8.C: Likewise.
+	* g++.dg/ext/dllimport9.C: Likewise.
+	* g++.dg/ext/selectany2.C: Enable test for x86_64-*-mingw*
+	targets, too. Additionally enable test for i?86-*-mingw*.
+	* g++.dg/ext/selectany1.C: Likewise.
+	Remove guard variable check.
+
 2011-01-07  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/47189
diff --git a/gcc/testsuite/g++.dg/ext/dllexport-MI1.C b/gcc/testsuite/g++.dg/ext/dllexport-MI1.C
index c5c27dda3d9..08e65ec9608 100644
--- a/gcc/testsuite/g++.dg/ext/dllexport-MI1.C
+++ b/gcc/testsuite/g++.dg/ext/dllexport-MI1.C
@@ -33,12 +33,12 @@ DLL_IMPEXP MI1 dllMI1Copy =  dllMI1;
 
 // and MI thunks,
 
-// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZThn4_NK3MI12vfEv" } }
-// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZTv0_n12_NK2D12vfEv" } }
+// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZThn._NK3MI12vfEv" } }
+// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZTv0_n.._NK2D12vfEv" } }
 
 // and a vtable data variable.
 
-// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZTV2D1\[\\\"\]*,data" } }
+// { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZTV2D1\[\\\\\"\]*,data" } }
 
 // an explicit copy ctor
 // { dg-final { scan-assembler "-export:\[\\\\\"\]*_ZN2D2C2ERKS_" } }
diff --git a/gcc/testsuite/g++.dg/ext/dllimport-MI1.C b/gcc/testsuite/g++.dg/ext/dllimport-MI1.C
index 4efdea4e58b..3f2d05683f6 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport-MI1.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport-MI1.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 //  Test handling of MI thunks in dllimported classes.
 
 // To build the dll and client app:
@@ -49,5 +49,5 @@ int main ()
 
 // Scan for import of explicit copy ctor for D2, but no import
 // of compiler generated copy ctor for D1. 
-// { dg-final { scan-assembler  "__imp___ZN2D2C2ERKS_" } }
-// { dg-final { scan-assembler-not "__imp___ZN2D1C2ERKS_" } }
+// { dg-final { scan-assembler  "__imp\[_\]*__ZN2D2C2ERKS_" } }
+// { dg-final { scan-assembler-not "__imp\[_\]*__ZN2D1C2ERKS_" } }
diff --git a/gcc/testsuite/g++.dg/ext/dllimport1.C b/gcc/testsuite/g++.dg/ext/dllimport1.C
index 1fb69ed9f5c..d7ddfe8a24e 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport1.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport1.C
@@ -1,5 +1,5 @@
 //  PR c++/7910
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 // { dg-options { -Wall -W } }
 
 class __attribute__((dllimport)) Foo
@@ -28,4 +28,4 @@ Bar::~Bar()
 void Bar::dummy_bar_func()
 {}
 
-// { dg-final { scan-assembler-not "__imp___ZN3Foo14dummy_foo_fun" } }
+// { dg-final { scan-assembler-not "__imp\[_\]*__ZN3Foo14dummy_foo_fun" } }
diff --git a/gcc/testsuite/g++.dg/ext/dllimport10.C b/gcc/testsuite/g++.dg/ext/dllimport10.C
index c8aaf228a83..80833766163 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport10.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport10.C
@@ -1,7 +1,7 @@
 // PR c++/5287, c++/11021
 // Inherit a virtual method from a dllimport'd base class.
 
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 
 struct __attribute__((dllimport)) A
 {
diff --git a/gcc/testsuite/g++.dg/ext/dllimport11.C b/gcc/testsuite/g++.dg/ext/dllimport11.C
index 369f96c66ea..6d822be2292 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport11.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport11.C
@@ -1,6 +1,6 @@
 // PR target/23589
 // Template member functions do not get dllimport status of class.
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 
 struct __attribute__((dllimport)) Foo
 {
diff --git a/gcc/testsuite/g++.dg/ext/dllimport12.C b/gcc/testsuite/g++.dg/ext/dllimport12.C
index 9868596a899..ede546f2000 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport12.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport12.C
@@ -1,7 +1,7 @@
 // PR target/27650
 // Don't use dllimport semantics on virtual methods when initializing
 // vtables
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 
 // Use import lib thunk for vtable entry of explicitly virtual method,
 struct base
diff --git a/gcc/testsuite/g++.dg/ext/dllimport13.C b/gcc/testsuite/g++.dg/ext/dllimport13.C
index a0d4ab555f9..fa1ffbfdb52 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport13.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport13.C
@@ -1,7 +1,7 @@
 //  PR c++/34749
 //  Ensure dllimport is handled correctly for friends
 
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 
 int  __declspec (dllimport) bar();
 int  __declspec (dllimport) baz();
diff --git a/gcc/testsuite/g++.dg/ext/dllimport2.C b/gcc/testsuite/g++.dg/ext/dllimport2.C
index 87a96d8ddee..d0de2551a53 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport2.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport2.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 // PR c++/9738  Dllimport attribute is overriden by later definition/redeclaration
 
 void __attribute__((dllimport)) Bar(void);
diff --git a/gcc/testsuite/g++.dg/ext/dllimport3.C b/gcc/testsuite/g++.dg/ext/dllimport3.C
index cd16dfa2505..6538232f7d3 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport3.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport3.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 
 // PR 10148  Dllimport attribute of object is overriden by later
 // redefinition without attribute.
diff --git a/gcc/testsuite/g++.dg/ext/dllimport4.C b/gcc/testsuite/g++.dg/ext/dllimport4.C
index 2baa944b108..4d4074cbbd3 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport4.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport4.C
@@ -1,5 +1,5 @@
 //  Report error if dllimport attribute in definition itself.
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 
 __attribute__((dllimport))  void bar () { }	// { dg-error "definition" }
 
diff --git a/gcc/testsuite/g++.dg/ext/dllimport5.C b/gcc/testsuite/g++.dg/ext/dllimport5.C
index 8e6f166295e..5f1adb1ace2 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport5.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport5.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 //  Report error if static symbol definition has dllimport attribute.
 
 __attribute__((dllimport))
diff --git a/gcc/testsuite/g++.dg/ext/dllimport6.C b/gcc/testsuite/g++.dg/ext/dllimport6.C
index ec85b3650e4..52b0476c6d0 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport6.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport6.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 //  Mark class static members as dllimport.
 
 struct Baz
@@ -25,6 +25,6 @@ int foo()
   return (a + b + c + *baz);
 }
 
-// { dg-final { scan-assembler __imp___ZN3Bar3twoE } }
-// { dg-final { scan-assembler __imp___ZN3Bar5threeE } }
-// { dg-final { scan-assembler __imp___ZN3Bar8null_bazE } }
+// { dg-final { scan-assembler __imp\[_\]*__ZN3Bar3twoE } }
+// { dg-final { scan-assembler __imp\[_\]*__ZN3Bar5threeE } }
+// { dg-final { scan-assembler __imp\[_\]*__ZN3Bar8null_bazE } }
diff --git a/gcc/testsuite/g++.dg/ext/dllimport8.C b/gcc/testsuite/g++.dg/ext/dllimport8.C
index 55326c51866..af605a36824 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport8.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport8.C
@@ -2,7 +2,7 @@
 //  Ignore  dllimport of static members if marked inlined.
 //  or if definition follows  declaration in dllimported class.
 
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 // { dg-options { -Wall -W } }
 
 struct  __attribute__((dllimport)) Foo
@@ -26,4 +26,4 @@ void testfoo()
   Foo::static_func2();
 }
 
-// { dg-final { scan-assembler-not "__imp__" } }
+// { dg-final { scan-assembler-not "__imp_" } }
diff --git a/gcc/testsuite/g++.dg/ext/dllimport9.C b/gcc/testsuite/g++.dg/ext/dllimport9.C
index 8d60bb84d3a..da57ef4bdcc 100644
--- a/gcc/testsuite/g++.dg/ext/dllimport9.C
+++ b/gcc/testsuite/g++.dg/ext/dllimport9.C
@@ -1,5 +1,5 @@
 //  Handle dllimport attribute for functions declared inline.
-// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-do compile { target i?86-*-cygwin* i?86-*-mingw* x86_64-*-mingw* } }
 // { dg-options { -W } }
 
 inline __attribute__((dllimport)) void bar() { }	// { dg-warning "inline" }
@@ -20,4 +20,4 @@ void use_inlines()
   aBlah.out_blah ();
 }
 
-// { dg-final { scan-assembler-not "__imp__" } }
+// { dg-final { scan-assembler-not "__imp_" } }
diff --git a/gcc/testsuite/g++.dg/ext/selectany1.C b/gcc/testsuite/g++.dg/ext/selectany1.C
index 008d15b28cc..e80fe4fd10c 100644
--- a/gcc/testsuite/g++.dg/ext/selectany1.C
+++ b/gcc/testsuite/g++.dg/ext/selectany1.C
@@ -1,11 +1,10 @@
 // { dg-do compile { target i?86-pc-cygwin } }
-// { dg-do compile { target i?86-pc-mingw* } }
+// { dg-do compile { target i?86-*-mingw* x86_64-*-mingw* } }
 
 // Check that selectany attribute puts symbols into link-once sections.
 
 // { dg-final { scan-assembler "\.section\t\.data\\\$foo\[^\n\]*\n\t\.linkonce discard" } }
 // { dg-final { scan-assembler "\.section\t\.data\\\$x\[^\n\]*\n\t\.linkonce discard" } }
-// { dg-final { scan-assembler-dem "\nguard variable for x:" } }
 
 __declspec (selectany) int foo = 1;
 
diff --git a/gcc/testsuite/g++.dg/ext/selectany2.C b/gcc/testsuite/g++.dg/ext/selectany2.C
index af70dcc0869..278b32d2f4b 100644
--- a/gcc/testsuite/g++.dg/ext/selectany2.C
+++ b/gcc/testsuite/g++.dg/ext/selectany2.C
@@ -1,5 +1,5 @@
 // { dg-do compile { target i?86-pc-cygwin } }
-// { dg-do compile { target i?86-pc-mingw* } }
+// { dg-do compile { target i?86-*-mingw* x86_64-*-mingw* } }
 
 // Check for errors with invalid usage of selectany attribute.