From 1aaf3a64e92ada283f6d3052151858df2ad99e77 Mon Sep 17 00:00:00 2001 From: Tsukasa OI Date: Thu, 17 Aug 2023 07:52:14 -0600 Subject: [PATCH] RISC-V: Deduplicate #error messages in testsuite "#error Feature macro not defined" is required to test the existence of an extension through the preprocessor. However, multiple occurrence of the exact same error message will confuse the developer once an error is encountered. This commit replaces such error messages to "#error Feature macro for `EXT' not defined" to make which macro is missing. gcc/testsuite/ChangeLog: * gcc.target/riscv/zvkn.c: Deduplicate #error messages. * gcc.target/riscv/zvkn-1.c: Ditto. * gcc.target/riscv/zvknc.c: Ditto. * gcc.target/riscv/zvknc-1.c: Ditto. * gcc.target/riscv/zvknc-2.c: Ditto. * gcc.target/riscv/zvkng.c: Ditto. * gcc.target/riscv/zvkng-1.c: Ditto. * gcc.target/riscv/zvkng-2.c: Ditto. * gcc.target/riscv/zvks.c: Ditto. * gcc.target/riscv/zvks-1.c: Ditto. * gcc.target/riscv/zvksc.c: Ditto. * gcc.target/riscv/zvksc-1.c: Ditto. * gcc.target/riscv/zvksc-2.c: Ditto. * gcc.target/riscv/zvksg.c: Ditto. * gcc.target/riscv/zvksg-1.c: Ditto. * gcc.target/riscv/zvksg-2.c: Ditto. --- gcc/testsuite/gcc.target/riscv/zvkn-1.c | 10 +++++----- gcc/testsuite/gcc.target/riscv/zvkn.c | 10 +++++----- gcc/testsuite/gcc.target/riscv/zvknc-1.c | 14 +++++++------- gcc/testsuite/gcc.target/riscv/zvknc-2.c | 14 +++++++------- gcc/testsuite/gcc.target/riscv/zvknc.c | 14 +++++++------- gcc/testsuite/gcc.target/riscv/zvkng-1.c | 14 +++++++------- gcc/testsuite/gcc.target/riscv/zvkng-2.c | 14 +++++++------- gcc/testsuite/gcc.target/riscv/zvkng.c | 14 +++++++------- gcc/testsuite/gcc.target/riscv/zvks-1.c | 10 +++++----- gcc/testsuite/gcc.target/riscv/zvks.c | 10 +++++----- gcc/testsuite/gcc.target/riscv/zvksc-1.c | 14 +++++++------- gcc/testsuite/gcc.target/riscv/zvksc-2.c | 14 +++++++------- gcc/testsuite/gcc.target/riscv/zvksc.c | 14 +++++++------- gcc/testsuite/gcc.target/riscv/zvksg-1.c | 14 +++++++------- gcc/testsuite/gcc.target/riscv/zvksg-2.c | 14 +++++++------- gcc/testsuite/gcc.target/riscv/zvksg.c | 14 +++++++------- 16 files changed, 104 insertions(+), 104 deletions(-) (limited to 'gcc') diff --git a/gcc/testsuite/gcc.target/riscv/zvkn-1.c b/gcc/testsuite/gcc.target/riscv/zvkn-1.c index 83935b0..84a3b57 100644 --- a/gcc/testsuite/gcc.target/riscv/zvkn-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvkn-1.c @@ -3,23 +3,23 @@ /* { dg-options "-march=rv32gc_zvkned_zvknhb_zvbb_zvkt" { target { rv32 } } } */ #ifndef __riscv_zvkn -#error Feature macro not defined +#error Feature macro for `Zvkn' not defined #endif #ifndef __riscv_zvkned -#error Feature macro not defined +#error Feature macro for `Zvkned' not defined #endif #ifndef __riscv_zvknhb -#error Feature macro not defined +#error Feature macro for `Zvknhb' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvkn.c b/gcc/testsuite/gcc.target/riscv/zvkn.c index af3db40..b42c188 100644 --- a/gcc/testsuite/gcc.target/riscv/zvkn.c +++ b/gcc/testsuite/gcc.target/riscv/zvkn.c @@ -3,23 +3,23 @@ /* { dg-options "-march=rv32gc_zvkn" { target { rv32 } } } */ #ifndef __riscv_zvkn -#error Feature macro not defined +#error Feature macro for `Zvkn' not defined #endif #ifndef __riscv_zvkned -#error Feature macro not defined +#error Feature macro for `Zvkned' not defined #endif #ifndef __riscv_zvknhb -#error Feature macro not defined +#error Feature macro for `Zvknhb' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvknc-1.c b/gcc/testsuite/gcc.target/riscv/zvknc-1.c index eca2767..5c456a6 100644 --- a/gcc/testsuite/gcc.target/riscv/zvknc-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvknc-1.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvkned_zvknhb_zvbb_zvkt_zvbc" { target { rv32 } } } */ #ifndef __riscv_zvknc -#error Feature macro not defined +#error Feature macro for `Zvknc' not defined #endif #ifndef __riscv_zvkn -#error Feature macro not defined +#error Feature macro for `Zvkn' not defined #endif #ifndef __riscv_zvkned -#error Feature macro not defined +#error Feature macro for `Zvkned' not defined #endif #ifndef __riscv_zvknhb -#error Feature macro not defined +#error Feature macro for `Zvknhb' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvbc -#error Feature macro not defined +#error Feature macro for `Zvbc' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvknc-2.c b/gcc/testsuite/gcc.target/riscv/zvknc-2.c index e77343a..fbedbf3 100644 --- a/gcc/testsuite/gcc.target/riscv/zvknc-2.c +++ b/gcc/testsuite/gcc.target/riscv/zvknc-2.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvkn_zvbc" { target { rv32 } } } */ #ifndef __riscv_zvknc -#error Feature macro not defined +#error Feature macro for `Zvknc' not defined #endif #ifndef __riscv_zvkn -#error Feature macro not defined +#error Feature macro for `Zvkn' not defined #endif #ifndef __riscv_zvkned -#error Feature macro not defined +#error Feature macro for `Zvkned' not defined #endif #ifndef __riscv_zvknhb -#error Feature macro not defined +#error Feature macro for `Zvknhb' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvbc -#error Feature macro not defined +#error Feature macro for `Zvbc' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvknc.c b/gcc/testsuite/gcc.target/riscv/zvknc.c index 10bd471..826e36a 100644 --- a/gcc/testsuite/gcc.target/riscv/zvknc.c +++ b/gcc/testsuite/gcc.target/riscv/zvknc.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvknc" { target { rv32 } } } */ #ifndef __riscv_zvknc -#error Feature macro not defined +#error Feature macro for `Zvknc' not defined #endif #ifndef __riscv_zvkn -#error Feature macro not defined +#error Feature macro for `Zvkn' not defined #endif #ifndef __riscv_zvkned -#error Feature macro not defined +#error Feature macro for `Zvkned' not defined #endif #ifndef __riscv_zvknhb -#error Feature macro not defined +#error Feature macro for `Zvknhb' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvbc -#error Feature macro not defined +#error Feature macro for `Zvbc' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvkng-1.c b/gcc/testsuite/gcc.target/riscv/zvkng-1.c index f4f3cc8..c142412 100644 --- a/gcc/testsuite/gcc.target/riscv/zvkng-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvkng-1.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvkned_zvknhb_zvbb_zvkt_zvkg" { target { rv32 } } } */ #ifndef __riscv_zvkng -#error Feature macro not defined +#error Feature macro for `Zvkng' not defined #endif #ifndef __riscv_zvkn -#error Feature macro not defined +#error Feature macro for `Zvkn' not defined #endif #ifndef __riscv_zvkned -#error Feature macro not defined +#error Feature macro for `Zvkned' not defined #endif #ifndef __riscv_zvknhb -#error Feature macro not defined +#error Feature macro for `Zvknhb' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvkg -#error Feature macro not defined +#error Feature macro for `Zvkg' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvkng-2.c b/gcc/testsuite/gcc.target/riscv/zvkng-2.c index 2631c1a..0150dca 100644 --- a/gcc/testsuite/gcc.target/riscv/zvkng-2.c +++ b/gcc/testsuite/gcc.target/riscv/zvkng-2.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvkn_zvkg" { target { rv32 } } } */ #ifndef __riscv_zvkng -#error Feature macro not defined +#error Feature macro for `Zvkng' not defined #endif #ifndef __riscv_zvkn -#error Feature macro not defined +#error Feature macro for `Zvkn' not defined #endif #ifndef __riscv_zvkned -#error Feature macro not defined +#error Feature macro for `Zvkned' not defined #endif #ifndef __riscv_zvknhb -#error Feature macro not defined +#error Feature macro for `Zvknhb' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvkg -#error Feature macro not defined +#error Feature macro for `Zvkg' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvkng.c b/gcc/testsuite/gcc.target/riscv/zvkng.c index e6c950e..20cf098 100644 --- a/gcc/testsuite/gcc.target/riscv/zvkng.c +++ b/gcc/testsuite/gcc.target/riscv/zvkng.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvkng" { target { rv32 } } } */ #ifndef __riscv_zvkng -#error Feature macro not defined +#error Feature macro for `Zvkng' not defined #endif #ifndef __riscv_zvkn -#error Feature macro not defined +#error Feature macro for `Zvkn' not defined #endif #ifndef __riscv_zvkned -#error Feature macro not defined +#error Feature macro for `Zvkned' not defined #endif #ifndef __riscv_zvknhb -#error Feature macro not defined +#error Feature macro for `Zvknhb' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvkg -#error Feature macro not defined +#error Feature macro for `Zvkg' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvks-1.c b/gcc/testsuite/gcc.target/riscv/zvks-1.c index 28ad26a..30d1253 100644 --- a/gcc/testsuite/gcc.target/riscv/zvks-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvks-1.c @@ -3,23 +3,23 @@ /* { dg-options "-march=rv32gc_zvksed_zvksh_zvbb_zvkt" { target { rv32 } } } */ #ifndef __riscv_zvks -#error Feature macro not defined +#error Feature macro for `Zvks' not defined #endif #ifndef __riscv_zvksed -#error Feature macro not defined +#error Feature macro for `Zvksed' not defined #endif #ifndef __riscv_zvksh -#error Feature macro not defined +#error Feature macro for `Zvksh' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvks.c b/gcc/testsuite/gcc.target/riscv/zvks.c index a48c918..4af3a2a 100644 --- a/gcc/testsuite/gcc.target/riscv/zvks.c +++ b/gcc/testsuite/gcc.target/riscv/zvks.c @@ -3,23 +3,23 @@ /* { dg-options "-march=rv32gc_zvks" { target { rv32 } } } */ #ifndef __riscv_zvks -#error Feature macro not defined +#error Feature macro for `Zvks' not defined #endif #ifndef __riscv_zvksed -#error Feature macro not defined +#error Feature macro for `Zvksed' not defined #endif #ifndef __riscv_zvksh -#error Feature macro not defined +#error Feature macro for `Zvksh' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvksc-1.c b/gcc/testsuite/gcc.target/riscv/zvksc-1.c index 72d9676..b547ae8 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksc-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvksc-1.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvksed_zvksh_zvbb_zvkt_zvbc" { target { rv32 } } } */ #ifndef __riscv_zvksc -#error Feature macro not defined +#error Feature macro for `Zvksc' not defined #endif #ifndef __riscv_zvks -#error Feature macro not defined +#error Feature macro for `Zvks' not defined #endif #ifndef __riscv_zvksed -#error Feature macro not defined +#error Feature macro for `Zvksed' not defined #endif #ifndef __riscv_zvksh -#error Feature macro not defined +#error Feature macro for `Zvksh' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvbc -#error Feature macro not defined +#error Feature macro for `Zvbc' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvksc-2.c b/gcc/testsuite/gcc.target/riscv/zvksc-2.c index c78b4fe..d0623bb 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksc-2.c +++ b/gcc/testsuite/gcc.target/riscv/zvksc-2.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvks_zvbc" { target { rv32 } } } */ #ifndef __riscv_zvksc -#error Feature macro not defined +#error Feature macro for `Zvksc' not defined #endif #ifndef __riscv_zvks -#error Feature macro not defined +#error Feature macro for `Zvks' not defined #endif #ifndef __riscv_zvksed -#error Feature macro not defined +#error Feature macro for `Zvksed' not defined #endif #ifndef __riscv_zvksh -#error Feature macro not defined +#error Feature macro for `Zvksh' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvbc -#error Feature macro not defined +#error Feature macro for `Zvbc' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvksc.c b/gcc/testsuite/gcc.target/riscv/zvksc.c index fb61561..f712aed 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksc.c +++ b/gcc/testsuite/gcc.target/riscv/zvksc.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvksc" { target { rv32 } } } */ #ifndef __riscv_zvksc -#error Feature macro not defined +#error Feature macro for `Zvksc' not defined #endif #ifndef __riscv_zvks -#error Feature macro not defined +#error Feature macro for `Zvks' not defined #endif #ifndef __riscv_zvksed -#error Feature macro not defined +#error Feature macro for `Zvksed' not defined #endif #ifndef __riscv_zvksh -#error Feature macro not defined +#error Feature macro for `Zvksh' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvbc -#error Feature macro not defined +#error Feature macro for `Zvbc' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvksg-1.c b/gcc/testsuite/gcc.target/riscv/zvksg-1.c index 8cbd033..ed1e4f7 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksg-1.c +++ b/gcc/testsuite/gcc.target/riscv/zvksg-1.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvksed_zvksh_zvbb_zvkt_zvkg" { target { rv32 } } } */ #ifndef __riscv_zvksg -#error Feature macro not defined +#error Feature macro for `Zvksg' not defined #endif #ifndef __riscv_zvks -#error Feature macro not defined +#error Feature macro for `Zvks' not defined #endif #ifndef __riscv_zvksed -#error Feature macro not defined +#error Feature macro for `Zvksed' not defined #endif #ifndef __riscv_zvksh -#error Feature macro not defined +#error Feature macro for `Zvksh' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvkg -#error Feature macro not defined +#error Feature macro for `Zvkg' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvksg-2.c b/gcc/testsuite/gcc.target/riscv/zvksg-2.c index d56c47e..4e6df2d 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksg-2.c +++ b/gcc/testsuite/gcc.target/riscv/zvksg-2.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvks_zvkg" { target { rv32 } } } */ #ifndef __riscv_zvksg -#error Feature macro not defined +#error Feature macro for `Zvksg' not defined #endif #ifndef __riscv_zvks -#error Feature macro not defined +#error Feature macro for `Zvks' not defined #endif #ifndef __riscv_zvksed -#error Feature macro not defined +#error Feature macro for `Zvksed' not defined #endif #ifndef __riscv_zvksh -#error Feature macro not defined +#error Feature macro for `Zvksh' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvkg -#error Feature macro not defined +#error Feature macro for `Zvkg' not defined #endif int diff --git a/gcc/testsuite/gcc.target/riscv/zvksg.c b/gcc/testsuite/gcc.target/riscv/zvksg.c index 44dffb4..e8a33f4 100644 --- a/gcc/testsuite/gcc.target/riscv/zvksg.c +++ b/gcc/testsuite/gcc.target/riscv/zvksg.c @@ -3,31 +3,31 @@ /* { dg-options "-march=rv32gc_zvksg" { target { rv32 } } } */ #ifndef __riscv_zvksg -#error Feature macro not defined +#error Feature macro for `Zvksg' not defined #endif #ifndef __riscv_zvks -#error Feature macro not defined +#error Feature macro for `Zvks' not defined #endif #ifndef __riscv_zvksed -#error Feature macro not defined +#error Feature macro for `Zvksed' not defined #endif #ifndef __riscv_zvksh -#error Feature macro not defined +#error Feature macro for `Zvksh' not defined #endif #ifndef __riscv_zvbb -#error Feature macro not defined +#error Feature macro for `Zvbb' not defined #endif #ifndef __riscv_zvkt -#error Feature macro not defined +#error Feature macro for `Zvkt' not defined #endif #ifndef __riscv_zvkg -#error Feature macro not defined +#error Feature macro for `Zvkg' not defined #endif int -- cgit v1.1