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 --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c8e4ac83a8f97277f58adf05ab91a249a15a3659..d8c83a7fce5f791b160db8ac05526a1008e53f8f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+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.
+
 2019-05-14  Iain Sandoe  <iain@sandoe.co.uk>
 
        Backport from mainline.

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 0cbd2de0cb100d0574b078cb8a2b4f0a2ad52301..89ecc1c469364bed8f7decdfc8b3cb35ea2a4c7d 100644 (file)
--- 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 75a4d8a2c9652fe5e3800f70e2fc7a3faa3f3c31..b856457b5598fdfe51eed8b2393ad65a8ec8ae53 100644 (file)
--- 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 c243b18b1cff4a992ae156cdd9f9423ff1428551..8d85cf39f6c9a0574c8622db0f5303e40a3c5489 100644 (file)
--- 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* } } } */