diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/examples/etc/make.conf | 1 | ||||
| -rw-r--r-- | share/mk/bsd.cpu.mk | 42 |
2 files changed, 25 insertions, 18 deletions
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index b10819b..7554631 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -29,6 +29,7 @@ # #CPUTYPE=i686 #NO_CPU_CFLAGS= true # Don't add -march=<cpu> to CFLAGS automatically +#NO_CPU_COPTFLAGS=true # Don't add -march=<cpu> to COPTFLAGS automatically # # CFLAGS controls the compiler settings used when compiling C code. # Note that optimization settings above -O (-O2, ...) are not recommended diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index df50183..ed652ed 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -28,48 +28,54 @@ CPUTYPE = k7 # after /etc/make.conf so it can react to the local value of CPUTYPE # defined therein. -.if !defined(NO_CPU_CFLAGS) +.if !defined(NO_CPU_CFLAGS) || !defined(NO_CPU_COPTFLAGS) . if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "k7" -CFLAGS += -march=k6 # gcc doesn't support athlon yet, but it will +_CPUCFLAGS = -march=k6 # gcc doesn't support athlon yet, but it will . elif ${CPUTYPE} == "k6-2" -CFLAGS += -march=k6 +_CPUCFLAGS = -march=k6 . elif ${CPUTYPE} == "k6" -CFLAGS += -march=k6 +_CPUCFLAGS = -march=k6 . elif ${CPUTYPE} == "k5" -CFLAGS += -march=pentium +_CPUCFLAGS = -march=pentium . elif ${CPUTYPE} == "p4" -CFLAGS += -march=pentiumpro +_CPUCFLAGS = -march=pentiumpro . elif ${CPUTYPE} == "p3" -CFLAGS += -march=pentiumpro +_CPUCFLAGS = -march=pentiumpro . elif ${CPUTYPE} == "p2" -CFLAGS += -march=pentiumpro +_CPUCFLAGS = -march=pentiumpro . elif ${CPUTYPE} == "i686" -CFLAGS += -march=pentiumpro +_CPUCFLAGS = -march=pentiumpro . elif ${CPUTYPE} == "i586/mmx" -CFLAGS += -march=pentium +_CPUCFLAGS = -march=pentium . elif ${CPUTYPE} == "i586" -CFLAGS += -march=pentium +_CPUCFLAGS = -march=pentium . elif ${CPUTYPE} == "i486" -CFLAGS += -m486 +_CPUCFLAGS = -m486 . endif . elif ${MACHINE_ARCH} == "alpha" . if ${CPUTYPE} == "ev6" -CFLAGS += -mcpu=ev6 +_CPUCFLAGS = -mcpu=ev6 . elif ${CPUTYPE} == "pca56" -CFLAGS += -mcpu=pca56 +_CPUCFLAGS = -mcpu=pca56 . elif ${CPUTYPE} == "ev56" -CFLAGS += -mcpu=ev56 +_CPUCFLAGS = -mcpu=ev56 . elif ${CPUTYPE} == "ev5" -CFLAGS += -mcpu=ev5 +_CPUCFLAGS = -mcpu=ev5 . elif ${CPUTYPE} == "ev45" -CFLAGS += -mcpu=ev4 # No -mcpu=ev45 for gcc +_CPUCFLAGS = -mcpu=ev4 # No -mcpu=ev45 for gcc . elif ${CPUTYPE} == "ev4" -CFLAGS += -mcpu=ev4 +_CPUCFLAGS = -mcpu=ev4 . endif . endif .endif +# NB: COPTFLAGS is handled in /usr/src/sys/conf/Makefile.<arch> + +.if !defined(NO_CPU_CFLAGS) +CFLAGS += ${_CPUCFLAGS} +.endif + # Set up the list of CPU features based on the CPU type. This is an # unordered list to make it easy for client makefiles to test for the # presence of a CPU feature. |
