summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/gnu-cxxflags2
-rw-r--r--config/intel-cxxflags25
-rw-r--r--config/intel-fflags2
-rw-r--r--config/intel-flags19
-rw-r--r--config/intel-warnings/general1
-rw-r--r--config/intel-warnings/general-192
-rw-r--r--config/pgi-cxxflags23
-rw-r--r--config/pgi-fflags64
-rw-r--r--config/pgi-flags22
9 files changed, 111 insertions, 49 deletions
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags
index f63c1dc..9f11406 100644
--- a/config/gnu-cxxflags
+++ b/config/gnu-cxxflags
@@ -271,7 +271,7 @@ if test "X-g++" = "X-$cxx_vendor"; then
# no cxx warnings, do NOT use C warnings
# gcc >= 10
- if test $cc_vers_major -ge 10; then
+ if test $cxx_vers_major -ge 10; then
# Use the C warnings as CXX warnings are the same
DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments developer-10)"
fi
diff --git a/config/intel-cxxflags b/config/intel-cxxflags
index 900bcb9..107b087 100644
--- a/config/intel-cxxflags
+++ b/config/intel-cxxflags
@@ -94,7 +94,7 @@ if test "X-icpc" = "X-$cxx_vendor"; then
# Debug #
#########
- # NDEBUG is handled explicitly by the configure script
+ # NDEBUG is handled explicitly in configure
# -g is handled by the symbols flags
DEBUG_CXXFLAGS=
@@ -123,19 +123,19 @@ if test "X-icpc" = "X-$cxx_vendor"; then
# Warnings #
############
-# First load the C warnings then add CXX warnings (if needed)
-
###########
# General #
###########
# Add various general warning flags in intel-warnings.
+ # Use the C warnings as CXX warnings are the same
H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments general)"
######################
# Developer warnings #
######################
+ # Use the C warnings as CXX warnings are the same
#NO_DEVELOPER_WARNING_CXXFLAGS=$(load_intel_arguments no-developer-general)
#DEVELOPER_WARNING_CXXFLAGS=$(load_intel_arguments developer-general)
@@ -144,21 +144,34 @@ if test "X-icpc" = "X-$cxx_vendor"; then
#############################
# intel == 8.0
- if test $cc_vers_major -eq 8 -a $cc_vers_minor -eq 0; then
+ if test $cxx_vers_major -eq 8 -a $cxx_vers_minor -eq 0; then
# v8.0 -O3 infinite loops when compiling test/tselect.c. Use -O2.
HIGH_OPT_CFLAGS="-O2"
fi
# intel == 10
- if test $cc_vers_major -eq 10; then
+ if test $cxx_vers_major -eq 10; then
HIGH_OPT_CFLAGS="-O1"
fi
# intel >= 15
- if test $cc_vers_major -ge 15; then
+ if test $cxx_vers_major -ge 15; then
+ # Use the C warnings as CXX warnings are the same
H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments 15)"
fi
+ # intel >= 18
+ if test $cxx_vers_major -ge 18; then
+ # Use the C warnings as CXX warnings are the same
+ H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments 18)"
+ fi
+
+ # intel <= 19
+ if test $cxx_vers_major -le 19; then
+ # Use the C warnings as CXX warnings are the same
+ H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments general-19)"
+ fi
+
#################
# Flags are set #
#################
diff --git a/config/intel-fflags b/config/intel-fflags
index 2dcd901..42c1781 100644
--- a/config/intel-fflags
+++ b/config/intel-fflags
@@ -56,7 +56,6 @@ if test X = "X$f9x_flags_set"; then
fi
fi
-# Common Intel flags for various situations
if test "X-ifort" = "X-$f9x_vendor"; then
FC_BASENAME=ifort
@@ -116,7 +115,6 @@ if test "X-ifort" = "X-$f9x_vendor"; then
DEBUG_OPT_FCFLAGS=
NO_OPT_FCFLAGS=
-
############
# Warnings #
############
diff --git a/config/intel-flags b/config/intel-flags
index fa317ab..f46da0a 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -78,14 +78,17 @@ if test "X-icc" = "X-$cc_vendor"; then
# ;;
#esac
- # General
+ ###########
+ # General #
+ ###########
+
# Default to C99 standard.
H5_CFLAGS="$H5_CFLAGS $arch -std=c99"
##############
# Production #
##############
-
+
PROD_CFLAGS=
#########
@@ -154,6 +157,17 @@ if test "X-icc" = "X-$cc_vendor"; then
H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments 15)"
fi
+ # intel >= 18
+ if test $cc_vers_major -ge 18; then
+ H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments 18)"
+ fi
+
+ # intel <= 19
+ # this file has warnings only available before oneapi versions
+ if test $cc_vers_major -le 19; then
+ H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments general-19)"
+ fi
+
#################
# Flags are set #
#################
@@ -165,4 +179,3 @@ if test "X-$cc_flags_set" = "X-"; then
cc_vendor=
cc_version=
fi
-
diff --git a/config/intel-warnings/general b/config/intel-warnings/general
index d0b2e25..bd866b6 100644
--- a/config/intel-warnings/general
+++ b/config/intel-warnings/general
@@ -1,2 +1 @@
-Wall
--Wcheck \ No newline at end of file
diff --git a/config/intel-warnings/general-19 b/config/intel-warnings/general-19
new file mode 100644
index 0000000..e35af30
--- /dev/null
+++ b/config/intel-warnings/general-19
@@ -0,0 +1,2 @@
+# this is only available before oneapi versions
+-Wcheck
diff --git a/config/pgi-cxxflags b/config/pgi-cxxflags
index 3b87db2..7d8bdeb 100644
--- a/config/pgi-cxxflags
+++ b/config/pgi-cxxflags
@@ -1,4 +1,4 @@
-# -*- shell-script -*-
+# -*- shell-script -*-
#
# Copyright by The HDF Group.
# All rights reserved.
@@ -44,21 +44,24 @@ fi
# Common PGI flags for various situations
if test "X-pgc++" = "X-$cxx_vendor"; then
- # C++-specific
+ ###########
+ # General #
+ ###########
+
+ # Default to C++11 standard
H5_CXXFLAGS="$H5_CXXFLAGS -std=c++11 -Minform=warn"
##############
# Production #
##############
- # NDEBUG is handled explicitly by the configure script
- PROD_CXXFLAGS="-fast"
+ PROD_CXXFLAGS=
#########
# Debug #
#########
- # NDEBUG is handled explicitly by the configure script
+ # NDEBUG is handled explicitly in configure
# -g is handled by the symbols flags
DEBUG_CXXFLAGS="-Mbounds"
@@ -66,8 +69,8 @@ if test "X-pgc++" = "X-$cxx_vendor"; then
# Symbols #
###########
- SYMBOLS_CXXFLAGS="-g"
NO_SYMBOLS_CXXFLAGS="-s"
+ SYMBOLS_CXXFLAGS="-g"
#############
# Profiling #
@@ -85,12 +88,14 @@ if test "X-pgc++" = "X-$cxx_vendor"; then
DEBUG_OPT_CXXFLAGS="-gopt -O2"
NO_OPT_CXXFLAGS="-O0"
- # Flags are set
+ #################
+ # Flags are set #
+ #################
cxx_flags_set=yes
fi
# Clear cxx info if no flags set
if test "X-$cxx_flags_set" = "X-"; then
- cxx_vendor=
- cxx_version=
+ cxx_vendor=
+ cxx_version=
fi
diff --git a/config/pgi-fflags b/config/pgi-fflags
index 3171695..6401d8d 100644
--- a/config/pgi-fflags
+++ b/config/pgi-fflags
@@ -1,4 +1,4 @@
-# -*- shell-script -*-
+# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
@@ -45,11 +45,12 @@ fi
# Common PGI flags for various situations
if test "X-pgf90" = "X-$f9x_vendor"; then
- # Insert section about version specific problems from gnu-flags here, if
- # necessary.
+
+ ###############################
+ # Architecture-specific flags #
+ ###############################
arch=
- # Architecture-specific flags
# Nothing currently. (Uncomment code below and modify to add any)
#case "$host_os-$host_cpu" in
# *-i686)
@@ -65,15 +66,10 @@ if test "X-pgf90" = "X-$f9x_vendor"; then
# ;;
#esac
- # General
- FC_BASENAME=pgf90
- Fortran_COMPILER_ID=PGI
- F9XSUFFIXFLAG=""
- FSEARCH_DIRS=""
- # Uncomment the following to add something specific for FCFLAGS.
- #FCFLAGS="$FCFLAGS"
+ ##############
+ # Production #
+ ##############
- # Production
# Check for MPI wrapper being used and tweak down compiler options
# Comment out the Tweaking since it caused problems to mpich1.2.6.
# Need to investigate the reasons to tweak.
@@ -84,24 +80,55 @@ if test "X-pgf90" = "X-$f9x_vendor"; then
#fi
PROD_FCFLAGS="-fast -Mnoframe"
- # Debug
+ #########
+ # Debug #
+ #########
+
DEBUG_FCFLAGS="-Mbounds -Mchkptr -Mdclchk"
- # Symbols
- SYMBOLS_FCFLAGS="-g"
+ ###########
+ # Symbols #
+ ###########
+
NO_SYMBOLS_FCFLAGS="-s"
+ SYMBOLS_FCFLAGS="-g"
+
+ #############
+ # Profiling #
+ #############
- # Profiling
PROFILE_FCFLAGS="-Mprof=func,line"
# Use this for profiling with gprof
#PROFILE_FCFLAGS="-pg"
- # Optimization
+ ################
+ # Optimization #
+ ################
+
HIGH_OPT_FCFLAGS=
DEBUG_OPT_FCFLAGS=
NO_OPT_FCFLAGS=
- # Flags are set
+ ############
+ # Warnings #
+ ############
+
+ ###########
+ # General #
+ ###########
+
+ FC_BASENAME=pgf90
+ Fortran_COMPILER_ID=PGI
+ F9XSUFFIXFLAG=""
+ FSEARCH_DIRS=""
+ # Uncomment the following to add something specific for FCFLAGS.
+ #FCFLAGS="$FCFLAGS"
+
+
+
+ #################
+ # Flags are set #
+ #################
f9x_flags_set=yes
fi
@@ -111,4 +138,3 @@ if test "X-$f9x_flags_set" = "X-"; then
f9x_version=
fi
-
diff --git a/config/pgi-flags b/config/pgi-flags
index 24c7174..b197a1c 100644
--- a/config/pgi-flags
+++ b/config/pgi-flags
@@ -1,4 +1,4 @@
-# -*- shell-script -*-
+# -*- shell-script -*-
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
@@ -45,8 +45,8 @@ fi
# Common PGI flags for various situations
if test "X-pgcc" = "X-$cc_vendor"; then
- # Insert section about version specific problems from gnu-flags here, if
- # necessary.
+ # Insert section about version specific problems from compiler flags here,
+ # if necessary.
arch=
# Architecture-specific flags
@@ -65,7 +65,11 @@ if test "X-pgcc" = "X-$cc_vendor"; then
# ;;
#esac
- # General
+ ###########
+ # General #
+ ###########
+
+ # Default to C99 standard.
H5_CFLAGS="$H5_CFLAGS $arch -c99 -Minform=warn"
##############
@@ -87,8 +91,8 @@ if test "X-pgcc" = "X-$cc_vendor"; then
# Symbols #
###########
- SYMBOLS_CFLAGS="-g"
NO_SYMBOLS_CFLAGS="-s"
+ SYMBOLS_CFLAGS="-g"
#############
# Profiling #
@@ -106,12 +110,14 @@ if test "X-pgcc" = "X-$cc_vendor"; then
DEBUG_OPT_CFLAGS="-gopt -O2"
NO_OPT_CFLAGS="-O0"
- # Flags are set
+ #################
+ # Flags are set #
+ #################
cc_flags_set=yes
fi
# Clear cc info if no flags set
if test "X-$cc_flags_set" = "X-"; then
- cc_vendor=
- cc_version=
+ cc_vendor=
+ cc_version=
fi