Hi,
This has been on my TODO for a while, it fixes up a bunch of tests
that changed when the default shifted to no-common.
tested on x86_64-darwin16 / x86-64-linux-gnu
applied to master,
thanks
Iain
Darwin mandates an indirection for variables in the commmon
section. Since the change to -fno-common, variables in some
of the thunk tests are now in the .data section where they
may be accessed directly. Remove the indirections from the
scan-assembler matches.
gcc/testsuite/ChangeLog:
2020-04-12 Iain Sandoe <i...@sandoe.co.uk>
* gcc.target/i386/indirect-thunk-1.c: Adjust for fno-common
change, removing indirections for vars in .data.
* gcc.target/i386/indirect-thunk-2.c: Likewise.
* gcc.target/i386/indirect-thunk-3.c: Likewise.
* gcc.target/i386/indirect-thunk-4.c: Likewise.
* gcc.target/i386/indirect-thunk-attr-1.c: Likewise.
* gcc.target/i386/indirect-thunk-attr-2.c: Likewise.
* gcc.target/i386/indirect-thunk-attr-3.c: Likewise.
* gcc.target/i386/indirect-thunk-attr-4.c: Likewise.
* gcc.target/i386/indirect-thunk-attr-5.c: Likewise.
* gcc.target/i386/indirect-thunk-attr-6.c: Likewise.
* gcc.target/i386/indirect-thunk-extern-1.c: Likewise.
* gcc.target/i386/indirect-thunk-extern-2.c: Likewise.
* gcc.target/i386/indirect-thunk-extern-3.c: Likewise.
* gcc.target/i386/indirect-thunk-extern-4.c: Likewise.
* gcc.target/i386/indirect-thunk-inline-1.c: Likewise.
* gcc.target/i386/indirect-thunk-inline-2.c: Likewise.
* gcc.target/i386/indirect-thunk-inline-3.c: Likewise.
* gcc.target/i386/indirect-thunk-inline-4.c: Likewise.
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
index e2914a8333c..77593c97ab9 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-1.c
@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } }
*/
/* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
/* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
index d2b7c74b143..91e606b96d2 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-2.c
@@ -13,8 +13,8 @@ male_indirect_jump (long offset)
}
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
-/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {leaq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } }
*/
/* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
/* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
index 129fb2125f0..bf6573292db 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-3.c
@@ -15,7 +15,7 @@ male_indirect_jump (long offset)
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" }
} */
/* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
/* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
index 01996fb029f..2ece2d7215d 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-4.c
@@ -14,8 +14,8 @@ male_indirect_jump (long offset)
}
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
-/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {leaq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" }
} */
/* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
/* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
index 1493e18243b..f0648a49b37 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-1.c
@@ -17,7 +17,7 @@ male_indirect_jump (long offset)
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } }
*/
/* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
/* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
index 3ddd4980b69..a28a8b31dea 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-2.c
@@ -14,8 +14,8 @@ male_indirect_jump (long offset)
}
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
-/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {leaq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } }
*/
/* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
/* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
index 43d5f95b4fb..3fea27a50eb 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-3.c
@@ -17,7 +17,7 @@ male_indirect_jump (long offset)
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler-times {jmp[ \t]*\.?LIND} 2 } } */
/* { dg-final { scan-assembler-times {call[ \t]*\.?LIND} 2 } } */
/* { dg-final { scan-assembler {\tpause} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
index bf62636c63c..f2a7690d33e 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-4.c
@@ -15,8 +15,8 @@ male_indirect_jump (long offset)
}
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
-/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {leaq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler-times {jmp[ \t]*\.?LIND} 2 } } */
/* { dg-final { scan-assembler-times {call[ \t]*\.?LIND} 2 } } */
/* { dg-final { scan-assembler {\tpause} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
index 27ba82932e4..d979824f88d 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-5.c
@@ -17,7 +17,7 @@ male_indirect_jump (long offset)
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" }
} */
/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
/* { dg-final { scan-assembler-not {jmp[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
index bdf15d36bac..d8e395ad4b4 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-6.c
@@ -15,8 +15,8 @@ male_indirect_jump (long offset)
}
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
-/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {leaq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" }
} */
/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
/* { dg-final { scan-assembler-not {jmp[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
index c30c331c23b..3be7676d887 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-1.c
@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } }
*/
/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
/* { dg-final { scan-assembler-not {jmp[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
index 7edd7313027..a147ce59742 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-2.c
@@ -13,8 +13,8 @@ male_indirect_jump (long offset)
}
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
-/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {leaq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "jmp\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" } }
*/
/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
/* { dg-final { scan-assembler-not {jmp[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
index 8e391797c5e..469152ad38a 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-3.c
@@ -15,7 +15,7 @@ male_indirect_jump (long offset)
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" }
} */
/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
/* { dg-final { scan-assembler-not {jmp[ \t]*\.?LIND} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
index 6033d13e8a7..151d328cf96 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-4.c
@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
}
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
-/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {leaq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler "call\[ \t\]*_?__x86_indirect_thunk_(r|e)ax" }
} */
/* { dg-final { scan-assembler-not {\t(lfence|pause)} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
index ef3577d2934..1a68953f72d 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-1.c
@@ -14,7 +14,7 @@ male_indirect_jump (long offset)
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
/* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
/* { dg-final { scan-assembler {\tpause} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
index f26a5fb9015..33e61d5948f 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-2.c
@@ -13,8 +13,8 @@ male_indirect_jump (long offset)
}
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
-/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {leaq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler {jmp[ \t]*\.?LIND} } } */
/* { dg-final { scan-assembler {call[ \t]*\.?LIND} } } */
/* { dg-final { scan-assembler {\tpause} } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
index 3b8a1eeaffb..d607dd3606d 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-3.c
@@ -15,7 +15,7 @@ male_indirect_jump (long offset)
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler-times {jmp[ \t]*\.?LIND} 2 } } */
/* { dg-final { scan-assembler-times {call[ \t]*\.?LIND} 2 } } */
/* { dg-final { scan-assembler-times {\tpause} 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
index 40d31803a2e..dee18f630d1 100644
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-inline-4.c
@@ -14,8 +14,8 @@ male_indirect_jump (long offset)
}
/* { dg-final { scan-assembler "mov(?:l|q)\[ \t\]*dispatch" { target
*-*-linux* } } } */
-/* { dg-final { scan-assembler {movq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
-/* { dg-final { scan-assembler {movl[
\t]*[Ll]_dispatch\$non_lazy_ptr-L[0-9]+\$pb} { target { ia32 && *-*-darwin* } }
} } */
+/* { dg-final { scan-assembler {leaq[ \t]*_dispatch} { target { lp64 &&
*-*-darwin* } } } } */
+/* { dg-final { scan-assembler {movl[ \t]*_dispatch-L[0-9]+\$pb} { target {
ia32 && *-*-darwin* } } } } */
/* { dg-final { scan-assembler-times {jmp[ \t]*\.?LIND} 2 } } */
/* { dg-final { scan-assembler-times {call[ \t]*\.?LIND} 2 } } */
/* { dg-final { scan-assembler-times {\tpause} 1 } } */
