diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2023-04-04 11:20:28 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2023-04-04 11:20:28 +0200 |
| commit | 840354060e23ff28d325af2b8422233ce14f40f8 (patch) | |
| tree | 1a53167a425a961a57753bc3a667695ad5c3326d | |
| parent | 7735b117bcdd28df662dfa536519bffc75ae9dee (diff) | |
| download | gcc-840354060e23ff28d325af2b8422233ce14f40f8.zip gcc-840354060e23ff28d325af2b8422233ce14f40f8.tar.gz gcc-840354060e23ff28d325af2b8422233ce14f40f8.tar.bz2 | |
riscv: Fix bootstrap [PR109384]
The following patch unbreaks riscv bootstrap, where it previously failed
on -Werror=format-diag warning promoted to error.
Ok for trunk?
Or shall it say e.g.
"%<-march=%s%>: %<zfinx%> extension conflicts with %<f>"
?
Or say if the current condition is true, do
const char *ext = "zfinx";
if (subset_list->lookup ("zdinx"))
ext = "zdinx";
else if (subset_list->lookup ("zhinx"))
ext = "zhinx";
else if (subset_list->lookup ("zhinxmin"))
ext = "zhinxmin";
and
"%<-march=%s%>: %qs extension conflicts with %<f>", arch, ext
? Or do similar check for which extension to print against it,
const char *ext = "zfinx";
const char *ext2 = "f";
if (subset_list->lookup ("zdinx"))
{
ext = "zdinx";
if (subset_list->lookup ("d"))
ext2 = "d";
}
else if (subset_list->lookup ("zhinx"))
{
ext = "zhinx";
if (subset_list->lookup ("zfh"))
ext2 = "zfh";
}
else if (subset_list->lookup ("zhinxmin"))
{
ext = "zhinxmin";
if (subset_list->lookup ("zfhmin"))
ext2 = "zfhmin";
}
"%<-march=%s%>: %qs extension conflicts with %qs", arch, ext, ext2
?
2023-04-04 Jakub Jelinek <jakub@redhat.com>
PR target/109384
* common/config/riscv/riscv-common.cc (riscv_subset_list::parse):
Reword diagnostics about zfinx conflict with f, formatting fixes.
* gcc.target/riscv/arch-19.c: Expect a different message about zfinx
vs. f conflict.
| -rw-r--r-- | gcc/common/config/riscv/riscv-common.cc | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/riscv/arch-19.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc index b3c6ec9..2fc0f8b 100644 --- a/gcc/common/config/riscv/riscv-common.cc +++ b/gcc/common/config/riscv/riscv-common.cc @@ -1153,10 +1153,9 @@ riscv_subset_list::parse (const char *arch, location_t loc) subset_list->handle_combine_ext (); - if (subset_list->lookup("zfinx") && subset_list->lookup("f")) - error_at (loc, - "%<-march=%s%>: z*inx is conflict with float extensions", - arch); + if (subset_list->lookup ("zfinx") && subset_list->lookup ("f")) + error_at (loc, "%<-march=%s%>: z*inx conflicts with floating-point " + "extensions", arch); return subset_list; diff --git a/gcc/testsuite/gcc.target/riscv/arch-19.c b/gcc/testsuite/gcc.target/riscv/arch-19.c index 83c6e00..b042e1a 100644 --- a/gcc/testsuite/gcc.target/riscv/arch-19.c +++ b/gcc/testsuite/gcc.target/riscv/arch-19.c @@ -1,4 +1,4 @@ /* { dg-do compile } */ /* { dg-options "-march=rv64if_zfinx -mabi=lp64" } */ int foo() {} -/* { dg-error "'-march=rv64if_zfinx': z\\*inx is conflict with float extensions" "" { target *-*-* } 0 } */ +/* { dg-error "'-march=rv64if_zfinx': z\\*inx conflicts with floating-point extensions" "" { target *-*-* } 0 } */ |