darwin, backport fix for g++.dg/ext/instantiate2.C

2019-05-14  Iain Sandoe  <iain@sandoe.co.uk>

	Backport from mainline.
	2019-05-02  Iain Sandoe  <iain@sandoe.co.uk>

	* g++.dg/ext/instantiate2.C: Remove special-casing for Darwin.

From-SVN: r271176

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fb56e537f8fa17fdc72fe7923e12b6a4e8c97bcd..c8e4ac83a8f97277f58adf05ab91a249a15a3659 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2019-05-14  Iain Sandoe  <iain@sandoe.co.uk>
+
+       Backport from mainline.
+       2019-05-02  Iain Sandoe  <iain@sandoe.co.uk>
+
+       * g++.dg/ext/instantiate2.C: Remove special-casing for Darwin.
+
 2019-05-11  Paul Thomas  <pault@gcc.gnu.org>
 
        Backport from trunk

diff --git a/gcc/testsuite/g++.dg/ext/instantiate2.C b/gcc/testsuite/g++.dg/ext/instantiate2.C
index a6292892b38309bd3d295cf0977bc74ce8989ff7..97ef45c874dd9b728c584984d976ce2356b07989 100644 (file)
--- a/gcc/testsuite/g++.dg/ext/instantiate2.C
+++ b/gcc/testsuite/g++.dg/ext/instantiate2.C
@@ -8,8 +8,7 @@ template <class T> struct A {
 template <class T> T A<T>::t = 0;
 static template struct A<int>;
 
-// { dg-final { scan-assembler "\n_?_ZN1AIiE1tE(:|\n|\t)" { target { ! *-*-darwin* } } } }
-// { dg-final { scan-assembler ".zerofill __DATA,__pu_bss2,__ZN1AIiE1tE" { target *-*-darwin* } } } 
+// { dg-final { scan-assembler "\n_?_ZN1AIiE1tE(:|\n|\t)" } }
 void test_int() { A<int>::t = 42; }
 
 // { dg-final { scan-assembler-not "\n_?_ZN1AIcE1tE(:|\n|\t)" } }