make the fallback make.conf more generic by removing x86 specific stuff and removing...

svn path=/main/trunk/; revision=2956

diff --git a/cnf/make.conf b/cnf/make.conf
index 4c8b56012e62234b3518fb3a33deb35dc63dde8e..d993464ca9500d43138fb4c70b973f85f09be9d7 100644 (file)
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -23,15 +23,6 @@
 # Example:
 #USE="X gtk gnome -alsa"
 
-# Host Setting
-# ============
-#
-# DO NOT CHANGE THIS SETTING UNLESS YOU ARE USING STAGE1!
-# Change this line as appropriate (i686, i586, i486 or i386).
-# All modern systems (even Athlons) should use "i686-pc-linux-gnu".
-# All K6's are i586.
-CHOST="i686-pc-linux-gnu"
-
 # Host and optimization settings 
 # ==============================
 #
@@ -42,34 +33,10 @@ CHOST="i686-pc-linux-gnu"
 # package (and in some cases the libraries it uses) at default optimizations
 # before reporting errors to developers.
 #
-# -mcpu=<cpu-type> means optimize code for the particular type of CPU without
-# breaking compatibility with other CPUs.
-#
-# -march=<cpu-type> means to take full advantage of the ABI and instructions
-# for the particular CPU; this will break compatibility with older CPUs (for
-# example, -march=athlon-xp code will not run on a regular Athlon, and
-# -march=i686 code will not run on a Pentium Classic.
-#
-# CPU types supported in gcc-3.2 and higher: athlon-xp, athlon-mp,
-# athlon-tbird, athlon, k6, k6-2, k6-3, i386, i486, i586 (Pentium), i686
-# (PentiumPro), pentium, pentium-mmx, pentiumpro, pentium2 (Celeron),
-# pentium3, and pentium4.
+# Please refer to the GCC manual for a list of possible values.
 #
-# Note that Gentoo Linux 1.4 and higher include at least gcc-3.2.
-# 
-# CPU types supported in gcc-2.95*: k6, i386, i486, i586 (Pentium), i686
-# (Pentium Pro), pentium, pentiumpro Gentoo Linux 1.2 and below use gcc-2.95*
+#CFLAGS="-O2 -pipe"
 #
-# CRITICAL WARNINGS: ****************************************************** #
-# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
-# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #
-# ************************************************************************* #
-#
-# Decent examples:
-#
-#CFLAGS="-mcpu=athlon-xp -O3 -pipe"
-#CFLAGS="-march=pentium3 -O3 -pipe"
-
 # If you set a CFLAGS above, then this line will set your default C++ flags to
 # the same settings.
 #CXXFLAGS="${CFLAGS}"