summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2011-04-19 18:09:21 +0000
committerdim <dim@FreeBSD.org>2011-04-19 18:09:21 +0000
commit738c7248a6efaacd02c3b054f4ff1070318a2801 (patch)
treebf490762e6f5159fe9ae8044c4da5fb3f5693a76 /sys/conf
parent2ac9648c294cc9f30b41241d80b36ccca4214e85 (diff)
downloadFreeBSD-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 'sys/conf')
-rw-r--r--sys/conf/kern.mk20
-rw-r--r--sys/conf/kern.pre.mk32
-rw-r--r--sys/conf/kmod.mk16
3 files changed, 13 insertions, 55 deletions
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 01b1438..1e58378 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -6,14 +6,9 @@
# Note that the newly added -Wcast-qual is responsible for generating
# most of the remaining warnings. Warnings introduced with -Wall will
# also pop up, but are easier to fix.
-.if ${CC:T:Micc} == "icc"
-#CWARNFLAGS= -w2 # use this if you are terribly bored
-CWARNFLAGS=
-.else
CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
-Wundef -Wno-pointer-sign -fformat-extensions
-.endif
#
# The following flags are next up for working on:
# -W
@@ -29,7 +24,7 @@ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
# operations inside the kernel itself. These operations are exclusively
# reserved for user applications.
#
-.if ${MACHINE_CPUARCH} == "i386" && ${CC:T:Micc} != "icc"
+.if ${MACHINE_CPUARCH} == "i386"
.if ${CC:T:Mclang} != "clang"
CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
.endif
@@ -100,22 +95,13 @@ INLINE_LIMIT?= 8000
# GCC 3.0 and above like to do certain optimizations based on the
# assumption that the program is linked against libc. Stop this.
#
-.if ${CC:T:Micc} == "icc"
-CFLAGS+= -nolib_inline
-.else
CFLAGS+= -ffreestanding
-.endif
-
-.if ${CC:T:Micc} == "icc"
-CFLAGS+= -restrict
-.endif
#
# GCC SSP support.
#
-.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"
CFLAGS+= -fstack-protector
.endif
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 4deaea8..61e22be 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -23,38 +23,25 @@ NM?= nm
OBJCOPY?= objcopy
SIZE?= size
-.if ${CC:T:Micc} == "icc"
-COPTFLAGS?= -O
-.else
-. if defined(DEBUG)
+.if defined(DEBUG)
_MINUS_O= -O
CTFFLAGS+= -g
-. else
+.else
_MINUS_O= -O2
-. endif
-. if ${MACHINE_CPUARCH} == "amd64"
+.endif
+.if ${MACHINE_CPUARCH} == "amd64"
COPTFLAGS?=-O2 -frename-registers -pipe
-. else
+.else
COPTFLAGS?=${_MINUS_O} -pipe
-. endif
-. if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
+.endif
+.if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
COPTFLAGS+= -fno-strict-aliasing
-. endif
.endif
.if !defined(NO_CPU_COPTFLAGS)
-. if ${CC:T:Micc} == "icc"
-COPTFLAGS+= ${_ICC_CPUCFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/}
-. else
COPTFLAGS+= ${_CPUCFLAGS}
-. endif
.endif
-.if ${CC:T:Micc} == "icc"
-C_DIALECT=
-NOSTDINC= -X
-.else
C_DIALECT= -std=c99
NOSTDINC= -nostdinc
-.endif
INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S
@@ -89,7 +76,6 @@ INCLUDES+= -I$S/dev/cxgb -I$S/dev/cxgbe
CFLAGS= ${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS}
CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
-.if ${CC:T:Micc} != "icc"
.if ${CC:T:Mclang} != "clang"
CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
.if ${MACHINE_CPUARCH} != "mips"
@@ -103,15 +89,11 @@ CFLAGS+= --param max-inline-insns-single=10000
.endif
.endif
WERROR?= -Werror
-.endif
# XXX LOCORE means "don't declare C stuff" not "for locore.s".
ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
.if defined(PROFLEVEL) && ${PROFLEVEL} >= 1
-.if ${CC:T:Micc} == "icc"
-.error "Profiling doesn't work with icc"
-.endif
CFLAGS+= -DGPROF -falign-functions=16
.if ${PROFLEVEL} >= 2
CFLAGS+= -DGPROF4 -DGUPROF
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 2239d66..6d22e41 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -88,25 +88,17 @@ __KLD_SHARED=yes
__KLD_SHARED=no
.endif
-.if ${CC:T:Micc} == "icc"
-CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/}
-.else
-. if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
+.if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
CFLAGS+= -fno-strict-aliasing
-. endif
-WERROR?= -Werror
.endif
+WERROR?= -Werror
CFLAGS+= ${WERROR}
CFLAGS+= -D_KERNEL
CFLAGS+= -DKLD_MODULE
# Don't use any standard or source-relative include directories.
-.if ${CC:T:Micc} == "icc"
-NOSTDINC= -X
-.else
CSTD= c99
NOSTDINC= -nostdinc
-.endif
CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*}
.if defined(KERNBUILDDIR)
CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h
@@ -121,7 +113,7 @@ CFLAGS+= -I. -I@
# for example.
CFLAGS+= -I@/contrib/altq
-.if ${CC:T:Micc} != "icc" && ${CC:T:Mclang} != "clang"
+.if ${CC:T:Mclang} != "clang"
CFLAGS+= -finline-limit=${INLINE_LIMIT}
CFLAGS+= --param inline-unit-growth=100
CFLAGS+= --param large-function-growth=1000
@@ -129,9 +121,7 @@ CFLAGS+= --param large-function-growth=1000
# Disallow common variables, and if we end up with commons from
# somewhere unexpected, allocate storage for them in the module itself.
-.if ${CC:T:Micc} != "icc"
CFLAGS+= -fno-common
-.endif
LDFLAGS+= -d -warn-common
CFLAGS+= ${DEBUG_FLAGS}
OpenPOWER on IntegriCloud