svn commit: r219376 - in head/share: examples/etc mk

[Alexander Best]

On Mon Mar  7 11, Martin Matuska wrote:
> 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

very cool. never thought core2 support would be coming. :) any plans for
-march=native? for me it works, but apparently there are some users which
claim native doesn't always chose the correct -m{tune,arch} setting [1].

maybe something like

.if ${CPUTYPE} == "native"
.error "bla bla don't do that"
.endif

would be a nice idea. however the PR was with a geode cpu, so this might in
fact has been fixed in this (or recent gcc) commit. any chance you could test

touch hello.c && gcc -march=native -### hello.c

on a system with a geode cpu and see, if -m{tune,arch}=geode gets chosen?

cheers.
alex

[1] http://www.freebsd.org/cgi/query-pr.cgi?pr=gnu/146716

>   
>   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

-- 
a13x