From 68d86ea1502e52caaef45b91a64bb5488a9bd9c3 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Mon, 25 Jul 2022 19:34:16 +0200
Subject: [PATCH 1/5] Add Fujitsu compiler

---
 ctest.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ctest.c b/ctest.c
index fc52b43a6..6ec437a0c 100644
--- a/ctest.c
+++ b/ctest.c
@@ -44,6 +44,10 @@ COMPILER_DEC
 COMPILER_GNU
 #endif
 
+#if defined(__fcc_version__) || defined(__FCC_version__)
+COMPILER_FUJITSU
+endif
+
 #if defined(__ANDROID__)
 OS_ANDROID
 #endif

From cf37182260a1b533c276d8ca55f3d91ba2c8b0c2 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Mon, 25 Jul 2022 19:39:17 +0200
Subject: [PATCH 2/5] Add Fujitsu compiler (fcc)

---
 c_check | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/c_check b/c_check
index d825017e8..01d4f4a7c 100755
--- a/c_check
+++ b/c_check
@@ -51,6 +51,7 @@ case "$data" in
     *COMPILER_SUN*) compiler=SUN ;;
     *COMPILER_IBM*) compiler=IBM ;;
     *COMPILER_DEC*) compiler=DEC ;;
+    *COMPILER_FUJITSU*) compiler=FUJITSU ;;
 esac
 if [ -z "$compiler" ]; then
     compiler=GCC
@@ -143,6 +144,7 @@ case "$compiler" in
     INTEL) openmp='-openmp' ;;
     PATHSCALE|OPEN64) openmp='-mp' ;;
     CLANG|GCC|LSB) openmp='-fopenmp' ;;
+    FUJITSU) openmp='-Kopenmp' ;;
 esac
 
 if [ "$defined" -eq 0 ]; then

From 70001e1e9e560bd128e124164b73b9804d2b00c7 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Mon, 25 Jul 2022 19:42:59 +0200
Subject: [PATCH 3/5] Add Fujitsu compiler

---
 c_check.pl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/c_check.pl b/c_check.pl
index a3afea838..6ce28e11b 100644
--- a/c_check.pl
+++ b/c_check.pl
@@ -65,6 +65,7 @@ $compiler = OPEN64    if ($data =~ /COMPILER_OPEN64/);
 $compiler = SUN       if ($data =~ /COMPILER_SUN/);
 $compiler = IBM       if ($data =~ /COMPILER_IBM/);
 $compiler = DEC       if ($data =~ /COMPILER_DEC/);
+$compiler = FUJITSU   if ($data =~ /COMPILER_FUJITSU/);
 $compiler = GCC       if ($compiler eq "");
 
 $os = Linux           if ($data =~ /OS_LINUX/);
@@ -189,6 +190,10 @@ if ($compiler eq "GCC" || $compiler eq "LSB") {
     $openmp = "-fopenmp";
 }
 
+if ($compiler eq "FUJITSU") {
+    $openmp = "-Kopenmp";
+}
+
 if ($defined == 0) {
     $compiler_name .= " -m32" if ($binary eq "32");
     $compiler_name .= " -m64" if ($binary eq "64");

From f8c5bdfbabba6a7c66a295fa0007e103e2308e31 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Mon, 25 Jul 2022 19:48:59 +0200
Subject: [PATCH 4/5] Treat Fujitsu fcc on Fugaku like clang

---
 Makefile.arm64 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile.arm64 b/Makefile.arm64
index 7ffe93a0b..4efa55286 100644
--- a/Makefile.arm64
+++ b/Makefile.arm64
@@ -3,6 +3,9 @@ ifneq ($(C_COMPILER), PGI)
 ifeq ($(C_COMPILER), CLANG)
 ISCLANG=1
 endif
+ifeq ($(C_COMPILER), FUJITSU)
+ISCLANG=1
+endif
 ifneq (1, $(filter 1,$(GCCVERSIONGT4) $(ISCLANG)))
 CCOMMON_OPT += -march=armv8-a
 ifneq ($(F_COMPILER), NAG)

From 692848d20cf68d205d067888e4e1abae319e8525 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Mon, 25 Jul 2022 21:59:03 +0200
Subject: [PATCH 5/5] typo fix

---
 ctest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ctest.c b/ctest.c
index 6ec437a0c..df628b1d4 100644
--- a/ctest.c
+++ b/ctest.c
@@ -46,7 +46,7 @@ COMPILER_GNU
 
 #if defined(__fcc_version__) || defined(__FCC_version__)
 COMPILER_FUJITSU
-endif
+#endif
 
 #if defined(__ANDROID__)
 OS_ANDROID