From: Eric Botcazou <ebotcazou@adacore.com>
Date: Wed, 10 Mar 2010 23:25:37 +0000 (+0000)
Subject: sol2-bi.h (CC1_SPEC): Default to -mcpu=v9 for -m32.
X-Git-Tag: releases/gcc-4.5.0~428
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f37f5bb93a40f2ca4bcf2e002e02878fa7f61dbc;p=thirdparty%2Fgcc.git

sol2-bi.h (CC1_SPEC): Default to -mcpu=v9 for -m32.

	* config/sparc/sol2-bi.h (CC1_SPEC): Default to -mcpu=v9 for -m32.
	* config/sparc/t-sol2-64 (MULTILIB_DIRNAMES): Use sparcv8plus.
ada/
	* gcc-interface/Makefile.in (SPARC/Solaris): Use sparcv8plus.

From-SVN: r157372
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 12fb62697fe1..01d4193f8e73 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-10  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* config/sparc/sol2-bi.h (CC1_SPEC): Default to -mcpu=v9 for -m32.
+	* config/sparc/t-sol2-64 (MULTILIB_DIRNAMES): Use sparcv8plus.
+
 2010-03-10  Jan Hubicka  <jh@suse.cz>
 
 	PR c/43288
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b0d871b7bd4d..e4eb6775a906 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-10  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/Makefile.in (SPARC/Solaris): Use sparcv8plus.
+
 2010-02-27  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR ada/42253
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 53200a338170..8f7f4fd09226 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -960,7 +960,7 @@ ifeq ($(strip $(filter-out sparc% sun solaris%,$(targ))),)
       $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32)
     endif
   else
-    ifeq ($(strip $(MULTISUBDIR)),/sparcv7)
+    ifeq ($(strip $(MULTISUBDIR)),/sparcv8plus)
       LIBGNAT_TARGET_PAIRS = \
       $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32)
     else
diff --git a/gcc/config/sparc/sol2-bi.h b/gcc/config/sparc/sol2-bi.h
index b2933f68806e..2e0f03cce078 100644
--- a/gcc/config/sparc/sol2-bi.h
+++ b/gcc/config/sparc/sol2-bi.h
@@ -237,7 +237,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 %{mcypress:-mcpu=cypress} \
 %{msparclite:-mcpu=sparclite} %{mf930:-mcpu=f930} %{mf934:-mcpu=f934} \
 %{mv8:-mcpu=v8} %{msupersparc:-mcpu=supersparc} \
-%{m32:%{m64:%emay not use both -m32 and -m64}} \
+%{m64:%{m32:%emay not use both -m32 and -m64}} \
 %{m64:-mptr64 -mstack-bias -mno-v8plus \
   %{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8*:%{!msupersparc:-mcpu=v9}}}}}}}} \
 "
@@ -249,7 +249,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 %{mv8:-mcpu=v8} %{msupersparc:-mcpu=supersparc} \
 %{m32:%{m64:%emay not use both -m32 and -m64}} \
 %{m32:-mptr32 -mno-stack-bias \
-  %{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8*:%{!msupersparc:-mcpu=cypress}}}}}}}} \
+  %{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8*:%{!msupersparc:-mcpu=v9}}}}}}}} \
 %{mv8plus:-m32 -mptr32 -mno-stack-bias \
   %{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8:%{!msupersparc:-mcpu=v9}}}}}}}} \
 "
diff --git a/gcc/config/sparc/t-sol2-64 b/gcc/config/sparc/t-sol2-64
index 3c15f0a712a1..a9f4ec1e2cd2 100644
--- a/gcc/config/sparc/t-sol2-64
+++ b/gcc/config/sparc/t-sol2-64
@@ -1,5 +1,5 @@
 MULTILIB_OPTIONS = m32/m64
-MULTILIB_DIRNAMES = sparcv7 sparcv9
+MULTILIB_DIRNAMES = sparcv8plus sparcv9
 MULTILIB_MATCHES =
 MULTILIB_OSDIRNAMES = . sparcv9