Bug 1259382 - Remove support for Intel C/C++ compiler. r?ted
--- a/build/autoconf/toolchain.m4
+++ b/build/autoconf/toolchain.m4
@@ -16,18 +16,16 @@ cat <<EOF > conftest.c
COMPILER clang-cl _MSC_VER
#else
COMPILER msvc _MSC_FULL_VER
#endif
#elif defined(__clang__)
COMPILER clang __clang_major__.__clang_minor__.__clang_patchlevel__
#elif defined(__GNUC__)
COMPILER gcc __GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__
-#elif defined(__INTEL_COMPILER)
-COMPILER icc __INTEL_COMPILER
#endif
EOF
read dummy compiler CC_VERSION <<EOF
$($CC -E $CPPFLAGS $CFLAGS conftest.c 2>/dev/null | grep COMPILER)
EOF
read dummy cxxcompiler CXX_VERSION <<EOF
$($CXX -E $CPPFLAGS $CXXFLAGS conftest.c 2>/dev/null | grep COMPILER)
EOF
@@ -63,23 +61,16 @@ if test "`echo | $LD -v 2>&1 | grep -c G
fi
if test "$compiler" = "msvc"; then
MSVC_VERSION_FULL="$CXX_VERSION"
CC_VERSION=`echo ${CC_VERSION} | cut -c 1-4`
CXX_VERSION=`echo ${CXX_VERSION} | cut -c 1-4`
fi
-INTEL_CC=
-INTEL_CXX=
-if test "$compiler" = "icc"; then
- INTEL_CC=1
- INTEL_CXX=1
-fi
-
CLANG_CC=
CLANG_CXX=
CLANG_CL=
if test "$compiler" = "clang"; then
GNU_CC=1
GNU_CXX=1
CLANG_CC=1
CLANG_CXX=1
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -926,23 +926,17 @@ case "$target" in
if test -z "$CLANG_CC"; then
MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS"
fi
# The Maemo builders don't know about this flag
MOZ_ARM_VFP_FLAGS="-mfpu=vfp"
;;
*-*linux*)
- # Note: both GNU_CC and INTEL_CC are set when using Intel's C compiler.
- # Similarly for GNU_CXX and INTEL_CXX.
- if test "$INTEL_CC" -o "$INTEL_CXX"; then
- # -Os has been broken on Intel's C/C++ compilers for quite a
- # while; Intel recommends against using it.
- MOZ_OPTIMIZE_FLAGS="-O2"
- elif test "$GNU_CC" -o "$GNU_CXX"; then
+ if test "$GNU_CC" -o "$GNU_CXX"; then
MOZ_PGO_OPTIMIZE_FLAGS="-O3"
MOZ_OPTIMIZE_FLAGS="-O3"
if test -z "$CLANG_CC"; then
MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS"
fi
fi
case "${target_cpu}" in
@@ -2397,23 +2391,16 @@ AC_MSG_RESULT([$result])
if test $result = "yes"; then
PROFILE_GEN_LDFLAGS="-fprofile-generate"
PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch"
PROFILE_USE_LDFLAGS="-fprofile-use"
fi
CFLAGS="$_SAVE_CFLAGS"
-if test -n "$INTEL_CC"; then
- PROFILE_GEN_CFLAGS="-prof-gen -prof-dir ."
- PROFILE_GEN_LDFLAGS=
- PROFILE_USE_CFLAGS="-prof-use -prof-dir ."
- PROFILE_USE_LDFLAGS=
-fi
-
AC_SUBST(PROFILE_GEN_CFLAGS)
AC_SUBST(PROFILE_GEN_LDFLAGS)
AC_SUBST(PROFILE_USE_CFLAGS)
AC_SUBST(PROFILE_USE_LDFLAGS)
AC_LANG_CPLUSPLUS
dnl ========================================================
--- a/old-configure.in
+++ b/old-configure.in
@@ -1332,23 +1332,17 @@ case "$target" in
MOZ_GFX_OPTIMIZE_MOBILE=1
MOZ_OPTIMIZE_FLAGS="-Os"
if test -z "$CLANG_CC"; then
MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS"
fi
;;
*-*linux*)
- # Note: both GNU_CC and INTEL_CC are set when using Intel's C compiler.
- # Similarly for GNU_CXX and INTEL_CXX.
- if test "$INTEL_CC" -o "$INTEL_CXX"; then
- # -Os has been broken on Intel's C/C++ compilers for quite a
- # while; Intel recommends against using it.
- MOZ_OPTIMIZE_FLAGS="-O2"
- elif test "$GNU_CC" -o "$GNU_CXX"; then
+ if test "$GNU_CC" -o "$GNU_CXX"; then
MOZ_PGO_OPTIMIZE_FLAGS="-O3"
MOZ_OPTIMIZE_FLAGS="-Os"
if test -z "$CLANG_CC"; then
MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS"
fi
fi
MOZ_MEMORY=1
@@ -6404,23 +6398,16 @@ AC_MSG_RESULT([$result])
if test $result = "yes"; then
PROFILE_GEN_LDFLAGS="-fprofile-generate"
PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch"
PROFILE_USE_LDFLAGS="-fprofile-use"
fi
CFLAGS="$_SAVE_CFLAGS"
-if test -n "$INTEL_CC"; then
- PROFILE_GEN_CFLAGS="-prof-gen -prof-dir ."
- PROFILE_GEN_LDFLAGS=
- PROFILE_USE_CFLAGS="-prof-use -prof-dir ."
- PROFILE_USE_LDFLAGS=
-fi
-
AC_SUBST(PROFILE_GEN_CFLAGS)
AC_SUBST(PROFILE_GEN_LDFLAGS)
AC_SUBST(PROFILE_USE_CFLAGS)
AC_SUBST(PROFILE_USE_LDFLAGS)
fi # ! SKIP_COMPILER_CHECKS
AC_DEFINE(CPP_THROW_NEW, [throw()])