re PR target/26877 (configure switches --with-arch and --with-tune are broken on...

2006-07-20  Eric Christopher  <echristo@apple.com>

        PR target/26877
        * config/i386/i386.h (OPTION_DEFAULT_SPECS): Reorder.

From-SVN: r115609

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb5eae6b281d80b70b4d54b1f0da67ae174b8805..afdf428c37bc144f3e93d10868c166c141f9c9fd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-20  Eric Christopher  <echristo@apple.com>
+
+       PR target/26877
+       * config/i386/i386.h (OPTION_DEFAULT_SPECS): Reorder.
+
 2006-07-19  Eric Christopher  <echristo@apple.com>
 
        * config/t-slibgcc-darwin (stmp-lipo): Remove.

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index df1ba2472b676136cecbcec7e7e5e6ce6daffa71..10b446b511881f9161d9625c4a3eb903e60108b6 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -281,11 +281,13 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
   { "local_cpu_detect", host_detect_local_cpu },
 #endif
 
-/* Support for configure-time defaults of some command line options.  */
+/* Support for configure-time defaults of some command line options.
+   The order here is important so that -march doesn't squash the
+   tune or cpu values.  */
 #define OPTION_DEFAULT_SPECS \
-  {"arch", "%{!march=*:-march=%(VALUE)}"}, \
   {"tune", "%{!mtune=*:%{!mcpu=*:%{!march=*:-mtune=%(VALUE)}}}" }, \
-  {"cpu", "%{!mtune=*:%{!mcpu=*:%{!march=*:-mtune=%(VALUE)}}}" }
+  {"cpu", "%{!mtune=*:%{!mcpu=*:%{!march=*:-mtune=%(VALUE)}}}" }, \
+  {"arch", "%{!march=*:-march=%(VALUE)}"}
 
 /* Specs for the compiler proper */
 
@@ -2144,7 +2146,7 @@ enum ix86_entity
   MAX_386_ENTITIES
 };
 
-enum ix86_stack_slot 
+enum ix86_stack_slot
 {
   SLOT_TEMP = 0,
   SLOT_CW_STORED,