diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2020-05-04 16:32:58 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2020-05-04 16:32:58 (GMT) |
commit | e49d4fd62f1f27d9dd5a41fc77013df858ff9ed8 (patch) | |
tree | cc4ecb594f86826a24f9250e2ad93ad569a7cf8d /config | |
parent | a4553b35e1e2dae2e5f99cfd2286b1c89f84b43d (diff) | |
download | hdf5-e49d4fd62f1f27d9dd5a41fc77013df858ff9ed8.zip hdf5-e49d4fd62f1f27d9dd5a41fc77013df858ff9ed8.tar.gz hdf5-e49d4fd62f1f27d9dd5a41fc77013df858ff9ed8.tar.bz2 |
Fix ifort warning flag.
Restore AC_DEFUN([PAC_PROG_FC_DEFAULT_REALisDBLE] in m4/aclocal_fc.m4.
Add --enable-symbols, --enable-profiling, and --enable-optimization
options to autotools configure; all configure flags for
--enable-production and --disable-production should match HDF5 1.10 and
1.12 production and debug default flags.
Diffstat (limited to 'config')
-rw-r--r-- | config/gnu-cxxflags | 33 | ||||
-rw-r--r-- | config/gnu-fflags | 27 | ||||
-rw-r--r-- | config/gnu-flags | 33 | ||||
-rw-r--r-- | config/intel-warnings/ifort-general | 2 |
4 files changed, 49 insertions, 46 deletions
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags index 99480c5..b2ef36d 100644 --- a/config/gnu-cxxflags +++ b/config/gnu-cxxflags @@ -121,27 +121,15 @@ if test "X-g++" = "X-$cxx_vendor"; then # C++-specific H5_CXXFLAGS="$H5_CXXFLAGS $arch" - ################ - # Optimization # - ################ - - if test $cxx_vers_major -le 4; then - HIGH_OPT_CXXFLAGS="-O3" - DEBUG_OPT_CXXFLAGS= - else - HIGH_OPT_CXXFLAGS="-O3" - DEBUG_OPT_CXXFLAGS="-Og" - fi - ############## # Production # ############## # NDEBUG is handled explicitly by the configure script if test $cxx_vers_major -le 4; then - PROD_CXXFLAGS=$HIGH_OPT_CXXFLAGS + PROD_CXXFLAGS= else - PROD_CXXFLAGS=$HIGH_OPT_CXXFLAGS "-fstdarg-opt" + PROD_CXXFLAGS="-fstdarg-opt" fi ######### @@ -151,9 +139,9 @@ if test "X-g++" = "X-$cxx_vendor"; then # NDEBUG is handled explicitly by the configure script # -g is handled by the symbols flags if test $cxx_vers_major -le 4; then - DEBUG_CXXFLAGS=$DEBUG_OPT_CXXFLAGS + DEBUG_CXXFLAGS= else - DEBUG_CXXFLAGS=$DEBUG_OPT_CXXFLAGS "-ftrapv -fno-common" + DEBUG_CXXFLAGS="-ftrapv -fno-common" fi ########### @@ -169,6 +157,19 @@ if test "X-g++" = "X-$cxx_vendor"; then PROFILE_CXXFLAGS="-pg" + ################ + # Optimization # + ################ + + if test $cxx_vers_major -le 4; then + HIGH_OPT_CXXFLAGS="-O3" + DEBUG_OPT_CXXFLAGS= + else + HIGH_OPT_CXXFLAGS="-O3" + DEBUG_OPT_CXXFLAGS="-Og" + fi + NO_OPT_CXXFLAGS="-O0" + ############ # Warnings # ############ diff --git a/config/gnu-fflags b/config/gnu-fflags index 07038ab..eb7a61d 100644 --- a/config/gnu-fflags +++ b/config/gnu-fflags @@ -89,23 +89,11 @@ if test "X-gfortran" = "X-$f9x_vendor"; then H5_FCFLAGS="$H5_FCFLAGS $arch" - ################ - # Optimization # - ################ - - if test $f9x_vers_major -le 4; then - HIGH_OPT_FCFLAGS="-O3" - DEBUG_OPT_FCFLAGS= - else - HIGH_OPT_FCFLAGS="-O3" - DEBUG_OPT_FCFLAGS="-Og" - fi - ############## # Production # ############## - PROD_FCFLAGS=$HIGH_OPT_FCFLAGS + PROD_FCFLAGS= ######### # Debug # @@ -130,6 +118,19 @@ if test "X-gfortran" = "X-$f9x_vendor"; then PROFILE_FCFLAGS="-pg" + ################ + # Optimization # + ################ + + if test $f9x_vers_major -le 4; then + HIGH_OPT_FCFLAGS="-O3" + DEBUG_OPT_FCFLAGS= + else + HIGH_OPT_FCFLAGS="-O3" + DEBUG_OPT_FCFLAGS="-Og" + fi + NO_OPT_FCFLAGS="-O0" + ############ # Warnings # ############ diff --git a/config/gnu-flags b/config/gnu-flags index d8a45a6..7e69ede 100644 --- a/config/gnu-flags +++ b/config/gnu-flags @@ -131,27 +131,15 @@ if test "X-gcc" = "X-$cc_vendor"; then H5_CFLAGS="$H5_CFLAGS $arch" - ################ - # Optimization # - ################ - - if test $cc_vers_major -le 4; then - HIGH_OPT_CFLAGS="-O3" - DEBUG_OPT_CFLAGS= - else - HIGH_OPT_CFLAGS="-O3" - DEBUG_OPT_CFLAGS="-Og" - fi - ############## # Production # ############## # NDEBUG is handled explicitly by the configure script if test $cc_vers_major -le 4; then - PROD_CFLAGS=$HIGH_OPT_CFLAGS + PROD_CFLAGS= else - PROD_CFLAGS=$HIGH_OPT_CFLAGS "-fstdarg-opt" + PROD_CFLAGS="-fstdarg-opt" fi ######### @@ -161,9 +149,9 @@ if test "X-gcc" = "X-$cc_vendor"; then # NDEBUG is handled explicitly by the configure script # -g is handled by the symbols flags if test $cc_vers_major -le 4; then - DEBUG_CFLAGS=$DEBUG_OPT_CFLAGS + DEBUG_CFLAGS= else - DEBUG_CFLAGS=$DEBUG_OPT_CFLAGS "-ftrapv -fno-common" + DEBUG_CFLAGS="-ftrapv -fno-common" fi ########### @@ -179,6 +167,19 @@ if test "X-gcc" = "X-$cc_vendor"; then PROFILE_CFLAGS="-pg" + ################ + # Optimization # + ################ + + if test $cc_vers_major -le 4; then + HIGH_OPT_CFLAGS="-O3" + DEBUG_OPT_CFLAGS= + else + HIGH_OPT_CFLAGS="-O3" + DEBUG_OPT_CFLAGS="-Og" + fi + NO_OPT_CFLAGS="-O0" + ############ # Warnings # ############ diff --git a/config/intel-warnings/ifort-general b/config/intel-warnings/ifort-general index a9da0e5..1644c7c 100644 --- a/config/intel-warnings/ifort-general +++ b/config/intel-warnings/ifort-general @@ -1 +1 @@ --warn:all +-warn all |