summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/apple21
-rw-r--r--config/intel-flags14
2 files changed, 28 insertions, 7 deletions
diff --git a/config/apple b/config/apple
index 10674fb..babcdad 100644
--- a/config/apple
+++ b/config/apple
@@ -62,6 +62,11 @@ case $CC in
grep 'GCC' | sed 's/.*\((GCC) [-a-z0-9\. ]*.*\)/\1/'`
;;
+ *icc*)
+ cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -V 2>&1 | grep 'Version' |\
+ sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
+ ;;
+
*)
echo "No match to get cc_version_info for $CC"
;;
@@ -72,6 +77,16 @@ case $FC in
fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\
grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
;;
+
+ *ifc*|*ifort*)
+ fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\
+ sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
+ ;;
+
+ *)
+ echo "No match to get fc_version_info for $FC"
+ ;;
+
esac
# get c++ version info
@@ -80,6 +95,12 @@ case $CXX in
cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\
grep 'GCC' | sed 's/.*\((GCC) [-a-z0-9\. ]*.*\)/\1/'`
;;
+
+ *icpc*)
+ cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\
+ sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
+ ;;
+
*)
echo "No match to get cxx_version_info for $CXX"
;;
diff --git a/config/intel-flags b/config/intel-flags
index 5bf06d4..e6a9c31 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -70,13 +70,8 @@ if test "X-icc" = "X-$cc_vendor"; then
# Default to C99 standard.
H5_CFLAGS="${H5_CFLAGS:--std=c99 $arch}"
- # Production
- # -Wl,-s to remove all symbols for smaller file
- # O3 optimization causes compilation failures on many platforms;
- # the problem exists in all versions of the icc compiler up to the latest 9.1
- # I changed optimization flag to default -O2. EIP, 2006-08-15
- #PROD_CFLAGS="-O3 -Wl,-s"
- PROD_CFLAGS="-O2 -Wl,-s"
+ # Production is set to default; see settings for specific version further down
+ PROD_CFLAGS="-O"
PROD_CPPFLAGS=
# Debug
@@ -98,6 +93,11 @@ fi
# Please follow the pattern below by adding new versions at the top, copying
# the information from the previous version and adding modifications to that.
case "$cc_vendor-$cc_version" in
+ icc-11*)
+ # -s became obsolete; we also fixed bugs that allow us to enable higher level
+ # of optimization starting with 1.8.7
+ PROD_CFLAGS="-O3"
+ ;;
icc-10*)
PROD_CFLAGS="-O1 -Wl,-s"
;;