i386.c (ix86_abi): Move initialization to ...

2009-04-02  H.J. Lu  <hongjiu.lu@intel.com>

	* config/i386/i386.c (ix86_abi): Move initialization to ...
	(override_options): Here.

From-SVN: r145449

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7664e11a2ae4788afe63e4fde1071b452a5cb495..499d3d6bf6f4fc8ef68f4c2e58e67e112b36230b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * config/i386/i386.c (ix86_abi): Move initialization to ...
+       (override_options): Here.
+
 2009-04-02  Christian Bruel  <christian.bruel@st.com>
 
        * config/sh/sh.c (sh_dwarf_register_span): New function.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 8c89823b535afbfbc0a00a73eeae0e50decf558f..154c32414f3b99cebb3169672e2ff6e291379d30 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -1744,7 +1744,7 @@ static unsigned int ix86_default_incoming_stack_boundary;
 unsigned int ix86_incoming_stack_boundary;
 
 /* The abi used by target.  */
-enum calling_abi ix86_abi = DEFAULT_ABI;
+enum calling_abi ix86_abi;
 
 /* Values 1-5: see jump.c */
 int ix86_branch_cost;
@@ -2732,6 +2732,8 @@ override_options (bool main_args_p)
        error ("unknown ABI (%s) for %sabi=%s %s",
               ix86_abi_string, prefix, suffix, sw);
     }
+  else
+    ix86_abi = DEFAULT_ABI;
 
   if (ix86_cmodel_string != 0)
     {