* [PATCH] RISC-V: Deduplicate #error messages in testsuite
@ 2023-08-14 2:53 Tsukasa OI
2023-08-17 13:53 ` Jeff Law
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Tsukasa OI @ 2023-08-14 2:53 UTC (permalink / raw)
To: Tsukasa OI, Kito Cheng, Palmer Dabbelt, Andrew Waterman, Jim Wilson
Cc: gcc-patches
From: Tsukasa OI <research_trasio@irq.a4lg.com>
"#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(-)
diff --git a/gcc/testsuite/gcc.target/riscv/zvkn-1.c b/gcc/testsuite/gcc.target/riscv/zvkn-1.c
index 83935b068320..84a3b577a496 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 af3db40c8f68..b42c1881b628 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 eca276708954..5c456a6add78 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 e77343a27f35..fbedbf336367 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 10bd471da45c..826e36ad4d9c 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 f4f3cc8e4171..c1424127d433 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 2631c1a1c252..0150dcaabe60 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 e6c950e93237..20cf09890c86 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 28ad26af1c14..30d12539a9fb 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 a48c9186d5e4..4af3a2a96ae9 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 72d9676e68c5..b547ae8efe2d 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 c78b4fe90772..d0623bbf16c3 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 fb61561a2af5..f712aed7b8f9 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 8cbd0331168c..ed1e4f73dfec 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 d56c47e897cc..4e6df2d55f84 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 44dffb413954..e8a33f47ba41 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
base-commit: 4718d5c426af04b93031f89870ce9ba44b82c108
--
2.41.0
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] RISC-V: Deduplicate #error messages in testsuite
2023-08-14 2:53 [PATCH] RISC-V: Deduplicate #error messages in testsuite Tsukasa OI
@ 2023-08-17 13:53 ` Jeff Law
2023-08-18 3:52 ` [PATCH 1/2] RISC-V: Add quotes to #error messages Tsukasa OI
2023-08-18 3:52 ` [PATCH 2/2] RISC-V: Add quotes to #error messages (all) Tsukasa OI
2 siblings, 0 replies; 5+ messages in thread
From: Jeff Law @ 2023-08-17 13:53 UTC (permalink / raw)
To: Tsukasa OI, Kito Cheng, Palmer Dabbelt, Andrew Waterman, Jim Wilson
Cc: gcc-patches
On 8/13/23 20:53, Tsukasa OI via Gcc-patches wrote:
> From: Tsukasa OI<research_trasio@irq.a4lg.com>
>
> "#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.
Pushed to the trunk. Thanks.
jeff
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] RISC-V: Add quotes to #error messages
2023-08-14 2:53 [PATCH] RISC-V: Deduplicate #error messages in testsuite Tsukasa OI
2023-08-17 13:53 ` Jeff Law
@ 2023-08-18 3:52 ` Tsukasa OI
2023-08-21 13:32 ` Jeff Law
2023-08-18 3:52 ` [PATCH 2/2] RISC-V: Add quotes to #error messages (all) Tsukasa OI
2 siblings, 1 reply; 5+ messages in thread
From: Tsukasa OI @ 2023-08-18 3:52 UTC (permalink / raw)
To: Tsukasa OI, Jeff Law, juzhe . zhong @ rivai . ai; +Cc: gcc-patches
From: Tsukasa OI <research_trasio@irq.a4lg.com>
In commit 1aaf3a64e92a ("[PATCH] RISC-V: Deduplicate #error messages in
testsuite"), the author made a mistake to miss the test after adding
quotes around extension names. To avoid future errors and for consistency
with other #error uses in the RISC-V testsuite, this commit quotes #error
messages where necessary to avoid current test case failures.
gcc/testsuite/ChangeLog:
* gcc.target/riscv/zvkn.c: Quote #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(-)
diff --git a/gcc/testsuite/gcc.target/riscv/zvkn-1.c b/gcc/testsuite/gcc.target/riscv/zvkn-1.c
index 84a3b577a496..23b255b47790 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 for `Zvkn' not defined
+#error "Feature macro for `Zvkn' not defined"
#endif
#ifndef __riscv_zvkned
-#error Feature macro for `Zvkned' not defined
+#error "Feature macro for `Zvkned' not defined"
#endif
#ifndef __riscv_zvknhb
-#error Feature macro for `Zvknhb' not defined
+#error "Feature macro for `Zvknhb' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' 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 b42c1881b628..0047ebdede6f 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 for `Zvkn' not defined
+#error "Feature macro for `Zvkn' not defined"
#endif
#ifndef __riscv_zvkned
-#error Feature macro for `Zvkned' not defined
+#error "Feature macro for `Zvkned' not defined"
#endif
#ifndef __riscv_zvknhb
-#error Feature macro for `Zvknhb' not defined
+#error "Feature macro for `Zvknhb' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' 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 5c456a6add78..d8a84c021180 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 for `Zvknc' not defined
+#error "Feature macro for `Zvknc' not defined"
#endif
#ifndef __riscv_zvkn
-#error Feature macro for `Zvkn' not defined
+#error "Feature macro for `Zvkn' not defined"
#endif
#ifndef __riscv_zvkned
-#error Feature macro for `Zvkned' not defined
+#error "Feature macro for `Zvkned' not defined"
#endif
#ifndef __riscv_zvknhb
-#error Feature macro for `Zvknhb' not defined
+#error "Feature macro for `Zvknhb' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvbc
-#error Feature macro for `Zvbc' 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 fbedbf336367..36cc6335d135 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 for `Zvknc' not defined
+#error "Feature macro for `Zvknc' not defined"
#endif
#ifndef __riscv_zvkn
-#error Feature macro for `Zvkn' not defined
+#error "Feature macro for `Zvkn' not defined"
#endif
#ifndef __riscv_zvkned
-#error Feature macro for `Zvkned' not defined
+#error "Feature macro for `Zvkned' not defined"
#endif
#ifndef __riscv_zvknhb
-#error Feature macro for `Zvknhb' not defined
+#error "Feature macro for `Zvknhb' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvbc
-#error Feature macro for `Zvbc' 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 826e36ad4d9c..a177f17fbd7a 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 for `Zvknc' not defined
+#error "Feature macro for `Zvknc' not defined"
#endif
#ifndef __riscv_zvkn
-#error Feature macro for `Zvkn' not defined
+#error "Feature macro for `Zvkn' not defined"
#endif
#ifndef __riscv_zvkned
-#error Feature macro for `Zvkned' not defined
+#error "Feature macro for `Zvkned' not defined"
#endif
#ifndef __riscv_zvknhb
-#error Feature macro for `Zvknhb' not defined
+#error "Feature macro for `Zvknhb' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvbc
-#error Feature macro for `Zvbc' 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 c1424127d433..d996b42af00f 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 for `Zvkng' not defined
+#error "Feature macro for `Zvkng' not defined"
#endif
#ifndef __riscv_zvkn
-#error Feature macro for `Zvkn' not defined
+#error "Feature macro for `Zvkn' not defined"
#endif
#ifndef __riscv_zvkned
-#error Feature macro for `Zvkned' not defined
+#error "Feature macro for `Zvkned' not defined"
#endif
#ifndef __riscv_zvknhb
-#error Feature macro for `Zvknhb' not defined
+#error "Feature macro for `Zvknhb' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvkg
-#error Feature macro for `Zvkg' 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 0150dcaabe60..00199992d5c6 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 for `Zvkng' not defined
+#error "Feature macro for `Zvkng' not defined"
#endif
#ifndef __riscv_zvkn
-#error Feature macro for `Zvkn' not defined
+#error "Feature macro for `Zvkn' not defined"
#endif
#ifndef __riscv_zvkned
-#error Feature macro for `Zvkned' not defined
+#error "Feature macro for `Zvkned' not defined"
#endif
#ifndef __riscv_zvknhb
-#error Feature macro for `Zvknhb' not defined
+#error "Feature macro for `Zvknhb' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvkg
-#error Feature macro for `Zvkg' 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 20cf09890c86..4605faf3c6cc 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 for `Zvkng' not defined
+#error "Feature macro for `Zvkng' not defined"
#endif
#ifndef __riscv_zvkn
-#error Feature macro for `Zvkn' not defined
+#error "Feature macro for `Zvkn' not defined"
#endif
#ifndef __riscv_zvkned
-#error Feature macro for `Zvkned' not defined
+#error "Feature macro for `Zvkned' not defined"
#endif
#ifndef __riscv_zvknhb
-#error Feature macro for `Zvknhb' not defined
+#error "Feature macro for `Zvknhb' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvkg
-#error Feature macro for `Zvkg' 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 30d12539a9fb..a576cdb0476f 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 for `Zvks' not defined
+#error "Feature macro for `Zvks' not defined"
#endif
#ifndef __riscv_zvksed
-#error Feature macro for `Zvksed' not defined
+#error "Feature macro for `Zvksed' not defined"
#endif
#ifndef __riscv_zvksh
-#error Feature macro for `Zvksh' not defined
+#error "Feature macro for `Zvksh' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' 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 4af3a2a96ae9..d31b2610c202 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 for `Zvks' not defined
+#error "Feature macro for `Zvks' not defined"
#endif
#ifndef __riscv_zvksed
-#error Feature macro for `Zvksed' not defined
+#error "Feature macro for `Zvksed' not defined"
#endif
#ifndef __riscv_zvksh
-#error Feature macro for `Zvksh' not defined
+#error "Feature macro for `Zvksh' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' 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 b547ae8efe2d..3b76e6cea706 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 for `Zvksc' not defined
+#error "Feature macro for `Zvksc' not defined"
#endif
#ifndef __riscv_zvks
-#error Feature macro for `Zvks' not defined
+#error "Feature macro for `Zvks' not defined"
#endif
#ifndef __riscv_zvksed
-#error Feature macro for `Zvksed' not defined
+#error "Feature macro for `Zvksed' not defined"
#endif
#ifndef __riscv_zvksh
-#error Feature macro for `Zvksh' not defined
+#error "Feature macro for `Zvksh' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvbc
-#error Feature macro for `Zvbc' 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 d0623bbf16c3..b95e34ec6e46 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 for `Zvksc' not defined
+#error "Feature macro for `Zvksc' not defined"
#endif
#ifndef __riscv_zvks
-#error Feature macro for `Zvks' not defined
+#error "Feature macro for `Zvks' not defined"
#endif
#ifndef __riscv_zvksed
-#error Feature macro for `Zvksed' not defined
+#error "Feature macro for `Zvksed' not defined"
#endif
#ifndef __riscv_zvksh
-#error Feature macro for `Zvksh' not defined
+#error "Feature macro for `Zvksh' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvbc
-#error Feature macro for `Zvbc' 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 f712aed7b8f9..983f1aa89ec9 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 for `Zvksc' not defined
+#error "Feature macro for `Zvksc' not defined"
#endif
#ifndef __riscv_zvks
-#error Feature macro for `Zvks' not defined
+#error "Feature macro for `Zvks' not defined"
#endif
#ifndef __riscv_zvksed
-#error Feature macro for `Zvksed' not defined
+#error "Feature macro for `Zvksed' not defined"
#endif
#ifndef __riscv_zvksh
-#error Feature macro for `Zvksh' not defined
+#error "Feature macro for `Zvksh' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvbc
-#error Feature macro for `Zvbc' 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 ed1e4f73dfec..e6b30552e4ca 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 for `Zvksg' not defined
+#error "Feature macro for `Zvksg' not defined"
#endif
#ifndef __riscv_zvks
-#error Feature macro for `Zvks' not defined
+#error "Feature macro for `Zvks' not defined"
#endif
#ifndef __riscv_zvksed
-#error Feature macro for `Zvksed' not defined
+#error "Feature macro for `Zvksed' not defined"
#endif
#ifndef __riscv_zvksh
-#error Feature macro for `Zvksh' not defined
+#error "Feature macro for `Zvksh' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvkg
-#error Feature macro for `Zvkg' 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 4e6df2d55f84..2475e8bba1a3 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 for `Zvksg' not defined
+#error "Feature macro for `Zvksg' not defined"
#endif
#ifndef __riscv_zvks
-#error Feature macro for `Zvks' not defined
+#error "Feature macro for `Zvks' not defined"
#endif
#ifndef __riscv_zvksed
-#error Feature macro for `Zvksed' not defined
+#error "Feature macro for `Zvksed' not defined"
#endif
#ifndef __riscv_zvksh
-#error Feature macro for `Zvksh' not defined
+#error "Feature macro for `Zvksh' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvkg
-#error Feature macro for `Zvkg' 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 e8a33f47ba41..4db9b5d6b9b1 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 for `Zvksg' not defined
+#error "Feature macro for `Zvksg' not defined"
#endif
#ifndef __riscv_zvks
-#error Feature macro for `Zvks' not defined
+#error "Feature macro for `Zvks' not defined"
#endif
#ifndef __riscv_zvksed
-#error Feature macro for `Zvksed' not defined
+#error "Feature macro for `Zvksed' not defined"
#endif
#ifndef __riscv_zvksh
-#error Feature macro for `Zvksh' not defined
+#error "Feature macro for `Zvksh' not defined"
#endif
#ifndef __riscv_zvbb
-#error Feature macro for `Zvbb' not defined
+#error "Feature macro for `Zvbb' not defined"
#endif
#ifndef __riscv_zvkt
-#error Feature macro for `Zvkt' not defined
+#error "Feature macro for `Zvkt' not defined"
#endif
#ifndef __riscv_zvkg
-#error Feature macro for `Zvkg' not defined
+#error "Feature macro for `Zvkg' not defined"
#endif
int
base-commit: 3709ca091bec43ee3203b96146585652c5d84728
--
2.41.0
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] RISC-V: Add quotes to #error messages
2023-08-18 3:52 ` [PATCH 1/2] RISC-V: Add quotes to #error messages Tsukasa OI
@ 2023-08-21 13:32 ` Jeff Law
0 siblings, 0 replies; 5+ messages in thread
From: Jeff Law @ 2023-08-21 13:32 UTC (permalink / raw)
To: Tsukasa OI, juzhe . zhong @ rivai . ai; +Cc: gcc-patches
On 8/17/23 21:52, Tsukasa OI wrote:
> From: Tsukasa OI <research_trasio@irq.a4lg.com>
>
> In commit 1aaf3a64e92a ("[PATCH] RISC-V: Deduplicate #error messages in
> testsuite"), the author made a mistake to miss the test after adding
> quotes around extension names. To avoid future errors and for consistency
> with other #error uses in the RISC-V testsuite, this commit quotes #error
> messages where necessary to avoid current test case failures.
>
> gcc/testsuite/ChangeLog:
>
> * gcc.target/riscv/zvkn.c: Quote #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.
Thanks. I've pushed both patches in this series to the trunk.
jeff
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] RISC-V: Add quotes to #error messages (all)
2023-08-14 2:53 [PATCH] RISC-V: Deduplicate #error messages in testsuite Tsukasa OI
2023-08-17 13:53 ` Jeff Law
2023-08-18 3:52 ` [PATCH 1/2] RISC-V: Add quotes to #error messages Tsukasa OI
@ 2023-08-18 3:52 ` Tsukasa OI
2 siblings, 0 replies; 5+ messages in thread
From: Tsukasa OI @ 2023-08-18 3:52 UTC (permalink / raw)
To: Tsukasa OI, Jeff Law, juzhe . zhong @ rivai . ai; +Cc: gcc-patches
From: Tsukasa OI <research_trasio@irq.a4lg.com>
In commit 1aaf3a64e92a ("[PATCH] RISC-V: Deduplicate #error messages in
testsuite"), the author made a mistake to miss the test after adding
quotes around extension names. To avoid future errors and for consistency
with other #error uses in the RISC-V testsuite, this commit quotes all
unquoted #error messages.
gcc/testsuite/ChangeLog:
* gcc.target/riscv/xtheadba.c: Quote unquoted #error message.
* gcc.target/riscv/xtheadbb.c: Ditto.
* gcc.target/riscv/xtheadbs.c: Ditto.
* gcc.target/riscv/xtheadcmo.c: Ditto.
* gcc.target/riscv/xtheadcondmov.c: Ditto.
* gcc.target/riscv/xtheadfmemidx.c: Ditto.
* gcc.target/riscv/xtheadfmv.c: Ditto.
* gcc.target/riscv/xtheadint.c: Ditto.
* gcc.target/riscv/xtheadmac.c: Ditto.
* gcc.target/riscv/xtheadmemidx.c: Ditto.
* gcc.target/riscv/xtheadmempair.c: Ditto.
* gcc.target/riscv/xtheadsync.c: Ditto.
* gcc.target/riscv/zawrs.c: Ditto.
* gcc.target/riscv/zvbb.c: Ditto.
* gcc.target/riscv/zvbc.c: Ditto.
* gcc.target/riscv/zvkg.c: Ditto.
* gcc.target/riscv/zvkned.c: Ditto.
* gcc.target/riscv/zvknha.c: Ditto.
* gcc.target/riscv/zvknhb.c: Ditto.
* gcc.target/riscv/zvksed.c: Ditto.
* gcc.target/riscv/zvksh.c: Ditto.
* gcc.target/riscv/zvkt.c: Ditto.
---
gcc/testsuite/gcc.target/riscv/xtheadba.c | 2 +-
gcc/testsuite/gcc.target/riscv/xtheadbb.c | 2 +-
gcc/testsuite/gcc.target/riscv/xtheadbs.c | 2 +-
gcc/testsuite/gcc.target/riscv/xtheadcmo.c | 2 +-
gcc/testsuite/gcc.target/riscv/xtheadcondmov.c | 2 +-
gcc/testsuite/gcc.target/riscv/xtheadfmemidx.c | 2 +-
gcc/testsuite/gcc.target/riscv/xtheadfmv.c | 2 +-
gcc/testsuite/gcc.target/riscv/xtheadint.c | 2 +-
gcc/testsuite/gcc.target/riscv/xtheadmac.c | 2 +-
gcc/testsuite/gcc.target/riscv/xtheadmemidx.c | 2 +-
gcc/testsuite/gcc.target/riscv/xtheadmempair.c | 2 +-
gcc/testsuite/gcc.target/riscv/xtheadsync.c | 2 +-
gcc/testsuite/gcc.target/riscv/zawrs.c | 2 +-
gcc/testsuite/gcc.target/riscv/zvbb.c | 2 +-
gcc/testsuite/gcc.target/riscv/zvbc.c | 2 +-
gcc/testsuite/gcc.target/riscv/zvkg.c | 2 +-
gcc/testsuite/gcc.target/riscv/zvkned.c | 2 +-
gcc/testsuite/gcc.target/riscv/zvknha.c | 2 +-
gcc/testsuite/gcc.target/riscv/zvknhb.c | 2 +-
gcc/testsuite/gcc.target/riscv/zvksed.c | 2 +-
gcc/testsuite/gcc.target/riscv/zvksh.c | 2 +-
gcc/testsuite/gcc.target/riscv/zvkt.c | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadba.c b/gcc/testsuite/gcc.target/riscv/xtheadba.c
index 14cdb1ffe2eb..64ad56011884 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadba.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadba.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadba" { target { rv64 } } } */
#ifndef __riscv_xtheadba
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbb.c b/gcc/testsuite/gcc.target/riscv/xtheadbb.c
index 66988abf2213..803111b03fb2 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbb.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbb.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadbb" { target { rv64 } } } */
#ifndef __riscv_xtheadbb
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadbs.c b/gcc/testsuite/gcc.target/riscv/xtheadbs.c
index 808d7378a7be..ad9fba525971 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadbs.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadbs.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadbs" { target { rv64 } } } */
#ifndef __riscv_xtheadbs
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcmo.c b/gcc/testsuite/gcc.target/riscv/xtheadcmo.c
index eab8fef421cd..fc13754fe521 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcmo.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcmo.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadcmo" { target { rv64 } } } */
#ifndef __riscv_xtheadcmo
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadcondmov.c b/gcc/testsuite/gcc.target/riscv/xtheadcondmov.c
index a239c3f9f46e..ad8a777ab2cc 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadcondmov.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadcondmov.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadcondmov" { target { rv64 } } } */
#ifndef __riscv_xtheadcondmov
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx.c b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx.c
index e450c5e5c5ac..1617d9475942 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadfmemidx" { target { rv64 } } } */
#ifndef __riscv_xtheadfmemidx
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmv.c b/gcc/testsuite/gcc.target/riscv/xtheadfmv.c
index e97e8f461f6e..f0558d95cb94 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadfmv.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadfmv.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadfmv" { target { rv64 } } } */
#ifndef __riscv_xtheadfmv
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadint.c b/gcc/testsuite/gcc.target/riscv/xtheadint.c
index ee6989a380ec..c9f45d577423 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadint.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadint.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadint" { target { rv64 } } } */
#ifndef __riscv_xtheadint
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmac.c b/gcc/testsuite/gcc.target/riscv/xtheadmac.c
index 7c635407b310..aeb3cb034417 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmac.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmac.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadmac" { target { rv64 } } } */
#ifndef __riscv_xtheadmac
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmemidx.c b/gcc/testsuite/gcc.target/riscv/xtheadmemidx.c
index 076eab00f54c..a4716acc0409 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmemidx.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmemidx.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadmemidx" { target { rv64 } } } */
#ifndef __riscv_xtheadmemidx
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadmempair.c b/gcc/testsuite/gcc.target/riscv/xtheadmempair.c
index 5135d2175dc6..de88d63ed5b3 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadmempair.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadmempair.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadmempair" { target { rv64 } } } */
#ifndef __riscv_xtheadmempair
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/xtheadsync.c b/gcc/testsuite/gcc.target/riscv/xtheadsync.c
index 835d60c96e9d..ddda51545f15 100644
--- a/gcc/testsuite/gcc.target/riscv/xtheadsync.c
+++ b/gcc/testsuite/gcc.target/riscv/xtheadsync.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv64gc_xtheadsync" { target { rv64 } } } */
#ifndef __riscv_xtheadsync
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/zawrs.c b/gcc/testsuite/gcc.target/riscv/zawrs.c
index 0b7e26623439..d61a17b7a487 100644
--- a/gcc/testsuite/gcc.target/riscv/zawrs.c
+++ b/gcc/testsuite/gcc.target/riscv/zawrs.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv32gc_zawrs" { target { rv32 } } } */
#ifndef __riscv_zawrs
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/zvbb.c b/gcc/testsuite/gcc.target/riscv/zvbb.c
index b592f56f6cfb..0b78fe4dc622 100644
--- a/gcc/testsuite/gcc.target/riscv/zvbb.c
+++ b/gcc/testsuite/gcc.target/riscv/zvbb.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv32gc_zvbb" { target { rv32 } } } */
#ifndef __riscv_zvbb
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/zvbc.c b/gcc/testsuite/gcc.target/riscv/zvbc.c
index 37239fa91b33..2a00c965f322 100644
--- a/gcc/testsuite/gcc.target/riscv/zvbc.c
+++ b/gcc/testsuite/gcc.target/riscv/zvbc.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv32gc_zvbc" { target { rv32 } } } */
#ifndef __riscv_zvbc
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/zvkg.c b/gcc/testsuite/gcc.target/riscv/zvkg.c
index 1e2a05aa1d87..fe0a841e745d 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkg.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkg.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv32gc_zvkg" { target { rv32 } } } */
#ifndef __riscv_zvkg
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/zvkned.c b/gcc/testsuite/gcc.target/riscv/zvkned.c
index fcdc4b45761e..8f9f2532f3d7 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkned.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkned.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv32gc_zvkned" { target { rv32 } } } */
#ifndef __riscv_zvkned
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/zvknha.c b/gcc/testsuite/gcc.target/riscv/zvknha.c
index 1275f9d11c18..70242a8cb049 100644
--- a/gcc/testsuite/gcc.target/riscv/zvknha.c
+++ b/gcc/testsuite/gcc.target/riscv/zvknha.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv32gc_zvknha" { target { rv32 } } } */
#ifndef __riscv_zvknha
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/zvknhb.c b/gcc/testsuite/gcc.target/riscv/zvknhb.c
index 669ff0191496..af89d7b1b7d1 100644
--- a/gcc/testsuite/gcc.target/riscv/zvknhb.c
+++ b/gcc/testsuite/gcc.target/riscv/zvknhb.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv32gc_zvknhb" { target { rv32 } } } */
#ifndef __riscv_zvknhb
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/zvksed.c b/gcc/testsuite/gcc.target/riscv/zvksed.c
index 439b546bb8a4..2ac58f848199 100644
--- a/gcc/testsuite/gcc.target/riscv/zvksed.c
+++ b/gcc/testsuite/gcc.target/riscv/zvksed.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv32gc_zvksed" { target { rv32 } } } */
#ifndef __riscv_zvksed
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/zvksh.c b/gcc/testsuite/gcc.target/riscv/zvksh.c
index 5359ca50281b..f7190a42cc29 100644
--- a/gcc/testsuite/gcc.target/riscv/zvksh.c
+++ b/gcc/testsuite/gcc.target/riscv/zvksh.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv32gc_zvksh" { target { rv32 } } } */
#ifndef __riscv_zvksh
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
diff --git a/gcc/testsuite/gcc.target/riscv/zvkt.c b/gcc/testsuite/gcc.target/riscv/zvkt.c
index 49822b75738d..8871a4aca4c0 100644
--- a/gcc/testsuite/gcc.target/riscv/zvkt.c
+++ b/gcc/testsuite/gcc.target/riscv/zvkt.c
@@ -3,7 +3,7 @@
/* { dg-options "-march=rv32gc_zvkt" { target { rv32 } } } */
#ifndef __riscv_zvkt
-#error Feature macro not defined
+#error "Feature macro not defined"
#endif
int
--
2.41.0
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-08-21 13:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-14 2:53 [PATCH] RISC-V: Deduplicate #error messages in testsuite Tsukasa OI
2023-08-17 13:53 ` Jeff Law
2023-08-18 3:52 ` [PATCH 1/2] RISC-V: Add quotes to #error messages Tsukasa OI
2023-08-21 13:32 ` Jeff Law
2023-08-18 3:52 ` [PATCH 2/2] RISC-V: Add quotes to #error messages (all) Tsukasa OI
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).