From patchwork Mon Jul 12 19:09:39 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [committed] Make -mflip-mips16 imply -minterlink-mips16
Date: Mon, 12 Jul 2010 09:09:39 -0000
From: Richard Sandiford <rdsandiford@googlemail.com>
X-Patchwork-Id: 58658
Message-Id: <87zkxwa558.fsf@firetop.home>
To: gcc-patches@gcc.gnu.org

As per the subject.  I came across this as a failure in the c-torture
builtins tests while testing the target_reinit stuff.  The bug caused
non-MIPS16 code compiled with -mflip-mips16 to make a direct jump to
a MIPS16 routine.

Tested on mipsisa64-elfoabi applied.

Richard


gcc/
	* config/mips/mips.c (mips_override_options): Make -mflip-mips16
	imply -minterlink-mips16.


Index: gcc/config/mips/mips.c
===================================================================
--- gcc/config/mips/mips.c	2010-07-08 19:27:24.000000000 +0100
+++ gcc/config/mips/mips.c	2010-07-08 19:27:25.000000000 +0100
@@ -15446,6 +15446,9 @@ mips_override_options (void)
       target_flags_explicit |= MASK_SOFT_FLOAT_ABI;
     }
 
+  if (TARGET_FLIP_MIPS16)
+    TARGET_INTERLINK_MIPS16 = 1;
+
   /* Set the small data limit.  */
   mips_small_data_threshold = (g_switch_set
 			       ? g_switch_value