diff --git a/gcc/testsuite/gcc.target/riscv/xtheadba.c b/gcc/testsuite/gcc.target/riscv/xtheadba.c
index 14cdb1ffe2e..64ad5601188 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 66988abf221..803111b03fb 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 808d7378a7b..ad9fba52597 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 eab8fef421c..fc13754fe52 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 a239c3f9f46..ad8a777ab2c 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 e450c5e5c5a..1617d947594 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 e97e8f461f6..f0558d95cb9 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 ee6989a380e..c9f45d57742 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 7c635407b31..aeb3cb03441 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 076eab00f54..a4716acc040 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 5135d2175dc..de88d63ed5b 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 835d60c96e9..ddda51545f1 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 0b7e2662343..d61a17b7a48 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 b592f56f6cf..0b78fe4dc62 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 37239fa91b3..2a00c965f32 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 1e2a05aa1d8..fe0a841e745 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 fcdc4b45761..8f9f2532f3d 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 1275f9d11c1..70242a8cb04 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 669ff019149..af89d7b1b7d 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 439b546bb8a..2ac58f84819 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 5359ca50281..f7190a42cc2 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 49822b75738..8871a4aca4c 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