From: abennett <abennett@138bc75d-0d04-0410-961f-82ee72b054a4>
Cherry-picked 4420f953c31daf1991011d306a56ab74c39b44ee
and 83c13cb19cb1e87a25326024943b95930a17e86b
from https://github.com/MIPS/gcc
Signed-off-by: Andrew Bennett <andrew.benn...@imgtec.com>
Signed-off-by: Matthew Fortune <matthew.fort...@imgtec.com>
Signed-off-by: Faraz Shahbazker <fshahbaz...@wavecomp.com>
Signed-off-by: Aleksandar Rakic <aleksandar.ra...@htecgroup.com>
---
gcc/testsuite/gcc.target/mips/near-far-1.c | 10 +++++-----
gcc/testsuite/gcc.target/mips/near-far-2.c | 10 +++++-----
gcc/testsuite/gcc.target/mips/near-far-3.c | 10 +++++-----
gcc/testsuite/gcc.target/mips/near-far-4.c | 10 +++++-----
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/gcc/testsuite/gcc.target/mips/near-far-1.c
b/gcc/testsuite/gcc.target/mips/near-far-1.c
index 356f7adc725..9d3f29d264e 100644
--- a/gcc/testsuite/gcc.target/mips/near-far-1.c
+++ b/gcc/testsuite/gcc.target/mips/near-far-1.c
@@ -16,8 +16,8 @@ int test ()
+ normal_func ());
}
-/* { dg-final { scan-assembler-not "\tjal\tlong_call_func\n" } } */
-/* { dg-final { scan-assembler-not "\tjal\tfar_func\n" } } */
-/* { dg-final { scan-assembler "\t(jal(|s)|balc)\tshort_call_func\n" } } */
-/* { dg-final { scan-assembler "\t(jal(|s)|balc)\tnear_func\n" } } */
-/* { dg-final { scan-assembler-not "\tjal\tnormal_func\n" } } */
+/* { dg-final { scan-assembler-not "\t(jals?|balc)\tlong_call_func\n" } } */
+/* { dg-final { scan-assembler-not "\t(jals?|balc)\tfar_func\n" } } */
+/* { dg-final { scan-assembler "\t(jals?|balc)\tshort_call_func\n" } } */
+/* { dg-final { scan-assembler "\t(jals?|balc)\tnear_func\n" } } */
+/* { dg-final { scan-assembler-not "\t(jals?|balc)\tnormal_func\n" } } */
diff --git a/gcc/testsuite/gcc.target/mips/near-far-2.c
b/gcc/testsuite/gcc.target/mips/near-far-2.c
index 2e8dbb17f7e..ed9757c4812 100644
--- a/gcc/testsuite/gcc.target/mips/near-far-2.c
+++ b/gcc/testsuite/gcc.target/mips/near-far-2.c
@@ -16,8 +16,8 @@ int test ()
+ normal_func ());
}
-/* { dg-final { scan-assembler-not "\tjal(|s)\tlong_call_func\n" } } */
-/* { dg-final { scan-assembler-not "\tjal(|s)\tfar_func\n" } } */
-/* { dg-final { scan-assembler "\t(jal(|s)|balc)\tshort_call_func\n" } } */
-/* { dg-final { scan-assembler "\t(jal(|s)|balc)\tnear_func\n" } } */
-/* { dg-final { scan-assembler "\t(jal(|s)|balc)\tnormal_func\n" } } */
+/* { dg-final { scan-assembler-not "\t(jals?|balc)\tlong_call_func\n" } } */
+/* { dg-final { scan-assembler-not "\t(jals?|balc)\tfar_func\n" } } */
+/* { dg-final { scan-assembler "\t(jals?|balc)\tshort_call_func\n" } } */
+/* { dg-final { scan-assembler "\t(jals?|balc)\tnear_func\n" } } */
+/* { dg-final { scan-assembler "\t(jals?|balc)\tnormal_func\n" } } */
diff --git a/gcc/testsuite/gcc.target/mips/near-far-3.c
b/gcc/testsuite/gcc.target/mips/near-far-3.c
index 19e1b3a7334..d4ad3e753b9 100644
--- a/gcc/testsuite/gcc.target/mips/near-far-3.c
+++ b/gcc/testsuite/gcc.target/mips/near-far-3.c
@@ -13,8 +13,8 @@ NOMIPS16 int test3 () { return near_func (); }
NOMIPS16 int test4 () { return normal_func (); }
NOMIPS16 int test5 () { return short_call_func (); }
-/* { dg-final { scan-assembler-not "\tj\tlong_call_func\n" } } */
-/* { dg-final { scan-assembler-not "\tj\tfar_func\n" } } */
-/* { dg-final { scan-assembler "\t(j(|al|als)|b(|al)c)\tnear_func\n" } } */
-/* { dg-final { scan-assembler-not "\tj\tnormal_func\n" } } */
-/* { dg-final { scan-assembler "\t(j(|al|als)|b(|al)c)\tshort_call_func\n"
} } */
+/* { dg-final { scan-assembler-not
"\t((j(|al|als))|b(|al)c)\tlong_call_func\n" } } */
+/* { dg-final { scan-assembler-not "\t((j(|al|als))|b(|al)c)\tfar_func\n" } }
*/
+/* { dg-final { scan-assembler "\t((j(|al|als))|b(|al)c)\tnear_func\n" } }
*/
+/* { dg-final { scan-assembler-not "\t((j(|al|als))|b(|al)c)\tnormal_func\n" }
} */
+/* { dg-final { scan-assembler
"\t((j(|al|als))|b(|al)c)\tshort_call_func\n" } } */
diff --git a/gcc/testsuite/gcc.target/mips/near-far-4.c
b/gcc/testsuite/gcc.target/mips/near-far-4.c
index ac7d7273814..37baad9b4f6 100644
--- a/gcc/testsuite/gcc.target/mips/near-far-4.c
+++ b/gcc/testsuite/gcc.target/mips/near-far-4.c
@@ -13,8 +13,8 @@ NOMIPS16 int test3 () { return near_func (); }
NOMIPS16 int test4 () { return normal_func (); }
NOMIPS16 int test5 () { return short_call_func (); }
-/* { dg-final { scan-assembler-not "\tj\tlong_call_func\n" } } */
-/* { dg-final { scan-assembler-not "\tj\tfar_func\n" } } */
-/* { dg-final { scan-assembler "\t(j(|al|als)|b(|al)c)\tnear_func\n" } } */
-/* { dg-final { scan-assembler "\t(j(|al|als)|b(|al)c)\tnormal_func\n" } }
*/
-/* { dg-final { scan-assembler "\t(j(|al|als)|b(|al)c)\tshort_call_func\n"
} } */
+/* { dg-final { scan-assembler-not
"\t((j(|al|als))|b(|al)c)\tlong_call_func\n" } } */
+/* { dg-final { scan-assembler-not "\t((j(|al|als))|b(|al)c)\tfar_func\n" } }
*/
+/* { dg-final { scan-assembler "\t((j(|al|als))|b(|al)c)\tnear_func\n" } }
*/
+/* { dg-final { scan-assembler "\t((j(|al|als))|b(|al)c)\tnormal_func\n" }
} */
+/* { dg-final { scan-assembler
"\t((j(|al|als))|b(|al)c)\tshort_call_func\n" } } */
--
2.34.1
