Bug 1259382 - Remove support for Intel C/C++ compiler. r=ted

build/autoconf/toolchain.m4

@@ -21,8 +21,6 @@ COMPILER msvc _MSC_FULL_VER
 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
@@ -68,13 +66,6 @@ if test "$compiler" = "msvc"; then
      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=

js/src/old-configure.in

@@ -930,13 +930,7 @@ case "$target" in
     ;;
 
 *-*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
@@ -2400,13 +2394,6 @@ 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)

old-configure.in

@@ -1336,13 +1336,7 @@ case "$target" in
     ;;
 
 *-*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
@@ -6394,13 +6388,6 @@ 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)