Date: Mon, 18 Apr 2011 21:47:00 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: Alexander Kabaev <kabaev@gmail.com> Cc: "arch@freebsd.org" <arch@freebsd.org>, "current@freebsd.org" <current@freebsd.org> Subject: Re: Removal of ICC (intel compiler) bits from mk Message-ID: <4DAC9534.60009@FreeBSD.org> In-Reply-To: <20110418103416.76b07b36@kan.dnsalias.net> References: <4DAC3FD9.1060603@FreeBSD.org> <20110418103416.76b07b36@kan.dnsalias.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------080709080509050705050302
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
On 2011-04-18 16:34, Alexander Kabaev wrote:
...
>> Please review the attached patch, which cleans up the ICC bits.
> You probably also want to remove the code that uses __INTEL_COMPILER
> in source tree if you want to be really thorough.
Ok, new patch attached. Some of the contributed sources also contain
instances of __INTEL_COMPILER, but these are all from upstream, so I
left them in.
--------------080709080509050705050302
Content-Type: text/plain;
name="remove-icc-2.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="remove-icc-2.diff"
diff --git a/include/stdbool.h b/include/stdbool.h
index c0d6459..c0ce8bb 100644
--- a/include/stdbool.h
+++ b/include/stdbool.h
@@ -37,7 +37,7 @@
#define true 1
#define bool _Bool
-#if __STDC_VERSION__ < 199901L && __GNUC__ < 3 && !defined(__INTEL_COMPILER)
+#if __STDC_VERSION__ < 199901L && __GNUC__ < 3
typedef int _Bool;
#endif
diff --git a/include/stdlib.h b/include/stdlib.h
index 3c48f17..c212cde 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -228,7 +228,7 @@ extern void (*_malloc_message)(const char *, const char *, const char *,
* programs which use it will fail to link when compiled with non-GNU
* compilers.
*/
-#if __GNUC__ >= 2 || defined(__INTEL_COMPILER)
+#if __GNUC__ >= 2
#undef alloca /* some GNU bits try to get cute and define this on their own */
#define alloca(sz) __builtin_alloca(sz)
#elif defined(lint)
diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h
index 8ad13ed..8c229e5 100644
--- a/lib/msun/src/math.h
+++ b/lib/msun/src/math.h
@@ -34,11 +34,11 @@ extern const union __nan_un {
float __uf;
} __nan;
-#if __GNUC_PREREQ__(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
+#if __GNUC_PREREQ__(3, 3)
#define __MATH_BUILTIN_CONSTANTS
#endif
-#if __GNUC_PREREQ__(3, 0) && !defined(__INTEL_COMPILER)
+#if __GNUC_PREREQ__(3, 0)
#define __MATH_BUILTIN_RELOPS
#endif
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}
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..db244c4 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,36 +76,31 @@ 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"
+. if ${MACHINE_CPUARCH} != "mips"
CFLAGS+= --param inline-unit-growth=100
CFLAGS+= --param large-function-growth=1000
-.else
+. else
# XXX Actually a gross hack just for Octeon because of the Simple Executive.
CFLAGS+= --param inline-unit-growth=10000
CFLAGS+= --param large-function-growth=100000
CFLAGS+= --param max-inline-insns-single=10000
-.endif
+. 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
+. if ${PROFLEVEL} >= 2
CFLAGS+= -DGPROF4 -DGUPROF
PROF= -pg -mprofiler-epilogue
-.else
+. else
PROF= -pg
-.endif
+. endif
.endif
DEFINED_PROF= ${PROF}
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
+.endif
WERROR?= -Werror
-.endif
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}
diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile
index c077285..b8352d6 100644
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
@@ -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}
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index c0e92d6..3984049 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -54,11 +54,7 @@ __FBSDID("$FreeBSD$");
#undef ADDCARRY
#define ADDCARRY(x) if ((x) > 0xffff) (x) -= 0xffff
-/*
- * icc needs to be special cased here, as the asm code below results
- * in broken code if compiled with icc.
- */
-#if !defined(__GNUCLIKE_ASM) || defined(__INTEL_COMPILER)
+#if !defined(__GNUCLIKE_ASM)
/* non gcc parts stolen from sys/alpha/alpha/in_cksum.c */
#define REDUCE32 \
{ \
@@ -75,7 +71,7 @@ __FBSDID("$FreeBSD$");
#endif
#define REDUCE {sum = (sum & 0xffff) + (sum >> 16); ADDCARRY(sum);}
-#if !defined(__GNUCLIKE_ASM) || defined(__INTEL_COMPILER)
+#if !defined(__GNUCLIKE_ASM)
static const u_int32_t in_masks[] = {
/*0 bytes*/ /*1 byte*/ /*2 bytes*/ /*3 bytes*/
0x00000000, 0x000000FF, 0x0000FFFF, 0x00FFFFFF, /* offset 0 */
diff --git a/sys/i386/include/in_cksum.h b/sys/i386/include/in_cksum.h
index c692f69..35c6577 100644
--- a/sys/i386/include/in_cksum.h
+++ b/sys/i386/include/in_cksum.h
@@ -53,7 +53,7 @@
* in the normal case (where there are no options and the header length is
* therefore always exactly five 32-bit words.
*/
-#if defined(__GNUCLIKE_ASM) && !defined(__INTEL_COMPILER)
+#if defined(__GNUCLIKE_ASM)
static __inline u_int
in_cksum_hdr(const struct ip *ip)
{
@@ -131,7 +131,7 @@ in_pseudo(u_int sum, u_int b, u_int c)
#endif
#ifdef _KERNEL
-#if !defined(__GNUCLIKE_ASM) || defined(__INTEL_COMPILER)
+#if !defined(__GNUCLIKE_ASM)
u_int in_cksum_hdr(const struct ip *ip);
u_short in_addword(u_short sum, u_short b);
u_short in_pseudo(u_int sum, u_int b, u_int c);
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index dbab329..15bcfe4 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -50,9 +50,9 @@
* having a compiler-agnostic source tree.
*/
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
+#if defined(__GNUC__)
-#if __GNUC__ >= 3 || defined(__INTEL_COMPILER)
+#if __GNUC__ >= 3
#define __GNUCLIKE_ASM 3
#define __GNUCLIKE_MATH_BUILTIN_CONSTANTS
#else
@@ -62,17 +62,11 @@
#define __GNUCLIKE___OFFSETOF 1
#define __GNUCLIKE___SECTION 1
-#ifndef __INTEL_COMPILER
-# define __GNUCLIKE_CTOR_SECTION_HANDLING 1
-#endif
+#define __GNUCLIKE_CTOR_SECTION_HANDLING 1
#define __GNUCLIKE_BUILTIN_CONSTANT_P 1
-# if defined(__INTEL_COMPILER) && defined(__cplusplus) \
- && __INTEL_COMPILER < 800
-# undef __GNUCLIKE_BUILTIN_CONSTANT_P
-# endif
-#if (__GNUC_MINOR__ > 95 || __GNUC__ >= 3) && !defined(__INTEL_COMPILER)
+#if __GNUC_MINOR__ > 95 || __GNUC__ >= 3
# define __GNUCLIKE_BUILTIN_VARARGS 1
# define __GNUCLIKE_BUILTIN_STDARG 1
# define __GNUCLIKE_BUILTIN_VAALIST 1
@@ -82,10 +76,8 @@
# define __GNUC_VA_LIST_COMPATIBILITY 1
#endif
-#ifndef __INTEL_COMPILER
-# define __GNUCLIKE_BUILTIN_NEXT_ARG 1
-# define __GNUCLIKE_MATH_BUILTIN_RELOPS
-#endif
+#define __GNUCLIKE_BUILTIN_NEXT_ARG 1
+#define __GNUCLIKE_MATH_BUILTIN_RELOPS
#define __GNUCLIKE_BUILTIN_MEMCPY 1
@@ -101,12 +93,12 @@
#define __CC_SUPPORTS_DYNAMIC_ARRAY_INIT 1
-#endif /* __GNUC__ || __INTEL_COMPILER */
+#endif /* __GNUC__ */
/*
* Macro to test if we're using a specific version of gcc or later.
*/
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+#if defined(__GNUC__)
#define __GNUC_PREREQ__(ma, mi) \
(__GNUC__ > (ma) || __GNUC__ == (ma) && __GNUC_MINOR__ >= (mi))
#else
@@ -187,12 +179,12 @@
#define __aligned(x)
#define __section(x)
#else
-#if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER)
+#if !__GNUC_PREREQ__(2, 5)
#define __dead2
#define __pure2
#define __unused
#endif
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7 && !defined(__INTEL_COMPILER)
+#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7
#define __dead2 __attribute__((__noreturn__))
#define __pure2 __attribute__((__const__))
#define __unused
@@ -207,15 +199,6 @@
#define __aligned(x) __attribute__((__aligned__(x)))
#define __section(x) __attribute__((__section__(x)))
#endif
-#if defined(__INTEL_COMPILER)
-#define __dead2 __attribute__((__noreturn__))
-#define __pure2 __attribute__((__const__))
-#define __unused __attribute__((__unused__))
-#define __used __attribute__((__used__))
-#define __packed __attribute__((__packed__))
-#define __aligned(x) __attribute__((__aligned__(x)))
-#define __section(x) __attribute__((__section__(x)))
-#endif
#endif
#if __GNUC_PREREQ__(2, 96)
@@ -226,7 +209,7 @@
#define __pure
#endif
-#if __GNUC_PREREQ__(3, 1) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
+#if __GNUC_PREREQ__(3, 1)
#define __always_inline __attribute__((__always_inline__))
#else
#define __always_inline
@@ -245,11 +228,11 @@
#endif
/* XXX: should use `#if __STDC_VERSION__ < 199901'. */
-#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
+#if !__GNUC_PREREQ__(2, 7)
#define __func__ NULL
#endif
-#if (defined(__INTEL_COMPILER) || (defined(__GNUC__) && __GNUC__ >= 2)) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901
+#if (defined(__GNUC__) && __GNUC__ >= 2) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901
#define __LONG_LONG_SUPPORTED
#endif
@@ -336,7 +319,7 @@
* that are known to support the features properly (old versions of gcc-2
* didn't permit keeping the keywords out of the application namespace).
*/
-#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
+#if !__GNUC_PREREQ__(2, 7)
#define __printflike(fmtarg, firstvararg)
#define __scanflike(fmtarg, firstvararg)
#define __format_arg(fmtarg)
@@ -349,18 +332,16 @@
#endif
/* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
-#if __FreeBSD_cc_version >= 300001 && defined(__GNUC__) && !defined(__INTEL_COMPILER)
+#if __FreeBSD_cc_version >= 300001 && defined(__GNUC__)
#define __printf0like(fmtarg, firstvararg) \
__attribute__((__format__ (__printf0__, fmtarg, firstvararg)))
#else
#define __printf0like(fmtarg, firstvararg)
#endif
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-#ifndef __INTEL_COMPILER
+#if defined(__GNUC__)
#define __strong_reference(sym,aliassym) \
extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)))
-#endif
#ifdef __STDC__
#define __weak_reference(sym,alias) \
__asm__(".weak " #alias); \
@@ -386,12 +367,12 @@
#define __sym_default(impl,sym,verid) \
__asm__(".symver impl, sym@@verid")
#endif /* __STDC__ */
-#endif /* __GNUC__ || __INTEL_COMPILER */
+#endif /* __GNUC__ */
#define __GLOBL1(sym) __asm__(".globl " #sym)
#define __GLOBL(sym) __GLOBL1(sym)
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
+#if defined(__GNUC__)
#define __IDSTRING(name,string) __asm__(".ident\t\"" string "\"")
#else
/*
diff --git a/usr.bin/csup/misc.h b/usr.bin/csup/misc.h
index a7ca3a6..9303f4a 100644
--- a/usr.bin/csup/misc.h
+++ b/usr.bin/csup/misc.h
@@ -60,11 +60,8 @@
#undef __packed
#define __packed __attribute__((__packed__))
-/* We explicitely don't define this with icc because it defines __GNUC__
- but doesn't support it. */
#undef __printflike
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
- (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC__MINOR__ >= 7)
+#if defined(__GNUC__) && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC__MINOR__ >= 7)
#define __printflike(fmtarg, firstvararg) \
__attribute__((__format__ (__printf__, fmtarg, firstvararg)))
#else
--------------080709080509050705050302--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4DAC9534.60009>