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
This commit is contained in:
parent
86ed6d45ac
commit
eb28bc3e98
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=103560
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user