From 7739612291596e0561f90b26af1929a588e63f11 Mon Sep 17 00:00:00 2001
From: Dana Robinson <43805+derobins@users.noreply.github.com>
Date: Thu, 3 Jun 2021 09:51:25 -0700
Subject: Adds an Intel C++ configuration file (#716)

* Adds an Intel C++ configuration file

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 MANIFEST                 |   1 +
 config/intel-cxxflags    | 128 +++++++++++++++++++++++++++++++++++++++++++++++
 config/linux-gnulibc1    |   4 ++
 release_docs/RELEASE.txt |   8 +++
 4 files changed, 141 insertions(+)
 create mode 100644 config/intel-cxxflags

diff --git a/MANIFEST b/MANIFEST
index 7e166bb..f82d295 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -135,6 +135,7 @@
 ./config/cygwin
 ./config/ibm-aix
 ./config/ibm-flags
+./config/intel-cxxflags
 ./config/intel-fflags
 ./config/intel-flags
 ./config/libhdf5.pc.in
diff --git a/config/intel-cxxflags b/config/intel-cxxflags
new file mode 100644
index 0000000..3ef172f
--- /dev/null
+++ b/config/intel-cxxflags
@@ -0,0 +1,128 @@
+#                            -*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://www.hdfgroup.org/licenses.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# Intel icpc compiler or a derivative.  It is careful not to do anything
+# if the compiler is not Intel; otherwise `cxx_flags_set' is set to `yes'
+#
+
+# Get the compiler version in a way that works for icpc
+# icpc unless a compiler version is already known
+#
+#   cxx_vendor:    The compiler name: icpc
+#   cxx_version:   Version number: 8.0
+#
+if test X = "X$cxx_flags_set"; then
+    cxx_version="`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 |grep 'Version'`"
+    if test X != "X$cxx_version"; then
+        cxx_vendor=icpc
+        cxx_version=`echo $cxx_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`
+        echo "compiler '$CXX' is Intel $cxx_vendor-$cxx_version"
+
+        # Some version numbers
+        # Intel version numbers are of the form: "major.minor"
+        cxx_vers_major=`echo $cxx_version | cut -f1 -d.`
+        cxx_vers_minor=`echo $cxx_version | cut -f2 -d.`
+        #cxx_vers_patch=`echo $cxx_version | cut -f2 -d.`
+        test -n "$cxx_vers_major" || cxx_vers_major=0
+        test -n "$cxx_vers_minor" || cxx_vers_minor=0
+        test -n "$cxx_vers_patch" || cxx_vers_patch=0
+        cxx_vers_all=`expr $cxx_vers_major '*' 1000000 + $cxx_vers_minor '*' 1000 + $cxx_vers_patch`
+    fi
+fi
+
+# Common Intel flags for various situations
+if test "X-icpc" = "X-$cxx_vendor"; then
+    # Insert section about version specific problems from compiler flags here,
+    # if necessary.
+
+    arch=
+    # Architecture-specific flags
+    # Nothing currently. (Uncomment code below and modify to add any)
+    #case "$host_os-$host_cpu" in
+    #    *-i686)
+    #        arch="-march=i686"
+    #        ;;
+    #esac
+
+    # Host-specific flags
+    # Nothing currently. (Uncomment code below and modify to add any)
+    #case "`hostname`" in
+    #    sleipnir.ncsa.uiuc.edu)
+    #        arch="$arch -pipe"
+    #        ;;
+    #esac
+
+    ###########
+    # General #
+    ###########
+
+    # Default to C++11 standard
+    H5_CXXFLAGS="$H5_CXXFLAGS $arch -std=c++11"
+
+    ##############
+    # Production #
+    ##############
+
+    PROD_CXXFLAGS=
+
+    #########
+    # Debug #
+    #########
+
+    # NDEBUG is handled explicitly by the configure script
+    # -g is handled by the symbols flags
+    DEBUG_CXXFLAGS=
+
+    ###########
+    # Symbols #
+    ###########
+
+    SYMBOLS_CXXFLAGS="-g"
+    NO_SYMBOLS_CXXFLAGS="-Wl,-s"
+
+    #############
+    # Profiling #
+    #############
+
+    # Use this for profiling with gprof
+    PROFILE_CXXFLAGS="-p"
+
+    ################
+    # Optimization #
+    ################
+
+    HIGH_OPT_CXXFLAGS="-O3"
+    DEBUG_OPT_CXXFLAGS="-O0"
+    NO_OPT_CXXFLAGS="-O0"
+
+    ############
+    # Warnings #
+    ############
+
+    #############################
+    # Version-specific warnings #
+    #############################
+
+    #################
+    # Flags are set #
+    #################
+    cxx_flags_set=yes
+
+fi
+
+# Clear cc info if no flags set
+if test "X-$cxx_flags_set" = "X-"; then
+    cxx_vendor=
+    cxx_version=
+fi
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 1da2236..d952c4e 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -199,6 +199,10 @@ if test -z "$CXX"; then
   CXX_BASENAME=g++
 fi
 
+# Figure out Intel CXX compiler flags
+# Do this ahead of GNU to avoid icpc being detected as g++
+. $srcdir/config/intel-cxxflags
+
 # Figure out GNU CXX compiler flags
 . $srcdir/config/gnu-cxxflags
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index a53c4af..2d55ae1 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -49,6 +49,14 @@ New Features
 
     Configuration:
     -------------
+    - Adds C++ Autotools configuration file for Intel
+
+      * Checks for icpc as the compiler
+      * Sets std=c++11
+      * Copies most non-warning flags from intel-flags
+      
+      (DER - 2021/06/02)
+
     - Adds C++ Autotools configuration file for PGI
 
       * Checks for pgc++ as the compiler name (was: pgCC)
-- 
cgit v0.12