@@ -1090,8 +1090,8 @@ AC_CACHE_CHECK([for CC compiler name], [ac_cv_cc_name], [
10901090cat > conftest.c <<EOF
10911091#if defined(__EMSCRIPTEN__)
10921092 emcc
1093- #elif defined(__INTEL_COMPILER ) || defined(__ICC )
1094- icc
1093+ #elif defined(__INTEL_CLANG_COMPILER ) || defined(__INTEL_LLVM_COMPILER )
1094+ icx
10951095#elif defined(__ibmxl__) || defined(__xlc__) || defined(__xlC__)
10961096 xlc
10971097#elif defined(_MSC_VER)
@@ -1139,8 +1139,8 @@ then
11391139 case "$ac_cv_cc_name" in
11401140 gcc) AC_PATH_TOOL ( [ CXX] , [ g++] , [ notfound] ) ;;
11411141 cc) AC_PATH_TOOL ( [ CXX] , [ c++] , [ notfound] ) ;;
1142- clang) AC_PATH_TOOL ( [ CXX] , [ clang++] , [ notfound] ) ;;
1143- icc ) AC_PATH_TOOL ( [ CXX] , [ icpc ] , [ notfound] ) ;;
1142+ clang) AC_PATH_TOOL ( [ CXX] , [ clang++] , [ notfound] ) ;;
1143+ icx ) AC_PATH_TOOL ( [ CXX] , [ icpx ] , [ notfound] ) ;;
11441144 esac
11451145 if test "$CXX" = "notfound"
11461146 then
20852085LLVM_PROF_ERR=no
20862086
20872087case "$ac_cv_cc_name" in
2088- clang)
2088+ clang|icx )
20892089 # Any changes made here should be reflected in the GCC+Darwin case below
20902090 PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
20912091 PGO_PROF_USE_FLAG="-fprofile-instr-use=\"\$(shell pwd)/code.profclangd\""
@@ -2135,12 +2135,6 @@ case "$ac_cv_cc_name" in
21352135 LLVM_PROF_MERGER="true"
21362136 LLVM_PROF_FILE=""
21372137 ;;
2138- icc)
2139- PGO_PROF_GEN_FLAG="-prof-gen"
2140- PGO_PROF_USE_FLAG="-prof-use"
2141- LLVM_PROF_MERGER="true"
2142- LLVM_PROF_FILE=""
2143- ;;
21442138esac
21452139
21462140# BOLT optimization. Always configured after PGO since it always runs after PGO.
@@ -2667,11 +2661,7 @@ AS_VAR_IF([ac_cv_gcc_compat], [yes], [
26672661 AS_VAR_IF ( [ ac_cv_no_strict_aliasing] , [ yes] ,
26682662 [ BASECFLAGS="$BASECFLAGS -fno-strict-aliasing"] )
26692663
2670- # ICC doesn't recognize the option, but only emits a warning
2671- ## XXX does it emit an unused result warning and can it be disabled?
2672- AS_CASE ( [ "$ac_cv_cc_name"] ,
2673- [ icc] , [ ac_cv_disable_unused_result_warning=no]
2674- [ PY_CHECK_CC_WARNING([ disable] , [ unused-result] )] )
2664+ PY_CHECK_CC_WARNING([ disable] , [ unused-result] )
26752665 AS_VAR_IF ( [ ac_cv_disable_unused_result_warning] , [ yes] ,
26762666 [ BASECFLAGS="$BASECFLAGS -Wno-unused-result"
26772667 CFLAGS_NODIST="$CFLAGS_NODIST -Wno-unused-result"] )
@@ -2967,9 +2957,9 @@ case "$ac_cv_cc_name" in
29672957mpicc)
29682958 CFLAGS_NODIST="$CFLAGS_NODIST"
29692959 ;;
2970- icc )
2971- # ICC needs - fp-model strict or floats behave badly
2972- CFLAGS_NODIST="$CFLAGS_NODIST -fp -model strict "
2960+ icx )
2961+ # ICX needs fp-model=precise (the default in clang) or floats behave badly
2962+ CFLAGS_NODIST="$CFLAGS_NODIST -ffp -model=precise "
29732963 ;;
29742964xlc)
29752965 CFLAGS_NODIST="$CFLAGS_NODIST -qalias=noansi -qmaxmem=-1"
@@ -6296,7 +6286,7 @@ AX_C_FLOAT_WORDS_BIGENDIAN(
62966286# rounding precision of 64 bits. For gcc/x86, we can fix this by
62976287# using inline assembler to get and set the x87 FPU control word.
62986288
6299- # This inline assembler syntax may also work for suncc and icc ,
6289+ # This inline assembler syntax may also work for suncc and icx ,
63006290# so we try it on all platforms.
63016291
63026292AC_CACHE_CHECK ( [ whether we can use gcc inline assembler to get and set x87 control word] , [ ac_cv_gcc_asm_for_x87] , [
0 commit comments