From owner-svn-src-head@FreeBSD.ORG Mon Dec 3 19:27:31 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A8DFB636; Mon, 3 Dec 2012 19:27:31 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8BBD68FC08; Mon, 3 Dec 2012 19:27:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB3JRVVl019805; Mon, 3 Dec 2012 19:27:31 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB3JRVgN019802; Mon, 3 Dec 2012 19:27:31 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201212031927.qB3JRVgN019802@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 3 Dec 2012 19:27:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243831 - in head: share/examples/etc share/mk usr.bin/make X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2012 19:27:31 -0000 Author: jkim Date: Mon Dec 3 19:27:31 2012 New Revision: 243831 URL: http://svnweb.freebsd.org/changeset/base/243831 Log: Remove fictitious support for 80386-class CPUs from bsd.cpu.mk and make(1). It was removed from head more than 8 years ago (see r137784 and r137785). Reviewed by: imp, delphij, dim Modified: head/share/examples/etc/make.conf head/share/mk/bsd.cpu.mk head/usr.bin/make/main.c Modified: head/share/examples/etc/make.conf ============================================================================== --- head/share/examples/etc/make.conf Mon Dec 3 19:24:08 2012 (r243830) +++ head/share/examples/etc/make.conf Mon Dec 3 19:27:31 2012 (r243831) @@ -35,7 +35,7 @@ # athlon-tbird, athlon, k7, geode, k6-3, k6-2, k6, k5 # (Intel CPUs) core2, core, nocona, pentium4m, pentium4, prescott, # pentium3m, pentium3, pentium-m, pentium2, -# pentiumpro, pentium-mmx, pentium, i486, i386 +# pentiumpro, pentium-mmx, pentium, i486 # (VIA CPUs) c7, c3-2, c3 # AMD64 architecture: opteron-sse3, athlon64-sse3, k8-sse3, opteron, # athlon64, k8, core2, nocona, prescott Modified: head/share/mk/bsd.cpu.mk ============================================================================== --- head/share/mk/bsd.cpu.mk Mon Dec 3 19:24:08 2012 (r243830) +++ head/share/mk/bsd.cpu.mk Mon Dec 3 19:27:31 2012 (r243831) @@ -145,59 +145,54 @@ _CPUCFLAGS = -mcpu=ultrasparc3 . if ${MACHINE_CPUARCH} == "i386" . if ${CPUTYPE} == "bdver1" || ${CPUTYPE} == "bdver2" MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 -MACHINE_CPU += i486 i386 . elif ${CPUTYPE} == "btver1" -MACHINE_CPU = ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 i486 i386 +MACHINE_CPU = ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 . elif ${CPUTYPE} == "amdfam10" MACHINE_CPU = athlon-xp athlon k7 3dnow sse4a sse3 sse2 sse mmx k6 k5 i586 -MACHINE_CPU += i486 i386 . elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" -MACHINE_CPU = athlon-xp athlon k7 3dnow sse3 sse2 sse mmx k6 k5 i586 i486 i386 +MACHINE_CPU = athlon-xp athlon k7 3dnow sse3 sse2 sse mmx k6 k5 i586 . elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" -MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586 i486 i386 +MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586 . elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \ ${CPUTYPE} == "athlon-4" -MACHINE_CPU = athlon-xp athlon k7 3dnow sse mmx k6 k5 i586 i486 i386 +MACHINE_CPU = athlon-xp athlon k7 3dnow sse mmx k6 k5 i586 . elif ${CPUTYPE} == "athlon" || ${CPUTYPE} == "athlon-tbird" -MACHINE_CPU = athlon k7 3dnow mmx k6 k5 i586 i486 i386 +MACHINE_CPU = athlon k7 3dnow mmx k6 k5 i586 . elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2" || ${CPUTYPE} == "geode" -MACHINE_CPU = 3dnow mmx k6 k5 i586 i486 i386 +MACHINE_CPU = 3dnow mmx k6 k5 i586 . elif ${CPUTYPE} == "k6" -MACHINE_CPU = mmx k6 k5 i586 i486 i386 +MACHINE_CPU = mmx k6 k5 i586 . elif ${CPUTYPE} == "k5" -MACHINE_CPU = k5 i586 i486 i386 +MACHINE_CPU = k5 i586 . elif ${CPUTYPE} == "c3" -MACHINE_CPU = 3dnow mmx i586 i486 i386 +MACHINE_CPU = 3dnow mmx i586 . elif ${CPUTYPE} == "c3-2" -MACHINE_CPU = sse mmx i586 i486 i386 +MACHINE_CPU = sse mmx i586 . elif ${CPUTYPE} == "c7" -MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386 +MACHINE_CPU = sse3 sse2 sse i686 mmx i586 . elif ${CPUTYPE} == "corei7-avx" || ${CPUTYPE} == "core-avx-i" -MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 i486 i386 +MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 . elif ${CPUTYPE} == "corei7" -MACHINE_CPU = sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 i486 i386 +MACHINE_CPU = sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 . elif ${CPUTYPE} == "core2" -MACHINE_CPU = ssse3 sse3 sse2 sse i686 mmx i586 i486 i386 +MACHINE_CPU = ssse3 sse3 sse2 sse i686 mmx i586 . elif ${CPUTYPE} == "prescott" -MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386 +MACHINE_CPU = sse3 sse2 sse i686 mmx i586 . elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || \ ${CPUTYPE} == "pentium-m" -MACHINE_CPU = sse2 sse i686 mmx i586 i486 i386 +MACHINE_CPU = sse2 sse i686 mmx i586 . elif ${CPUTYPE} == "pentium3" || ${CPUTYPE} == "pentium3m" -MACHINE_CPU = sse i686 mmx i586 i486 i386 +MACHINE_CPU = sse i686 mmx i586 . elif ${CPUTYPE} == "pentium2" -MACHINE_CPU = i686 mmx i586 i486 i386 +MACHINE_CPU = i686 mmx i586 . elif ${CPUTYPE} == "pentiumpro" -MACHINE_CPU = i686 i586 i486 i386 +MACHINE_CPU = i686 i586 . elif ${CPUTYPE} == "pentium-mmx" -MACHINE_CPU = mmx i586 i486 i386 +MACHINE_CPU = mmx i586 . elif ${CPUTYPE} == "pentium" -MACHINE_CPU = i586 i486 i386 -. elif ${CPUTYPE} == "i486" -MACHINE_CPU = i486 i386 -. elif ${CPUTYPE} == "i386" -MACHINE_CPU = i386 +MACHINE_CPU = i586 . endif +MACHINE_CPU += i486 . elif ${MACHINE_CPUARCH} == "amd64" . if ${CPUTYPE} == "bdver1" || ${CPUTYPE} == "bdver2" MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 Modified: head/usr.bin/make/main.c ============================================================================== --- head/usr.bin/make/main.c Mon Dec 3 19:24:08 2012 (r243830) +++ head/usr.bin/make/main.c Mon Dec 3 19:27:31 2012 (r243831) @@ -976,7 +976,7 @@ main(int argc, char **argv) */ if ((machine_cpu = getenv("MACHINE_CPU")) == NULL) { if (!strcmp(machine_arch, "i386")) - machine_cpu = "i386"; + machine_cpu = "i486"; else machine_cpu = "unknown"; }