From: Robert Suchanek <robert.suchanek@imgtec.com>
Date: Mon, 18 May 2015 14:32:19 +0000 (+0000)
Subject: Fix ICE when both micromips and nomicromips attributes are used.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb05f2e4ddc9ae051cf205eb7eaa0e0e63cecf6c;p=gcc.git

Fix ICE when both micromips and nomicromips attributes are used.

gcc/ChangeLog:

2015-05-18  Robert Suchanek  <robert.suchanek@imgtec.com>

	* config/mips/mips.c (micromips_globals): New variable.
	(mips_set_compression_mode): Save and reinitialize target-dependent
	state for microMIPS.

gcc/testsuite/ChangeLog:

2015-05-18  Robert Suchanek  <robert.suchanek@imgtec.com>

	* gcc.target/mips/umips-attr.c: New test.

From-SVN: r223294
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bebe44c5257..27b4d266d20 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-18  Robert Suchanek  <robert.suchanek@imgtec.com>
+
+	* config/mips/mips.c (micromips_globals): New variable.
+	(mips_set_compression_mode): Save and reinitialize target-dependent
+	state for microMIPS.
+
 2015-05-18  Martin Liska  <mliska@suse.cz>
 
 	* dbgcnt.def: Add new counter.
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 8c66cbd89c8..e619baadae8 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -676,6 +676,9 @@ const char *mips_hi_relocs[NUM_SYMBOL_TYPES];
 /* Target state for MIPS16.  */
 struct target_globals *mips16_globals;
 
+/* Target state for MICROMIPS.  */
+struct target_globals *micromips_globals;
+
 /* Cached value of can_issue_more. This is cached in mips_variable_issue hook
    and returned from mips_sched_reorder2.  */
 static int cached_can_issue_more;
@@ -17162,6 +17165,13 @@ mips_set_compression_mode (unsigned int compression_mode)
       else
 	restore_target_globals (mips16_globals);
     }
+  else if (compression_mode & MASK_MICROMIPS)
+    {
+      if (!micromips_globals)
+	micromips_globals = save_target_globals_default_opts ();
+      else
+	restore_target_globals (micromips_globals);
+    }
   else
     restore_target_globals (&default_target_globals);
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 985478e6b44..5206d883a15 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-18  Robert Suchanek  <robert.suchanek@imgtec.com>
+
+	* gcc.target/mips/umips-attr.c: New test.
+
 2015-05-17  Uros Bizjak  <ubizjak@gmail.com>
 
 	* gcc.dg/20150120-1.c (dg-final): Cleanup original tree dump.
diff --git a/gcc/testsuite/gcc.target/mips/umips-attr.c b/gcc/testsuite/gcc.target/mips/umips-attr.c
new file mode 100644
index 00000000000..f8c4517c560
--- /dev/null
+++ b/gcc/testsuite/gcc.target/mips/umips-attr.c
@@ -0,0 +1,13 @@
+/* { dg-options "(-mmicromips)" } */
+
+int MICROMIPS
+foo (int a)
+{
+  return a;
+}
+
+int NOMICROMIPS
+foo2 (int a)
+{
+  return a;
+}