diff options
| author | jhb <jhb@FreeBSD.org> | 2002-09-18 20:44:46 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2002-09-18 20:44:46 +0000 |
| commit | 80d913bae3a6dfe4b639a390f6a89e5a14734dd7 (patch) | |
| tree | 867bd33fe32f968f576c613c49d52f14c528768e /share/mk | |
| parent | 00c79f5c92eb1bef381fbc7e267b6e746fab0f9c (diff) | |
| download | FreeBSD-src-80d913bae3a6dfe4b639a390f6a89e5a14734dd7.zip FreeBSD-src-80d913bae3a6dfe4b639a390f6a89e5a14734dd7.tar.gz | |
For the default case of CPUTYPE not being set, don't define CPUTYPE to the
lowest value in order to get the right MACHINE_CPU values since setting
CPUTYPE can result in problems later in the buildkernel case. Instead,
set MACHINE_CPU directly and leave CPUTYPE alone.
Tested by: mbr
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.cpu.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index fe7e4f2..deb0948 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -7,16 +7,17 @@ .if !defined(CPUTYPE) || empty(CPUTYPE) . if ${MACHINE_ARCH} == "i386" _CPUCFLAGS = -mcpu=pentiumpro -CPUTYPE = i386 +MACHINE_CPU = i386 . elif ${MACHINE_ARCH} == "alpha" _CPUCFLAGS = -mcpu=ev4 -mtune=ev5 -CPUTYPE = ev4 +MACHINE_CPU = ev4 +.elif ${MACHINE_ARCH} == "x86-64" || ${MACHINE_ARCH} == "x86_64" +MACHINE_CPU = x86-64 sse2 sse . elif ${MACHINE_ARCH} == "ia64" _CPUCFLAGS = -CPUTYPE = itanium +MACHINE_CPU = itanium . elif ${MACHINE_ARCH} == "sparc64" _CPUCFLAGS = -CPUTYPE = ultrasparc . endif .else @@ -92,7 +93,6 @@ _CPUCFLAGS = -mcpu=ev45 _CPUCFLAGS = -mcpu=ev4 . endif . endif -.endif # NB: COPTFLAGS is handled in /usr/src/sys/conf/Makefile.<arch> @@ -161,3 +161,4 @@ MACHINE_CPU = x86-64 sse2 sse MACHINE_CPU = itanium . endif .endif +.endif |
