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

gcc/testsuite/ChangeLog

+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>
 

gcc/testsuite/gcc.target/i386/force-indirect-call-1.c

 /* { 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;
 

gcc/testsuite/gcc.target/i386/force-indirect-call-2.c

 /* { 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"

gcc/testsuite/gcc.target/i386/force-indirect-call-3.c

 /* { 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"