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. ;)
This commit is contained in:
Dimitry Andric
parent
4ef498c23e
commit
58ff0f42ba
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=220863
@ -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
|
||||
|
||||
@ -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}
|
||||
|
||||
@ -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}
|
||||
|
||||
@ -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}
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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}
|
||||
|
||||
@ -24,12 +24,7 @@ WARNS?= 5
|
||||
DEPENDFILE= .depend_aicasm
|
||||
.endif
|
||||
|
||||
.if ${CC:T:Micc} == "icc"
|
||||
CFLAGS+= -restrict
|
||||
NOSTDINC= -X
|
||||
.else
|
||||
NOSTDINC= -nostdinc
|
||||
.endif
|
||||
CFLAGS+= ${NOSTDINC} -I/usr/include -I.
|
||||
.ifdef MAKESRCPATH
|
||||
CFLAGS+= -I${MAKESRCPATH}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user