From: Maxim Blinov <maxim.blinov@embecosm.com>
Date: Wed, 31 Jul 2019 21:36:41 +0000 (+0000)
Subject: RISC-V: Raise error on unexpected ISA string at end.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=285cf766c1309edd7e61bf0dc45754af987d1b26;p=gcc.git

RISC-V: Raise error on unexpected ISA string at end.

	2019-07-31  Maxim Blinov  <maxim.blinov@embecosm.com>
	gcc/
	* common/config/riscv/riscv-common.c: Check -march string ends
	with null.
	gcc/testsuite/
	* gcc.target/riscv/attribute-10.c: New test.

From-SVN: r273951
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7d8339c9acf..ec13629349f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-31  Maxim Blinov  <maxim.blinov@embecosm.com>
+
+	* common/config/riscv/riscv-common.c: Check -march string ends
+	with null.
+
 2019-07-31  Alexander Monakov  <amonakov@ispras.ru>
 
 	* ipa-devirt.c (type_warning_cmp): Make static.
diff --git a/gcc/common/config/riscv/riscv-common.c b/gcc/common/config/riscv/riscv-common.c
index eeb75717db0..a16d6c5b448 100644
--- a/gcc/common/config/riscv/riscv-common.c
+++ b/gcc/common/config/riscv/riscv-common.c
@@ -513,6 +513,13 @@ riscv_subset_list::parse (const char *arch, location_t loc)
   if (p == NULL)
     goto fail;
 
+  if (*p != '\0')
+    {
+      error_at (loc, "%<-march=%s%>: unexpected ISA string at end: %qs",
+               arch, p);
+      goto fail;
+    }
+
   return subset_list;
 
 fail:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f490292d534..99f6b22f86c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-31  Maxim Blinov  <maxim.blinov@embecosm.com>
+
+	* gcc.target/riscv/attribute-10.c: New test.
+
 2019-07-31  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/91280
diff --git a/gcc/testsuite/gcc.target/riscv/attribute-10.c b/gcc/testsuite/gcc.target/riscv/attribute-10.c
new file mode 100644
index 00000000000..dd817879a67
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/attribute-10.c
@@ -0,0 +1,6 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -march=rv32im_s_sx_unexpectedstring -mabi=ilp32" } */
+int foo()
+{
+}
+/* { dg-error "unexpected ISA string at end:" "" { target { "riscv*-*-*" } } 0 } */