diff options
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.cpu.mk | 6 | ||||
| -rw-r--r-- | share/mk/bsd.endian.mk | 1 | ||||
| -rw-r--r-- | share/mk/bsd.sys.mk | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 553351c..f858a49 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -10,8 +10,6 @@ _CPUCFLAGS = MACHINE_CPU = i486 . elif ${MACHINE_CPUARCH} == "amd64" MACHINE_CPU = amd64 sse2 sse mmx -. elif ${MACHINE_CPUARCH} == "ia64" -MACHINE_CPU = itanium . elif ${MACHINE_CPUARCH} == "powerpc" MACHINE_CPU = aim . elif ${MACHINE_CPUARCH} == "sparc64" @@ -234,10 +232,6 @@ MACHINE_CPU = ssse3 sse3 MACHINE_CPU = sse3 . endif MACHINE_CPU += amd64 sse2 sse mmx -. elif ${MACHINE_CPUARCH} == "ia64" -. if ${CPUTYPE} == "itanium" -MACHINE_CPU = itanium -. endif . elif ${MACHINE_ARCH} == "powerpc" . if ${CPUTYPE} == "e500" MACHINE_CPU = booke diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk index 15306a0..565d1aa 100644 --- a/share/mk/bsd.endian.mk +++ b/share/mk/bsd.endian.mk @@ -2,7 +2,6 @@ .if ${MACHINE_ARCH} == "amd64" || \ ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_ARCH} == "ia64" || \ ${MACHINE_ARCH} == "arm" || \ ${MACHINE_ARCH} == "armv6" || \ ${MACHINE_ARCH} == "armv6hf" || \ diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index f019e5e..58d6171 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -126,12 +126,12 @@ CFLAGS.clang+= -fno-dwarf2-cfi-asm # but not yet. CXXFLAGS.clang+= -Wno-c++11-extensions -.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \ +.if ${MK_SSP} != "no" && \ ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" # Don't use -Wstack-protector as it breaks world with -Werror. SSP_CFLAGS?= -fstack-protector CFLAGS+= ${SSP_CFLAGS} -.endif # SSP && !IA64 && !ARM && !MIPS +.endif # SSP && !ARM && !MIPS # Allow user-specified additional warning flags, plus compiler specific flag overrides. # Unless we've overriden this... |
