[PATCH v2] Support for Flang and ARM HPC compiler

[pawel . osmialowski]

From: Paul Osmialowski <address@hidden>

Signed-off-by: Paul Osmialowski <address@hidden>
---
 lib/autoconf/c.m4       | 8 ++++++--
 lib/autoconf/fortran.m4 | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 42c6ac1b..774c5c1f 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -458,6 +458,9 @@ if test -z "$CC"; then
   AC_CHECK_TOOLS(CC, cl.exe)
 fi
 if test -z "$CC"; then
+  AC_CHECK_TOOL(CC, armclang)
+fi
+if test -z "$CC"; then
   AC_CHECK_TOOL(CC, clang)
 fi
 ])
@@ -707,7 +710,8 @@ if test -z "$CXX"; then
   else
     AC_CHECK_TOOLS(CXX,
                   [m4_default([$1],
-                              [g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC 
xlC_r xlC clang++])],
+                              [g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC 
xlC_r xlC
+                               armclang++ clang++])],
                   g++)
   fi
 fi
@@ -886,7 +890,7 @@ _AC_ARG_VAR_LIBS()dnl
 _AC_ARG_VAR_CPPFLAGS()dnl
 _AC_ARG_VAR_PRECIOUS([OBJC])dnl
 AC_CHECK_TOOLS(OBJC,
-              [m4_default([$1], [gcc objcc objc cc CC clang])],
+              [m4_default([$1], [gcc objcc objc cc CC armclang clang])],
               gcc)
 # Provide some information about the compiler.
 _AS_ECHO_LOG([checking for _AC_LANG compiler version])
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index 17043c56..73434b45 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -317,7 +317,10 @@ AC_DEFUN([_AC_FC_DIALECT_YEAR],
 #  ifort, previously ifc: Intel Fortran 95 compiler for Linux/x86
 #  efc: Intel Fortran 95 compiler for IA64
 #  nagfor: NAGWare Fortran 77/90/95 compiler
-m4_define([_AC_F95_FC], [gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran 
pgf95 lf95 ftn nagfor])
+#  flang: LLVM Fortran compiler
+#  armflang: ARM HPC Fortran compiler
+m4_define([_AC_F95_FC], [gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran 
pgf95 lf95 ftn nagfor
+                         armflang flang])
 m4_define([_AC_F90_FC], [xlf90 f90 pgf90 pghpf epcf90])
 m4_define([_AC_F77_FC], [g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77])
 AC_DEFUN([_AC_PROG_FC],
-- 
2.13.5 (Apple Git-94)