diff options
| author |   Nicholas Jones <carpaski@gentoo.org> | 2003-12-10 06:00:57 +0000 |
|---|---|---|
| committer | Nicholas Jones <carpaski@gentoo.org> | 2003-12-10 06:00:57 +0000 |
| commit | 1bf16a6cedfc8d4efc1cd6e525208a0de56d9dd6 (patch) | |
| tree | 230b0898c57fbb77ae3da82cd4cbb9e25a1125a9 /cnf | |
| parent | improved dependency check on repoman. (diff) | |
| download | portage-cvs-1bf16a6cedfc8d4efc1cd6e525208a0de56d9dd6.tar.gz portage-cvs-1bf16a6cedfc8d4efc1cd6e525208a0de56d9dd6.tar.bz2 portage-cvs-1bf16a6cedfc8d4efc1cd6e525208a0de56d9dd6.zip | |
Touchups and fixes to messages and warnings. repoman manifest fix.
Begining migration of helper scripts into sourced functions that
can die on their own.
Diffstat (limited to 'cnf')
| -rw-r--r-- | cnf/make.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cnf/make.conf b/cnf/make.conf index 0674e0d..8ca6783 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -1,6 +1,6 @@ # Copyright 2000-2003 Daniel Robbins, Gentoo Technologies, Inc. # Contains local system settings for Portage system -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.68 2003/09/29 18:13:42 carpaski Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.69 2003/12/10 06:00:57 carpaski Exp $ # Please review 'man make.conf' for more information. @@ -51,15 +51,15 @@ CHOST="i686-pc-linux-gnu" # # 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. +# (PentiumPro), pentium, pentium-mmx, pentiumpro, pentium2 (Celeron), +# pentium3, and pentium4. +# # 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* # # CRITICAL WARNINGS: ****************************************************** # -# ATHLON-4 will generate invalid SSE instructions; use 'athlon' instead. # -# PENTIUM4 will generate invalid SSE2 instructions; use 'pentium3' instead. # # K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. # # ************************************************************************* # # |