Fix comdat_group check with Solaris as

	* lib/target-supports.exp (check_effective_target_comdat_group):
	Allow for Solaris as comdat syntax.

	* g++.dg/debug/dwarf2/nested-4.C: Xfail scan-assembler-times on
	Solaris with comdat_group support and as.

From-SVN: r257272

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 149df85..c6741d8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2018-01-31  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * lib/target-supports.exp (check_effective_target_comdat_group):
+       Allow for Solaris as comdat syntax.
+
+       * g++.dg/debug/dwarf2/nested-4.C: Xfail scan-assembler-times on
+       Solaris with comdat_group support and as.
+
 2018-01-31  Marek Polacek  <polacek@redhat.com>
 
        PR c/81779

diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/nested-4.C b/gcc/testsuite/g++.dg/debug/dwarf2/nested-4.C
index 75cc97b..6cf7644 100644 (file)
--- a/gcc/testsuite/g++.dg/debug/dwarf2/nested-4.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/nested-4.C
@@ -1,6 +1,6 @@
 // PR debug/53235
 // { dg-options "-gdwarf-4 -fdebug-types-section" }
-// { dg-final { scan-assembler-times "debug_types" 2 { xfail { powerpc-ibm-aix* || { *-*-darwin* || { *-*-solaris2.1[1-9]* && { ! gas } } } } } } }
+// { dg-final { scan-assembler-times "debug_types" 2 { xfail { powerpc-ibm-aix* || { *-*-darwin* || { *-*-solaris2.* && { comdat_group && { ! gas } } } } } } } }
 
 namespace E {
   class O {};

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index c2ec93b..8bb8095 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -8975,7 +8975,7 @@ proc check_effective_target_tls_get_addr_via_got { } {
 # Return 1 if the target uses comdat groups.
 
 proc check_effective_target_comdat_group {} {
-    return [check_no_messages_and_pattern comdat_group "\.section\[^\n\r]*,comdat" assembly {
+    return [check_no_messages_and_pattern comdat_group "\.section\[^\n\r]*,comdat|\.group\[^\n\r]*,#comdat" assembly {
        // C++
        inline int foo () { return 1; }
        int (*fn) () = foo;