Date: Tue, 6 Nov 2012 15:58:45 -0500 From: Eitan Adler <lists@eitanadler.com> To: freebsd-arch@freebsd.org Cc: Alexander Leidinger <netchild@freebsd.org>, bde@freebsd.org Subject: removing support for ICC?? Message-ID: <CAF6rxgmTGsg6JMp5tswDGE4TZNcjirMJ8aiKLcSfd-ehbp_WYg@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
Is there any reason to continue to keep the legacy __INTEL_COMPILER
conditional includes around?
Anyone have any objection against?
I tested this and I found that only the following differed:
-MD5 (/usr/obj/home/eitan/patchen/freebsd-head/sys/GENERIC/vers.o) =
fb34ba12ae401a00dcdccf3614b6e1a5
+MD5 (/usr/obj/home/eitan/patchen/freebsd-head/sys/GENERIC/vers.o) =
4cead614a48701968fcc0e1e00b1538c
-MD5 (/usr/obj/home/eitan/patchen/freebsd-head/sys/GENERIC/hpt27xx_config.o)
= 3fc71ae3e198661796846eb68c3ef1b0
+MD5 (/usr/obj/home/eitan/patchen/freebsd-head/sys/GENERIC/hpt27xx_config.o)
= e3b9f53df5c6d14e4be03ff750638bc5
The former due to changing git hashes. The latter due to a __TIME__ directive.
commit 00c0798d3074b4ed81c703499ede577913b83ba9
Author: Eitan Adler <lists@eitanadler.com>
Date: Tue Nov 6 15:00:48 2012 -0500
Remove references to __INTEL_COMPILER which has been been supported for
some time.
Reviewed by: scottl
Approved by: cperciva
MFC after: 1 month
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index ad6aefc..a19cd46 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
@@ -89,10 +83,8 @@
#define __compiler_membar() __asm __volatile(" " : : : "memory")
#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
@@ -108,12 +100,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
@@ -194,12 +186,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
@@ -214,15 +206,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, 95)
@@ -282,7 +265,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
@@ -312,12 +295,12 @@
#define __returns_twice
#endif
-/* XXX: should use `#if __STDC_VERSION__ < 199901'. */
+/* XXX: should use if __STDC_VERSION__ < 199901'. */
#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
#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
@@ -432,7 +415,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)
@@ -452,18 +435,16 @@
/* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 && \
- defined(__GNUC__) && !defined(__INTEL_COMPILER)
+ 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); \
@@ -489,12 +470,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
/*
--
Eitan Adler
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgmTGsg6JMp5tswDGE4TZNcjirMJ8aiKLcSfd-ehbp_WYg>