From 066f8065d19c5d0e9525e9ccf99e6dac9712dffa Mon Sep 17 00:00:00 2001
From: Andrew <16061801+brada4@users.noreply.github.com>
Date: Tue, 6 Nov 2018 08:19:08 +0000
Subject: [PATCH 1/3] init


From 7d3502b5003ad54903b7a9e9aec5a853dfbe0221 Mon Sep 17 00:00:00 2001
From: Andrew <16061801+brada4@users.noreply.github.com>
Date: Tue, 6 Nov 2018 08:20:55 +0000
Subject: [PATCH 2/3] Add -frecursive gfortran option by default

---
 Makefile.rule   | 4 ++--
 Makefile.system | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.rule b/Makefile.rule
index 6522b0777..d97607f2e 100644
--- a/Makefile.rule
+++ b/Makefile.rule
@@ -192,8 +192,8 @@ NO_AFFINITY = 1
 # Flags for POWER8 are defined in Makefile.power. Don't modify COMMON_OPT
 # COMMON_OPT = -O2
 
-# gfortran option for LAPACK
-# enable this flag only on 64bit Linux and if you need a thread safe lapack library
+# gfortran option for LAPACK to improve thread-safety
+# It is enabled by default in Makefile.system for gfortran
 # Flags for POWER8 are defined in Makefile.power. Don't modify FCOMMON_OPT
 # FCOMMON_OPT = -frecursive
 
diff --git a/Makefile.system b/Makefile.system
index b4cd4222a..8de0b8f6e 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -718,6 +718,8 @@ endif
 ifeq ($(F_COMPILER), GFORTRAN)
 CCOMMON_OPT += -DF_INTERFACE_GFORT
 FCOMMON_OPT += -Wall
+# make single-threaded LAPACK calls thread-safe #1847
+FCOMMON_OPT += -frecursive
 #Don't include -lgfortran, when NO_LAPACK=1 or lsbcc
 ifneq ($(NO_LAPACK), 1)
 EXTRALIB += -lgfortran

From 40cce0e353ca21ed1d045b4fc58faddd2ff6c2a7 Mon Sep 17 00:00:00 2001
From: Andrew <16061801+brada4@users.noreply.github.com>
Date: Tue, 6 Nov 2018 09:45:49 +0000
Subject: [PATCH 3/3] handle cmake too

---
 cmake/fc.cmake | 2 +-
 common.h       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/fc.cmake b/cmake/fc.cmake
index 38d59f956..adec28a91 100644
--- a/cmake/fc.cmake
+++ b/cmake/fc.cmake
@@ -44,7 +44,7 @@ endif ()
 
 if (${F_COMPILER} STREQUAL "GFORTRAN")
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_GFORT")
-  set(FCOMMON_OPT "${FCOMMON_OPT} -Wall")
+  set(FCOMMON_OPT "${FCOMMON_OPT} -Wall -frecursive")
   #Don't include -lgfortran, when NO_LAPACK=1 or lsbcc
   if (NOT NO_LAPACK)
     set(EXTRALIB "{EXTRALIB} -lgfortran")
diff --git a/common.h b/common.h
index 6c3d5b15e..60da2416a 100644
--- a/common.h
+++ b/common.h
@@ -183,7 +183,7 @@ extern "C" {
 
 #define ALLOCA_ALIGN 63UL
 
-#define NUM_BUFFERS (MAX_CPU_NUMBER * 2 * MAX_PARALLEL_NUMBER)
+#define NUM_BUFFERS MAX(64,(MAX_CPU_NUMBER * 2 * MAX_PARALLEL_NUMBER))
 
 #ifdef NEEDBUNDERSCORE
 #define BLASFUNC(FUNC) FUNC##_