[gcc/devel/omp/gcc-9] darwin, testsuite, backport fixes for section-attr-*

[Tobias Burnus]

https://gcc.gnu.org/g:ce9225d65b0a81a27d29ee4af49ca946783f0e11

commit ce9225d65b0a81a27d29ee4af49ca946783f0e11
Author: Iain Sandoe <iain@sandoe.co.uk>
Date:   Tue May 14 16:05:35 2019 +0000

    darwin, testsuite, backport fixes for section-attr-*
    
    2019-05-14  Iain Sandoe  <iain@sandoe.co.uk>
    
    	Backport from mainline.
    	2019-05-02  Iain Sandoe  <iain@sandoe.co.uk>
    
    	* gcc.dg/tree-prof/section-attr-1.c: Update scan-asm regex
    	for cold section label.
    	* gcc.dg/tree-prof/section-attr-2.c: Likewise.
    	* gcc.dg/tree-prof/section-attr-3.c: Likewise.
    
    From-SVN: r271177

Diff:
---
 gcc/testsuite/ChangeLog                         | 10 ++++++++++
 gcc/testsuite/gcc.dg/tree-prof/section-attr-1.c |  2 +-
 gcc/testsuite/gcc.dg/tree-prof/section-attr-2.c |  2 +-
 gcc/testsuite/gcc.dg/tree-prof/section-attr-3.c |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c8e4ac8..d8c83a7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,16 @@
 	Backport from mainline.
 	2019-05-02  Iain Sandoe  <iain@sandoe.co.uk>
 
+	* gcc.dg/tree-prof/section-attr-1.c: Update scan-asm regex
+	for cold section label.
+	* gcc.dg/tree-prof/section-attr-2.c: Likewise.
+	* gcc.dg/tree-prof/section-attr-3.c: Likewise.
+
+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>
diff --git a/gcc/testsuite/gcc.dg/tree-prof/section-attr-1.c b/gcc/testsuite/gcc.dg/tree-prof/section-attr-1.c
index 0cbd2de..89ecc1c 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/section-attr-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/section-attr-1.c
@@ -47,4 +47,4 @@ foo (int path)
 }
 
 /* { dg-final-use { scan-assembler "\.section\[\t \]*\.text\.unlikely\[\\n\\r\]+\[\t \]*\.size\[\t \]*foo\.cold" { target *-*-linux* *-*-gnu* } } } */
-/* { dg-final-use { scan-assembler "\.section\[\t \]*__TEXT,__text_cold\*\[\\n\\r\]+_foo\.cold" { target *-*-darwin* } } } */
+/* { dg-final-use { scan-assembler {.section[\t ]*__TEXT,__text_cold[^\n]*[\n\r]+_foo.cold:} { target *-*-darwin* } } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/section-attr-2.c b/gcc/testsuite/gcc.dg/tree-prof/section-attr-2.c
index 75a4d8a..b856457 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/section-attr-2.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/section-attr-2.c
@@ -46,4 +46,4 @@ foo (int path)
 }
 
 /* { dg-final-use { scan-assembler "\.section\[\t \]*\.text\.unlikely\[\\n\\r\]+\[\t \]*\.size\[\t \]*foo\.cold" { target *-*-linux* *-*-gnu* } } } */
-/* { dg-final-use { scan-assembler "\.section\[\t \]*__TEXT,__text_cold\*\[\\n\\r\]+_foo\.cold:" { target *-*-darwin* } } } */
+/* { dg-final-use { scan-assembler {.section[\t ]*__TEXT,__text_cold[^\n]*[\n\r]+_foo.cold:} { target *-*-darwin* } } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/section-attr-3.c b/gcc/testsuite/gcc.dg/tree-prof/section-attr-3.c
index c243b18..8d85cf3 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/section-attr-3.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/section-attr-3.c
@@ -47,4 +47,4 @@ foo (int path)
 }
 
 /* { dg-final-use { scan-assembler "\.section\[\t \]*\.text\.unlikely\[\\n\\r\]+\[\t \]*\.size\[\t \]*foo\.cold" { target *-*-linux* *-*-gnu* } } } */
-/* { dg-final-use { scan-assembler "\.section\[\t \]*__TEXT,__text_cold\*\[\\n\\r\]+_foo\.cold:" { target *-*-darwin* } } } */
+/* { dg-final-use { scan-assembler {.section[\t ]*__TEXT,__text_cold[^\n]*[\n\r]+_foo.cold:} { target *-*-darwin* } } } */