Fix sol2 sparc -mv8 regression.

	* config/sparc/sparc.c (sparc_option_override): Remove -mv8plus
	cpu adjustment.
	* config/sparc/linux64.h (CC1_SPEC): When defaulting to 64-bit,
	append -mcpu=v9 when -mv8plus is given.

From-SVN: r180362

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 18424021f505927b1c7d94e754e413debf4931c5..54e1a4f5f75c18454953d02b389f5e3002cc837d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2011-10-23  David S. Miller  <davem@davemloft.net>
 
+       * config/sparc/sparc.c (sparc_option_override): Remove -mv8plus
+       cpu adjustment.
+       * config/sparc/linux64.h (CC1_SPEC): When defaulting to 64-bit,
+       append -mcpu=v9 when -mv8plus is given.
+
        * config/sparc/sparc.h (SECONDARY_MEMORY_NEEDED): We can move
        between float and non-float regs when VIS3.
        * config/sparc/sparc.c (eligible_for_restore_insn): We can't

diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
index a51a2f0e1c761c12627f8e8c54d9c7d4adb052f0..7604fa054d029f886ec8bb2a2aa5396e15fd4f89 100644 (file)
--- a/gcc/config/sparc/linux64.h
+++ b/gcc/config/sparc/linux64.h
@@ -166,6 +166,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
 %{m32:%{m64:%emay not use both -m32 and -m64}} \
 %{m32:-mptr32 -mno-stack-bias %{!mlong-double-128:-mlong-double-64} \
   %{!mcpu*:-mcpu=cypress}} \
+%{mv8plus:-mptr32 -mno-stack-bias %{!mlong-double-128:-mlong-double-64} \
+  %{!mcpu*:-mcpu=v9}} \
 %{!m32:%{!mcpu*:-mcpu=ultrasparc}} \
 %{!mno-vis:%{!m32:%{!mcpu=v9:-mvis}}} \
 "

diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 79bb82164cccba30ab316bb8bc68861755545398..29d2922ba9227904ad758ecaa8f4be21d34089f6 100644 (file)
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -1029,10 +1029,6 @@ sparc_option_override (void)
       sparc_cpu_and_features = def->processor;
     }
 
-  if ((target_flags & MASK_V8PLUS)
-      && sparc_cpu_and_features < PROCESSOR_V9)
-    sparc_cpu_and_features = PROCESSOR_V9;
-
   if (!global_options_set.x_sparc_cpu)
     sparc_cpu = sparc_cpu_and_features;