From f2c9ae9c332a5247efc79ede4df5656331a11f65 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Fri, 4 Aug 2023 15:31:03 +0200
Subject: [PATCH 1/2] Identify the new generation of flang that comes with
 LLVM17

---
 f_check | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/f_check b/f_check
index d071e016e1..526c41dc6d 100755
--- a/f_check
+++ b/f_check
@@ -101,7 +101,14 @@ else
                         *flang*)
                             vendor=FLANG
                             openmp='-fopenmp'
-                            ;;
+			    data=`$compiler -v 2>&1 > /dev/null `
+                	    v="${data#*version *}"
+                	    v="${v%%*.}"
+                	    major="${v%%.*}"
+                	    if [ "$major" -ge 17 ]; then
+                        	vendor=FLANGNEW
+			    fi	
+			;;
                         *ifort*|*ifx*)
                             vendor=INTEL
                             openmp='-fopenmp'

From e8bc8a0ee7af5cf42c736253c300b0248bf9782c Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Fri, 4 Aug 2023 15:32:19 +0200
Subject: [PATCH 2/2] Add support for the new generation flang that comes with
 LLVM17

---
 Makefile.system | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.system b/Makefile.system
index 62926b3804..71535b0cbb 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -1087,8 +1087,9 @@ endif
 endif
 endif
 
-ifeq ($(F_COMPILER), GFORTRAN)
+ifeq ($(F_COMPILER), $(filter $(F_COMPILER),GFORTRAN FLANGNEW))
 CCOMMON_OPT += -DF_INTERFACE_GFORT
+ifeq ($(F_COMPILER), GFORTRAN)
 FCOMMON_OPT += -Wall
 # make single-threaded LAPACK calls thread-safe #1847
 FCOMMON_OPT += -frecursive
@@ -1102,6 +1103,7 @@ EXTRALIB += -lgfortran
 endif
 endif
 endif
+endif
 ifdef NO_BINARY_MODE
 ifeq ($(ARCH), $(filter $(ARCH),mips64))
 ifdef BINARY64