Replace absolute line numbers in gcc.target/i386

2017-05-03  Tom de Vries  <tom@codesourcery.com>

	PR testsuite/80557
	* gcc.target/i386/pr57655.c: Replace absolute line numbers.
	* gcc.target/i386/pr68657.c: Same.
	* gcc.target/i386/pr69255-1.c: Same.
	* gcc.target/i386/pr69255-2.c: Same.
	* gcc.target/i386/pr69255-3.c: Same.

---
 gcc/testsuite/gcc.target/i386/pr57655.c   | 6 ++----
 gcc/testsuite/gcc.target/i386/pr68657.c   | 2 +-
 gcc/testsuite/gcc.target/i386/pr69255-1.c | 5 ++---
 gcc/testsuite/gcc.target/i386/pr69255-2.c | 5 ++---
 gcc/testsuite/gcc.target/i386/pr69255-3.c | 5 ++---
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/gcc/testsuite/gcc.target/i386/pr57655.c b/gcc/testsuite/gcc.target/i386/pr57655.c
index 586d338..33a59d3 100644
--- a/gcc/testsuite/gcc.target/i386/pr57655.c
+++ b/gcc/testsuite/gcc.target/i386/pr57655.c
@@ -1,10 +1,8 @@
 /* { dg-do compile } */
-/* { dg-options "-mavx -mvzeroupper -mno-fp-ret-in-387" }
-
-/* { dg-error "x87 register return with x87 disabled" "" { target { ! ia32 } } 8 } */
+/* { dg-options "-mavx -mvzeroupper -mno-fp-ret-in-387" } */
 
 long double
 foo (long double x)
-{
+{ /* { dg-error "x87 register return with x87 disabled" "" { target { ! ia32 } } } */
   return __builtin_ilogbl (x);
 }
diff --git a/gcc/testsuite/gcc.target/i386/pr68657.c b/gcc/testsuite/gcc.target/i386/pr68657.c
index 6f0d498..fcfb489 100644
--- a/gcc/testsuite/gcc.target/i386/pr68657.c
+++ b/gcc/testsuite/gcc.target/i386/pr68657.c
@@ -4,6 +4,7 @@
 typedef int V __attribute__((vector_size (64)));
 
 void foo (V x, V *y) {	/* { dg-error "AVX512F vector argument without AVX512F enabled" } */
+  /* { dg-message "The ABI for passing parameters with 64-byte alignment has changed" "" { target *-*-* } .-1 } */
   *y = x;
 }
 
@@ -11,5 +12,4 @@ V bar (V *x) {		/* { dg-error "AVX512F vector return without AVX512F enabled" }
   return *x;
 }
 
-/* { dg-message "The ABI for passing parameters with 64-byte alignment has changed" "" { target *-*-* } 6 } */
 /* { dg-message "some warnings being treated as errors" "" { target *-*-* } 0 } */
diff --git a/gcc/testsuite/gcc.target/i386/pr69255-1.c b/gcc/testsuite/gcc.target/i386/pr69255-1.c
index f2c1010..4545ce2 100644
--- a/gcc/testsuite/gcc.target/i386/pr69255-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr69255-1.c
@@ -13,7 +13,6 @@ void
 foo (const long long *p)
 {
   a = __builtin_ia32_gather3siv4di (a, p, b, 1, 1);	/* { dg-error "needs isa option -m32 -mavx512vl" } */
+  /* { dg-warning "AVX vector return without AVX enabled changes the ABI" "" { target *-*-* } .-1 } */
+  /* { dg-warning "AVX vector argument without AVX enabled changes the ABI" "" { target *-*-* } .-2 } */
 }
-
-/* { dg-warning "AVX vector return without AVX enabled changes the ABI" "" { target *-*-* } 15 } */
-/* { dg-warning "AVX vector argument without AVX enabled changes the ABI" "" { target *-*-* } 15 } */
diff --git a/gcc/testsuite/gcc.target/i386/pr69255-2.c b/gcc/testsuite/gcc.target/i386/pr69255-2.c
index 9ef6c2f..ebe6828 100644
--- a/gcc/testsuite/gcc.target/i386/pr69255-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr69255-2.c
@@ -13,7 +13,6 @@ void
 foo (const long long *p)
 {
   __builtin_ia32_gather3siv4di (a, p, b, 1, 1);		/* { dg-error "needs isa option -m32 -mavx512vl" } */
+  /* { dg-warning "AVX vector return without AVX enabled changes the ABI" "" { target *-*-* } .-1 } */
+  /* { dg-warning "AVX vector argument without AVX enabled changes the ABI" "" { target *-*-* } .-2 } */
 }
-
-/* { dg-warning "AVX vector return without AVX enabled changes the ABI" "" { target *-*-* } 15 } */
-/* { dg-warning "AVX vector argument without AVX enabled changes the ABI" "" { target *-*-* } 15 } */
diff --git a/gcc/testsuite/gcc.target/i386/pr69255-3.c b/gcc/testsuite/gcc.target/i386/pr69255-3.c
index 713725d..724e40b 100644
--- a/gcc/testsuite/gcc.target/i386/pr69255-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr69255-3.c
@@ -13,7 +13,6 @@ void
 foo (const long long *p, __attribute__ ((__vector_size__ (32))) long long *q)
 {
   *q = __builtin_ia32_gather3siv4di (a, p, b, 1, 1);	/* { dg-error "needs isa option -m32 -mavx512vl" } */
+  /* { dg-warning "AVX vector return without AVX enabled changes the ABI" "" { target *-*-* } .-1 } */
+  /* { dg-warning "AVX vector argument without AVX enabled changes the ABI" "" { target *-*-* } .-2 } */
 }
-
-/* { dg-warning "AVX vector return without AVX enabled changes the ABI" "" { target *-*-* } 15 } */
-/* { dg-warning "AVX vector argument without AVX enabled changes the ABI" "" { target *-*-* } 15 } */
