From: H.J. Lu <hongjiu.lu@intel.com>
Date: Wed, 11 Apr 2012 17:34:08 +0000 (+0000)
Subject: Check [SUB]SUBTARGET_OVERRIDE_OPTIONS after TARGET_64BIT
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ed6205b7e707654eb178203b76b2990c8776028b;p=gcc.git

Check [SUB]SUBTARGET_OVERRIDE_OPTIONS after TARGET_64BIT

	* config/i386/i386.c (ix86_option_override_internal): Check
	SUBTARGET_OVERRIDE_OPTIONS and SUBSUBTARGET_OVERRIDE_OPTIONS
	after TARGET_64BIT is updated.

From-SVN: r186339
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a34804325fd..802c41d1e38 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/i386/i386.c (ix86_option_override_internal): Check
+	SUBTARGET_OVERRIDE_OPTIONS and SUBSUBTARGET_OVERRIDE_OPTIONS
+	after TARGET_64BIT is updated.
+
 2012-04-11  Oleg Endo  <olegendo@gcc.gnu.org>
 
 	* config/sh/sh.h: Remove old secondary reload code.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 8974ddc9a02..af4af7ce134 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -3113,14 +3113,6 @@ ix86_option_override_internal (bool main_args_p)
       sw = "attribute";
     }
 
-#ifdef SUBTARGET_OVERRIDE_OPTIONS
-  SUBTARGET_OVERRIDE_OPTIONS;
-#endif
-
-#ifdef SUBSUBTARGET_OVERRIDE_OPTIONS
-  SUBSUBTARGET_OVERRIDE_OPTIONS;
-#endif
-
   /* Turn off both OPTION_MASK_ABI_64 and OPTION_MASK_ABI_X32 if
      TARGET_64BIT_DEFAULT is true and TARGET_64BIT is false.  */
   if (TARGET_64BIT_DEFAULT && !TARGET_64BIT)
@@ -3161,6 +3153,14 @@ ix86_option_override_internal (bool main_args_p)
       ix86_isa_flags &= ~OPTION_MASK_ABI_X32;
     }
 
+#ifdef SUBTARGET_OVERRIDE_OPTIONS
+  SUBTARGET_OVERRIDE_OPTIONS;
+#endif
+
+#ifdef SUBSUBTARGET_OVERRIDE_OPTIONS
+  SUBSUBTARGET_OVERRIDE_OPTIONS;
+#endif
+
   /* -fPIC is the default for x86_64.  */
   if (TARGET_MACHO && TARGET_64BIT)
     flag_pic = 2;