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.
This commit is contained in:
Richard Sandiford 2021-04-08 15:00:05 +01:00
parent a45fe62102
commit cc6c157200
14 changed files with 14 additions and 14 deletions

View File

@ -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} } */

View File

@ -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} } */

View File

@ -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'} } */

View File

@ -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} } */

View File

@ -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} } */

View File

@ -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'} } */

View File

@ -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} } */

View File

@ -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} } */

View File

@ -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} } */

View File

@ -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} } */

View File

@ -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'} } */

View File

@ -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'} } */

View File

@ -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} } */

View File

@ -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'} } */