diff options
author | dim <dim@FreeBSD.org> | 2011-04-19 18:09:21 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2011-04-19 18:09:21 +0000 |
commit | 738c7248a6efaacd02c3b054f4ff1070318a2801 (patch) | |
tree | bf490762e6f5159fe9ae8044c4da5fb3f5693a76 /share | |
parent | 2ac9648c294cc9f30b41241d80b36ccca4214e85 (diff) | |
download | FreeBSD-src-738c7248a6efaacd02c3b054f4ff1070318a2801.zip FreeBSD-src-738c7248a6efaacd02c3b054f4ff1070318a2801.tar.gz |
Remove support for the Intel C Compiler from the build infrastructure.
This support has not worked for several years, and is not likely to work
again, unless Intel decides to release a native FreeBSD version of their
compiler. ;)
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/bsd.cpu.mk | 29 | ||||
-rw-r--r-- | share/mk/bsd.dep.mk | 5 | ||||
-rw-r--r-- | share/mk/bsd.lib.mk | 4 | ||||
-rw-r--r-- | share/mk/bsd.sys.mk | 19 |
4 files changed, 8 insertions, 49 deletions
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 99c28aa..0670bff 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -91,31 +91,6 @@ _CPUCFLAGS = -march=prescott . else _CPUCFLAGS = -march=${CPUTYPE} . endif # GCC on 'i386' -. if ${CPUTYPE} == "crusoe" -_ICC_CPUCFLAGS = -tpp6 -xiM -. elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \ - ${CPUTYPE} == "athlon-4" -_ICC_CPUCFLAGS = -tpp6 -xiMK -. elif ${CPUTYPE} == "athlon-tbird" || ${CPUTYPE} == "athlon" -_ICC_CPUCFLAGS = -tpp6 -xiM -. elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2" || ${CPUTYPE} == "k6" -_ICC_CPUCFLAGS = -tpp6 -xi -. elif ${CPUTYPE} == "k5" -_ICC_CPUCFLAGS = -tpp5 -. elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" -_ICC_CPUCFLAGS = -tpp7 -xiMKW -. elif ${CPUTYPE} == "pentium3" || ${CPUTYPE} == "pentium3m" || \ - ${CPUTYPE} == "pentium-m" -_ICC_CPUCFLAGS = -tpp6 -xiMK -. elif ${CPUTYPE} == "pentium2" || ${CPUTYPE} == "pentiumpro" -_ICC_CPUCFLAGS = -tpp6 -xiM -. elif ${CPUTYPE} == "pentium-mmx" -_ICC_CPUCFLAGS = -tpp5 -xM -. elif ${CPUTYPE} == "pentium" -_ICC_CPUCFLAGS = -tpp5 -. else -_ICC_CPUCFLAGS = -. endif # ICC on 'i386' . elif ${MACHINE_CPUARCH} == "amd64" _CPUCFLAGS = -march=${CPUTYPE} . elif ${MACHINE_CPUARCH} == "arm" @@ -242,9 +217,5 @@ CFLAGS += -G0 # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk .if !defined(NO_CPU_CFLAGS) -. if ${CC} == "icc" -CFLAGS += ${_ICC_CPUCFLAGS} -. else CFLAGS += ${_CPUCFLAGS} -. endif .endif diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index 459a9c3..c452528 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -125,13 +125,8 @@ depend: beforedepend ${DEPENDFILE} afterdepend # Different types of sources are compiled with slightly different flags. # Split up the sources, and filter out headers and non-applicable flags. -.if ${CC:T:Micc} == "icc" -MKDEP_CFLAGS= ${CFLAGS:M-X*} ${CFLAGS:M-[BIDU]*} -MKDEP_CXXFLAGS= ${CXXFLAGS:M-X*} ${CXXFLAGS:M-[BIDU]*} -.else MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*} MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*} -.endif DPSRCS+= ${SRCS} ${DEPENDFILE}: ${DPSRCS} diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 9d655b6..943010c 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -65,11 +65,7 @@ PICFLAG=-fpic .endif .endif -.if ${CC:T:Micc} == "icc" -PO_FLAG=-p -.else PO_FLAG=-pg -.endif .c.po: ${CC} ${PO_FLAG} ${PO_CFLAGS} -c ${.IMPSRC} -o ${.TARGET} diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index fc5ec40..796d169 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -11,20 +11,18 @@ # the default is gnu99 for now CSTD ?= gnu99 -.if ${CC:T:Micc} != "icc" -. if ${CSTD} == "k&r" +.if ${CSTD} == "k&r" CFLAGS += -traditional -. elif ${CSTD} == "c89" || ${CSTD} == "c90" +.elif ${CSTD} == "c89" || ${CSTD} == "c90" CFLAGS += -std=iso9899:1990 -. elif ${CSTD} == "c94" || ${CSTD} == "c95" +.elif ${CSTD} == "c94" || ${CSTD} == "c95" CFLAGS += -std=iso9899:199409 -. elif ${CSTD} == "c99" +.elif ${CSTD} == "c99" CFLAGS += -std=iso9899:1999 -. else +.else CFLAGS += -std=${CSTD} -. endif .endif -.if !defined(NO_WARNS) && ${CC:T:Micc} != "icc" +.if !defined(NO_WARNS) # -pedantic is problematic because it also imposes namespace restrictions #CFLAGS += -pedantic . if defined(WARNS) @@ -82,9 +80,8 @@ CWARNFLAGS += -Wno-format CWARNFLAGS += -Wno-unknown-pragmas .endif -.if ${MK_SSP} != "no" && ${CC:T:Micc} != "icc" && \ - ${MACHINE_CPUARCH} != "ia64" && \ - ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" +.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \ + ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" # Don't use -Wstack-protector as it breaks world with -Werror. SSP_CFLAGS ?= -fstack-protector CFLAGS += ${SSP_CFLAGS} |