From 1deefa5683c66ed2230f9b0274e07e772f34b50d Mon Sep 17 00:00:00 2001
From: Nick Gould <dalekopera@gmail.com>
Date: Tue, 10 Dec 2024 14:32:29 +0000
Subject: [PATCH] added support for flang-new (LLVM flang) and marked existing
 flang as "classic"

---
 compiler.pc.lnx.fla   |  2 +-
 compiler.pc.lnx.fln   | 59 ++++++++++++++++++++++++++++++++++++++++++
 compiler.pc64.lnx.fla |  4 +--
 compiler.pc64.lnx.fln | 60 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 122 insertions(+), 3 deletions(-)
 create mode 100644 compiler.pc.lnx.fln
 create mode 100644 compiler.pc64.lnx.fln

diff --git a/compiler.pc.lnx.fla b/compiler.pc.lnx.fla
index dfe7fe9..3d51035 100644
--- a/compiler.pc.lnx.fla
+++ b/compiler.pc.lnx.fla
@@ -1,4 +1,4 @@
-# LLVM Flang compiler
+# Classic Flang compiler
 #
 # Fortran compilation and loading
 #
diff --git a/compiler.pc.lnx.fln b/compiler.pc.lnx.fln
new file mode 100644
index 0000000..e15563f
--- /dev/null
+++ b/compiler.pc.lnx.fln
@@ -0,0 +1,59 @@
+# LLVM Flang compiler
+#
+# Fortran compilation and loading
+#
+
+FORTRAN='flang-new'
+BASIC='-c -fPIC'
+MBASIC='-fPIC'
+I8='-fdefault-integer-8'
+LIBCMD=''
+MODCMD='-I$MOD'
+MODCMDB=$MODCMD
+MVMODS='$(MV) -f $(OBJ)/*.mod $(MOD)/ || true'
+OPTIMIZATION='-O'
+NOOPTIMIZATION='-O0'
+DEBUG=
+OPENMP='-fopenmp'
+SOMP='-fopenmp'
+F77='-ffixed-form'
+F90=''
+F95=''
+NOFMAIN=''
+CCONDEF=
+USUAL=
+SPECIAL=
+F77SUFFIX=f90
+F95SUFFIX=f90
+CUDA=
+CUDACOMP=$FORTRAN
+CUDAARCH=
+CUDACODE=
+CUDABASIC=
+CUDALIBS=
+CUDAOPENMP=$OPENMP
+TIMER=GEN
+BLAS=
+LAPACK=
+OMP4=no
+IEEECK=
+HSL=
+SPRAL='-lgalahad_spral'
+METIS4='-lgalahad_metis4'
+METIS5=
+PARMETIS=
+SCOTCH=
+PTSCOTCH=
+MPI='-lgalahad_mpi'
+PARDISO='-lgalahad_pardiso'
+MKL_PARDISO='-lgalahad_mkl_pardiso'
+WSMP='-lgalahad_wsmp'
+NOT95=IS95
+NOT64=NOT64
+INTEGER=32bit
+QUADREAL=no
+BINSHELL=sh
+SHARED='-shared'
+PASTIX='-lgalahad_pastix'
+MUMPS='-lgalahad_mumps'
+UMFPACK='-lgalahad_umfpack'
diff --git a/compiler.pc64.lnx.fla b/compiler.pc64.lnx.fla
index 2e5d241..d3d43c0 100644
--- a/compiler.pc64.lnx.fla
+++ b/compiler.pc64.lnx.fla
@@ -1,4 +1,4 @@
-# LLVM Flang compiler
+# Classic Flang compiler
 #
 # Fortran compilation and loading
 #
@@ -15,7 +15,7 @@ OPTIMIZATION='-O'
 NOOPTIMIZATION='-O0'
 DEBUG=
 OPENMP='fopenmp -lstdc++ -lhwloc'
-SOMP='-fopenmp=libomp -I/usr/lib/llvm-14/lib/clang/14.0.0/include'
+SOMP='-fopenmp'=libomp -I/usr/lib/llvm-14/lib/clang/14.0.0/include'
 F77='-ffixed-form'
 F90=''
 F95=''
diff --git a/compiler.pc64.lnx.fln b/compiler.pc64.lnx.fln
new file mode 100644
index 0000000..3872aac
--- /dev/null
+++ b/compiler.pc64.lnx.fln
@@ -0,0 +1,60 @@
+# LLVM Flang compiler
+#
+# Fortran compilation and loading
+#
+
+FORTRAN='flang-new'
+BASIC='-c -fPIC'
+MBASIC='-fPIC'
+I8='-i8'
+LIBCMD=''
+MODCMD='-I$MOD'
+MODCMDB=$MODCMD
+MVMODS='$(MV) -f $(OBJ)/*.mod $(MOD)/ || true'
+OPTIMIZATION='-O'
+NOOPTIMIZATION='-O0'
+DEBUG=
+OPENMP='fopenmp -lstdc++ -lhwloc'
+SOMP='-fopenmp'
+F77='-ffixed-form'
+F90=''
+F95=''
+NOFMAIN=''
+CCONDEF=
+USUAL=
+SPECIAL=
+F77SUFFIX=f90
+F95SUFFIX=f90
+CUDA=
+CUDACOMP=$FORTRAN
+CUDAARCH=
+CUDACODE=
+CUDABASIC=
+CUDALIBS=
+CUDAOPENMP=$OPENMP
+CUDAOPENMP=$OPENMP
+TIMER=GEN
+BLAS=
+LAPACK=
+OMP4=no
+IEEECK=
+HSL=
+SPRAL='-lgalahad_spral'
+METIS4='-lgalahad_metis4'
+METIS5=
+PARMETIS=
+SCOTCH=
+PTSCOTCH=
+MPI='-lgalahad_mpi'
+PARDISO='-lgalahad_pardiso'
+MKL_PARDISO='-lgalahad_mkl_pardiso'
+WSMP='-lgalahad_wsmp'
+NOT95=IS95
+NOT64=IS64
+INTEGER=32bit
+QUADREAL=no
+BINSHELL=sh
+SHARED='-shared'
+PASTIX='-lgalahad_pastix'
+MUMPS='-lgalahad_mumps'
+UMFPACK='-lgalahad_umfpack'