From owner-svn-src-all@FreeBSD.ORG Mon Mar 7 14:58:23 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C359F106566B; Mon, 7 Mar 2011 14:58:23 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 994BD8FC16; Mon, 7 Mar 2011 14:58:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p27EwNIQ038654; Mon, 7 Mar 2011 14:58:23 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p27EwNKR038651; Mon, 7 Mar 2011 14:58:23 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201103071458.p27EwNKR038651@svn.freebsd.org> From: Martin Matuska Date: Mon, 7 Mar 2011 14:58:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219376 - in head/share: examples/etc mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2011 14:58:23 -0000 Author: mm Date: Mon Mar 7 14:58:23 2011 New Revision: 219376 URL: http://svn.freebsd.org/changeset/base/219376 Log: Add AMD Geode CPU type to bsd.cpu.mk and examples/etc/make.conf For CPUTYPE=core2 use -march=core2 PR: gnu/155308 MFC after: 2 weeks Modified: head/share/examples/etc/make.conf head/share/mk/bsd.cpu.mk Modified: head/share/examples/etc/make.conf ============================================================================== --- head/share/examples/etc/make.conf Mon Mar 7 14:54:45 2011 (r219375) +++ head/share/examples/etc/make.conf Mon Mar 7 14:58:23 2011 (r219376) @@ -32,7 +32,7 @@ # Intel x86 architecture: # (AMD CPUs) opteron-sse3 opteron athlon64-sse3 athlon64 athlon-mp # athlon-xp athlon-4 athlon-tbird athlon k8-sse3 k8 -# k6-3 k6-2 k6 k5 +# 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 Modified: head/share/mk/bsd.cpu.mk ============================================================================== --- head/share/mk/bsd.cpu.mk Mon Mar 7 14:54:45 2011 (r219375) +++ head/share/mk/bsd.cpu.mk Mon Mar 7 14:58:23 2011 (r219376) @@ -59,7 +59,7 @@ CPUTYPE = athlon-mp CPUTYPE = athlon . endif . elif ${MACHINE_CPUARCH} == "amd64" -. if ${CPUTYPE} == "prescott" || ${CPUTYPE} == "core2" +. if ${CPUTYPE} == "prescott" CPUTYPE = nocona . endif . elif ${MACHINE_ARCH} == "sparc64" @@ -170,7 +170,7 @@ MACHINE_CPU = athlon-xp athlon k7 3dnow MACHINE_CPU = athlon-xp athlon k7 3dnow sse mmx k6 k5 i586 i486 i386 . elif ${CPUTYPE} == "athlon" || ${CPUTYPE} == "athlon-tbird" MACHINE_CPU = athlon k7 3dnow mmx k6 k5 i586 i486 i386 -. elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2" +. elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2" || ${CPUTYPE} == "geode" MACHINE_CPU = 3dnow mmx k6 k5 i586 i486 i386 . elif ${CPUTYPE} == "k6" MACHINE_CPU = mmx k6 k5 i586 i486 i386 @@ -206,7 +206,7 @@ MACHINE_CPU = i386 MACHINE_CPU = k8 3dnow sse3 . elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8" MACHINE_CPU = k8 3dnow -. elif ${CPUTYPE} == "nocona" +. elif ${CPUTYPE} == "nocona" || ${CPUTYPE} == "core2" MACHINE_CPU = sse3 . endif MACHINE_CPU += amd64 sse2 sse mmx