force-indirect-call-1.c: Merge scan strings.

	* gcc.target/i386/force-indirect-call-1.c: Merge scan strings.
	* gcc.target/i386/force-indirect-call-2.c: Ditto.
	Require fpic effective target.
	* gcc.target/i386/force-indirect-call-3.c: Ditto.
	Require lp64 effective target.

From-SVN: r254635

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bc9c8adf357337a42ab4c4141f90e9b25257d508..92379ebf6f365cc082f3aa3d7a1b4b193417763f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,15 +1,23 @@
+2017-11-10  Uros Bizjak  <ubizjak@gmail.com>
+
+       * gcc.target/i386/force-indirect-call-1.c: Merge scan strings.
+       * gcc.target/i386/force-indirect-call-2.c: Ditto.
+       Require fpic effective target.
+       * gcc.target/i386/force-indirect-call-3.c: Ditto.
+       Require lp64 effective target.
+
 2017-11-10  Julia Koval  <julia.koval@intel.com>
 
-        * gcc.target/i386/avx-1.c: Handle new intrinsics.
-        * gcc.target/i386/avx512f-gf2p8affineqb-2.c: New runtime tests.
-        * gcc.target/i386/avx512vl-gf2p8affineqb-2.c: Ditto.
-        * gcc.target/i386/gfni-1.c: Add tests for GF2P8AFFINE.
-        * gcc.target/i386/gfni-2.c: Ditto.
-        * gcc.target/i386/gfni-3.c: Ditto.
-        * gcc.target/i386/gfni-4.c: Ditto.
-        * gcc.target/i386/sse-13.c: Handle new tests.
-        * gcc.target/i386/sse-14.c: Handle new tests.
-        * gcc.target/i386/sse-23.c: Handle new tests.
+       * gcc.target/i386/avx-1.c: Handle new intrinsics.
+       * gcc.target/i386/avx512f-gf2p8affineqb-2.c: New runtime tests.
+       * gcc.target/i386/avx512vl-gf2p8affineqb-2.c: Ditto.
+       * gcc.target/i386/gfni-1.c: Add tests for GF2P8AFFINE.
+       * gcc.target/i386/gfni-2.c: Ditto.
+       * gcc.target/i386/gfni-3.c: Ditto.
+       * gcc.target/i386/gfni-4.c: Ditto.
+       * gcc.target/i386/sse-13.c: Handle new tests.
+       * gcc.target/i386/sse-14.c: Handle new tests.
+       * gcc.target/i386/sse-23.c: Handle new tests.
 
 2017-11-10  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 

diff --git a/gcc/testsuite/gcc.target/i386/force-indirect-call-1.c b/gcc/testsuite/gcc.target/i386/force-indirect-call-1.c
index be1be2c879e64b1cfc91f0dc315905bfb881b3e8..6ecf598708a3d931cdd022f2983453562e44b317 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/force-indirect-call-1.c
+++ b/gcc/testsuite/gcc.target/i386/force-indirect-call-1.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -mforce-indirect-call" } */
-/* { dg-final { scan-assembler-times "call\[ \\t\]+\\*%" 2 } } */
-/* { dg-final { scan-assembler-times "jmp\[ \\t\]+\\*%" 1 } } */
+/* { dg-final { scan-assembler-times "(?:call|jmp)\[ \\t\]+\\*%" 3 } } */
+
 int x;
 int y;
 

diff --git a/gcc/testsuite/gcc.target/i386/force-indirect-call-2.c b/gcc/testsuite/gcc.target/i386/force-indirect-call-2.c
index dd0df259ab82067d3bd89375861ad7122d112cf2..2f7023630415b97c5d9c380e43f2ff4adf1bdbad 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/force-indirect-call-2.c
+++ b/gcc/testsuite/gcc.target/i386/force-indirect-call-2.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -mforce-indirect-call -fPIC" } */
-/* { dg-final { scan-assembler-times "call\[ \\t\]+\\*%" 2 } } */
-/* { dg-final { scan-assembler-times "jmp\[ \\t\]+\\*%" 1 } } */
+/* { dg-require-effective-target fpic } */
+/* { dg-final { scan-assembler-times "(?:call|jmp)\[ \\t\]+\\*%" 3 } } */
+
 #include "force-indirect-call-1.c"

diff --git a/gcc/testsuite/gcc.target/i386/force-indirect-call-3.c b/gcc/testsuite/gcc.target/i386/force-indirect-call-3.c
index 28d8c98b7b91171dc180ec0e1e1d4ba8fa2eab83..37bc01bf5c5ed093cf27517abc9d82d7ab4205df 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/force-indirect-call-3.c
+++ b/gcc/testsuite/gcc.target/i386/force-indirect-call-3.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -mforce-indirect-call -mcmodel=medium" } */
-/* { dg-final { scan-assembler-times "call\[ \\t\]+\\*%" 2 } } */
-/* { dg-final { scan-assembler-times "jmp\[ \\t\]+\\*%" 1 } } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-final { scan-assembler-times "(?:call|jmp)\[ \\t\]+\\*%" 3 } } */
+
 #include "force-indirect-call-1.c"