From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Wed, 29 Mar 2017 23:05:40 +0000 (-0700)
Subject: Allow ISA subsets to be disabled
X-Git-Tag: users/ARM/embedded-binutils-2_28-branch-2017q2~104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e101f93030828e5d743ef7f13fb101dc018515a3;p=thirdparty%2Fbinutils-gdb.git

Allow ISA subsets to be disabled

Without this patch, passing "-march=rv64ic -march=rv64i" results in
you getting a "RV64IC" toolchain, which isn't expected.

gas/ChangeLog:

2017-03-30  Palmer Dabbelt  <palmer@dabbelt.com>

       * config/tc-riscv.c (riscv_clear_subsets): New function.
       (riscv_add_subset): Call riscv_clear_subsets and riscv_set_rvc to
       clear RVC when it's been previously set.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 904e0b9cb0f..795c7dc91dc 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-30  Palmer Dabbelt  <palmer@dabbelt.com>
+
+	* config/tc-riscv.c (riscv_clear_subsets): New function.
+	(riscv_add_subset): Call riscv_clear_subsets and riscv_set_rvc to
+	clear RVC when it's been previously set.
+
 2017-03-21  Palmer Dabbbelt  <palmer@dabbelt.com>
 
 	* config/tc-riscv.c (md_show_usage): Remove defuct -m32, -m64,
diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c
index 649c3e8aefa..6490b1a1ae0 100644
--- a/gas/config/tc-riscv.c
+++ b/gas/config/tc-riscv.c
@@ -120,6 +120,18 @@ riscv_subset_supports (const char *feature)
   return FALSE;
 }
 
+static void
+riscv_clear_subsets (void)
+{
+  while (riscv_subsets != NULL)
+    {
+      struct riscv_subset *next = riscv_subsets->next;
+      free (riscv_subsets->name);
+      free (riscv_subsets);
+      riscv_subsets = next;
+    }
+}
+
 static void
 riscv_add_subset (const char *subset)
 {
@@ -139,6 +151,8 @@ riscv_set_arch (const char *s)
   const char *extension = NULL;
   const char *p = s;
 
+  riscv_clear_subsets();
+
   if (strncmp (p, "rv32", 4) == 0)
     {
       xlen = 32;
@@ -1802,6 +1816,7 @@ riscv_after_parse_args (void)
     riscv_set_arch (xlen == 64 ? "rv64g" : "rv32g");
 
   /* Add the RVC extension, regardless of -march, to support .option rvc.  */
+  riscv_set_rvc (FALSE);
   if (riscv_subset_supports ("c"))
     riscv_set_rvc (TRUE);
   else