testsuite: Update error messages in sve/acle/general-c

The “previous definition of 'x'” notes now include the type
of the original definition before “was here”.  There's not really
any need to hard-code that much of the message in the ACLE tests,
so this patch just removes the “was here” from the match string.

gcc/testsuite/

	* gcc.target/aarch64/sve/acle/general-c/func_redef_1.c: Remove
	"was here" from error message.
	* gcc.target/aarch64/sve/acle/general-c/func_redef_2.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/func_redef_3.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/func_redef_6.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/type_redef_1.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/type_redef_2.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/type_redef_3.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/type_redef_4.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/type_redef_5.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/type_redef_6.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/type_redef_8.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/type_redef_9.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/type_redef_10.c: Likewise.
	* gcc.target/aarch64/sve/acle/general-c/type_redef_13.c: Likewise.

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_1.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_1.c
index e1b99fa361b46dfd62b92c6814b83cc839b97ac5..33ed8f7a34a355bc927395b2ddd1dcc159736c6b 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-int svadd_n_u8_x; /* { dg-message "note: previous declaration of 'svadd_n_u8_x' was here" } */
+int svadd_n_u8_x; /* { dg-message "note: previous declaration of 'svadd_n_u8_x'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {'svadd_n_u8_x' redeclared} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_2.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_2.c
index 7f653f1173fdd501cdfdeb94bb11239d45c01804..67996683a153051913bd9627e2f6c55c915a617c 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_2.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-int svadd_n_u8_x = 1; /* { dg-message "note: previous definition of 'svadd_n_u8_x' was here" } */
+int svadd_n_u8_x = 1; /* { dg-message "note: previous definition of 'svadd_n_u8_x'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {'svadd_n_u8_x' redeclared} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_3.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_3.c
index d9ff15a6c3ce3d742246b3c31a3f3c094ad60320..41988b27c81a38ba359a4dccd0692edf1f43c841 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_3.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-extern __SVInt8_t svadd_u8_x (__SVBool_t, __SVInt8_t, __SVInt8_t); /* { dg-message "note: previous declaration of 'svadd_u8_x' was here" } */
+extern __SVInt8_t svadd_u8_x (__SVBool_t, __SVInt8_t, __SVInt8_t); /* { dg-message "note: previous declaration of 'svadd_u8_x'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {conflicting types for 'svadd_u8_x'} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_6.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_6.c
index 1f04e46444977f1dbaded812f4e07087a3a8b560..01d1ca7ec7d23f823431a3b63ba55257e885f870 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_6.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/func_redef_6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-typedef int svadd_u8_x; /* { dg-message "note: previous declaration of 'svadd_u8_x' was here" } */
+typedef int svadd_u8_x; /* { dg-message "note: previous declaration of 'svadd_u8_x'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {'svadd_u8_x' redeclared} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_1.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_1.c
index 70b2d9dd1aba0b27e95e64f0bc2792aa460f69c5..28fba53f44d8afb99142422e1582b15ec089e59f 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-int svbool_t; /* { dg-message "note: previous declaration of 'svbool_t' was here" } */
+int svbool_t; /* { dg-message "note: previous declaration of 'svbool_t'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {'svbool_t' redeclared} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_10.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_10.c
index 8278c1cad3e68568f3af52a8a23183f269e40b60..22b7934f0b79b39dfd6226f90398b310ee1271dc 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_10.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_10.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-typedef struct svint8x2_t svint8x2_t; /* { dg-message "note: previous declaration of 'svint8x2_t' was here" } */
+typedef struct svint8x2_t svint8x2_t; /* { dg-message "note: previous declaration of 'svint8x2_t'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {conflicting types for 'svint8x2_t'} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_13.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_13.c
index 62bab1f8469b6fdc59e305e5e259ac7af2d28d45..61449a08809dc176345143a73031cc1bfd8a75e4 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_13.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_13.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-#pragma GCC aarch64 "arm_sve.h"  /* { dg-message "note: previous declaration of 'svint8x2_t' was here" } */
+#pragma GCC aarch64 "arm_sve.h"  /* { dg-message "note: previous declaration of 'svint8x2_t'" } */
 
 int svint8x2_t;  /* { dg-error {'svint8x2_t' redeclared} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_2.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_2.c
index ffd86ae7bfef3eda0f29ac81c1b8ead827c1fb35..a4afb780b02fb223e9c5d1e6c104a8538673bd8c 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_2.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-int svint8_t; /* { dg-message "note: previous declaration of 'svint8_t' was here" } */
+int svint8_t; /* { dg-message "note: previous declaration of 'svint8_t'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {'svint8_t' redeclared} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_3.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_3.c
index f42dd96804f0197c8745f6d4ad289faf444d2667..c22c105fdfc4f210a1cc2da38c47a584f05353e0 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_3.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-int svuint16_t; /* { dg-message "note: previous declaration of 'svuint16_t' was here" } */
+int svuint16_t; /* { dg-message "note: previous declaration of 'svuint16_t'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {'svuint16_t' redeclared} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_4.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_4.c
index 91c95a1f5fb41f0a8d870e7b9f4136fca112d84d..2c4014eba04577c22d395b5b41cbfdfcb7a69339 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_4.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-int svfloat32_t; /* { dg-message "note: previous declaration of 'svfloat32_t' was here" } */
+int svfloat32_t; /* { dg-message "note: previous declaration of 'svfloat32_t'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {'svfloat32_t' redeclared} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_5.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_5.c
index 3cb6b8a1c981ab41e03a00a39b914adc9eac0275..30bf07783fcee16d4709c9b4e1093f6829bd7d2d 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_5.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-typedef int svbool_t; /* { dg-message "note: previous declaration of 'svbool_t' was here" } */
+typedef int svbool_t; /* { dg-message "note: previous declaration of 'svbool_t'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {conflicting types for 'svbool_t'} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_6.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_6.c
index c051897b6d1679fa407d1cec24e9b3b4af50412d..5d81b2bca935dc46de99f0728f455663693806b6 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_6.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_6.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 
-typedef __SVBool_t svbool_t; /* { dg-message "note: previous declaration of 'svbool_t' was here" } */
+typedef __SVBool_t svbool_t; /* { dg-message "note: previous declaration of 'svbool_t'" } */
 
 #pragma GCC aarch64 "arm_sve.h" /* { dg-error {redefinition of typedef 'svbool_t'} } */
 

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_8.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_8.c
index 41614a3045f763418a90d4e8600bc85348fdb89f..88ed541a72dd9044a95ce058948d832ef6fe69d4 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_8.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-int svint8x2_t; /* { dg-message "note: previous declaration of 'svint8x2_t' was here" } */
+int svint8x2_t; /* { dg-message "note: previous declaration of 'svint8x2_t'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {'svint8x2_t' redeclared} } */

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_9.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_9.c
index 83b6855df9b085015b9b141e3823129ee8bffdba..ec67386596b6dcf5e6c012e9f8d88b328fcd9de3 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_9.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/type_redef_9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
 
-typedef int svint8x2_t; /* { dg-message "note: previous declaration of 'svint8x2_t' was here" } */
+typedef int svint8x2_t; /* { dg-message "note: previous declaration of 'svint8x2_t'" } */
 
 #pragma GCC aarch64 "arm_sve.h"  /* { dg-error {conflicting types for 'svint8x2_t'} } */