merged make.conf changes from HEAD.

1 files changed, 15 insertions, 20 deletions

diff --git a/cnf/make.conf.sparc b/cnf/make.conf.sparc
index 73e2819..af9f8d7 100644
--- a/cnf/make.conf.sparc
+++ b/cnf/make.conf.sparc
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.sparc,v 1.42.2.1 2004/11/30 22:20:24 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.sparc,v 1.42.2.2 2005/01/07 10:35:47 eradicator Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -25,24 +25,12 @@
 
 # Host Setting
 # ============
+# This should be left to the default value of sparc-unknown-linux-gnu unless
+# you are absolutely certain of the consequences.  In addition to potentially
+# destroying your system, you will recieve no support and your bugs will be 
+# marked INVALID if you change this.
 #
-# If you have one of these architectures...
-#
-# Sun4c: SPARC Station: SLC, ELC, IPC, IPX, server 1, server 1+, server 2 
-# Sun4d: SPARCCenter 2000
-# Sun4m: classic, LC, LX, station 4, station/server 5, station/server 10
-# 	 station/server 20, JavaStation 1, 10, E, JavaEngine 1  
-# Sun4u:
-# 	 UltraSPARC Sbus based: Ultra1, Ultra2, Ultra1E, Ultra2E, Netra i,
-# 	 Enterprise 1, 2, 150, 3000, 3500, 4000, 4500, 5000, 6000, 6500, 10000 
-#
-# 	 UltraSPARC PCI based: SPARCengine CP1400, CP1500
-#
-#	 UltraSPARC PCI based: Ultra30, UltraAXe, UltraAXi, UltraAXmp, Ultra5,
-#	 Ultra10, Ultra60, Ultra80, SunBlade 100, SunBlade 1000, Netra X1,
-# 	 Netra T series, Enterprise 250, 450
-#
-CHOST="sparc-unknown-linux-gnu"
+# CHOST="sparc-unknown-linux-gnu"
 
 # Host and optimization settings 
 # ==============================
@@ -55,7 +43,7 @@ CHOST="sparc-unknown-linux-gnu"
 # before reporting errors to developers.
 #
 # Sparc specific cpu optimizatiobn flags can be found here:
-# http://gcc.gnu.org/onlinedocs/gcc-3.2/gcc/SPARC-Options.html#SPARC%20Options
+# http://gcc.gnu.org/onlinedocs/gcc-3.3/gcc/SPARC-Options.html#SPARC%20Options
 # 
 # -mcpu=<cpu-type> means optimize code for the particular type of CPU without
 # breaking compatibility with other CPUs.
@@ -63,13 +51,19 @@ CHOST="sparc-unknown-linux-gnu"
 # -mtune=<cpu-type> set the instruction scheduling parameters for machine, but
 # do not set the instruction set or register set.
 #
-# SPARC CPU types supported in gcc-3.2 and higher:
+# Here is a list of each supported architecture and their supported
+# implementations:
+#
+# gcc-3.2 and higher:
 #    v7:             cypress
 #    v8:             supersparc, hypersparc
 #    sparclite:      f930, f934, sparclite86x
 #    sparclet:       tsc701
 #    v9:             ultrasparc
 #
+# Additionally in gcc-3.3 and higher:
+#    v9:             ultrasparc3
+#
 # Decent examples:
 #
 #CFLAGS="-mcpu=supersparc -O3 -pipe"
@@ -167,6 +161,7 @@ CHOST="sparc-unknown-linux-gnu"
 #FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
 #RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
 #
+#
 # Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
 # The list is a space separated list which is read left to right. If you use
 # another mirror we highly recommend leaving the default mirror at the end of