From 30b85c589d3d358394d8f40f91c05ffcb330ab62 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sun, 29 Dec 2019 18:40:52 +0100
Subject: [PATCH] Update LAPACK to 3.9.0

---
 lapack-netlib/CBLAS/testing/Makefile   | 40 ++++++++++++++------------
 lapack-netlib/CBLAS/testing/c_cblat1.f |  2 +-
 lapack-netlib/CBLAS/testing/c_dblat1.f |  2 +-
 lapack-netlib/CBLAS/testing/c_sblat1.f |  2 +-
 lapack-netlib/CBLAS/testing/c_zblat1.f |  2 +-
 5 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/lapack-netlib/CBLAS/testing/Makefile b/lapack-netlib/CBLAS/testing/Makefile
index 0182c3e88..e3b615b41 100644
--- a/lapack-netlib/CBLAS/testing/Makefile
+++ b/lapack-netlib/CBLAS/testing/Makefile
@@ -2,7 +2,12 @@
 # The Makefile compiles c wrappers and testers for CBLAS.
 #
 
-include ../../make.inc
+TOPSRCDIR = ../..
+include $(TOPSRCDIR)/make.inc
+
+.SUFFIXES: .c .o
+.c.o:
+	$(CC) $(CFLAGS) -I../include -c -o $@ $<
 
 # Archive files necessary to compile
 LIB = $(CBLASLIB) $(BLASLIB)
@@ -27,6 +32,7 @@ ztestl1o = c_zblas1.o
 ztestl2o = c_zblas2.o c_z2chke.o auxiliary.o c_xerbla.o
 ztestl3o = c_zblas3.o c_z3chke.o auxiliary.o c_xerbla.o
 
+.PHONY: all all1 all2 all3
 all: all1 all2 all3
 all1: xscblat1 xdcblat1 xccblat1 xzcblat1
 all2: xscblat2 xdcblat2 xccblat2 xzcblat2
@@ -38,37 +44,38 @@ all3: xscblat3 xdcblat3 xccblat3 xzcblat3
 
 # Single real
 xscblat1: c_sblat1.o $(stestl1o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 xscblat2: c_sblat2.o $(stestl2o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 xscblat3: c_sblat3.o $(stestl3o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 # Double real
 xdcblat1: c_dblat1.o $(dtestl1o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 xdcblat2: c_dblat2.o $(dtestl2o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 xdcblat3: c_dblat3.o $(dtestl3o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 
 # Single complex
 xccblat1: c_cblat1.o $(ctestl1o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 xccblat2: c_cblat2.o $(ctestl2o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 xccblat3: c_cblat3.o $(ctestl3o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 
 # Double complex
 xzcblat1: c_zblat1.o $(ztestl1o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 xzcblat2: c_zblat2.o $(ztestl2o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 xzcblat3: c_zblat3.o $(ztestl3o) $(LIB)
-	$(LOADER) $(LOADOPTS) -o $@ $^
+	$(FC) $(FFLAGS) $(LDFLAGS) -o $@ $^
 
 
 # RUN TESTS
+.PHONY: run
 run: all
 	@echo "--> TESTING CBLAS 1 - SINGLE PRECISION REAL <--"
 	@./xscblat1 > stest1.out
@@ -95,6 +102,7 @@ run: all
 	@echo "--> TESTING CBLAS 3 - DOUBLE PRECISION COMPLEX <--"
 	@./xzcblat3 < zin3 > ztest3.out
 
+.PHONY: clean cleanobj cleanexe cleantest
 clean: cleanobj cleanexe cleantest
 cleanobj:
 	rm -f *.o
@@ -102,9 +110,3 @@ cleanexe:
 	rm -f x*
 cleantest:
 	rm -f *.out core
-
-.SUFFIXES: .o .f .c
-.c.o:
-	$(CC) $(CFLAGS) -I../include -c -o $@ $<
-.f.o:
-	$(FORTRAN) $(OPTS) -c -o $@ $<
diff --git a/lapack-netlib/CBLAS/testing/c_cblat1.f b/lapack-netlib/CBLAS/testing/c_cblat1.f
index c741ce506..1a123d74d 100644
--- a/lapack-netlib/CBLAS/testing/c_cblat1.f
+++ b/lapack-netlib/CBLAS/testing/c_cblat1.f
@@ -577,7 +577,7 @@
       SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
 *     ************************* STEST1 *****************************
 *
-*     THIS IS AN INTERFACE SUBROUTINE TO ACCOMODATE THE FORTRAN
+*     THIS IS AN INTERFACE SUBROUTINE TO ACCOMMODATE THE FORTRAN
 *     REQUIREMENT THAT WHEN A DUMMY ARGUMENT IS AN ARRAY, THE
 *     ACTUAL ARGUMENT MUST ALSO BE AN ARRAY OR AN ARRAY ELEMENT.
 *
diff --git a/lapack-netlib/CBLAS/testing/c_dblat1.f b/lapack-netlib/CBLAS/testing/c_dblat1.f
index c570a9140..4a71b4dcf 100644
--- a/lapack-netlib/CBLAS/testing/c_dblat1.f
+++ b/lapack-netlib/CBLAS/testing/c_dblat1.f
@@ -653,7 +653,7 @@
       SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
 *     ************************* STEST1 *****************************
 *
-*     THIS IS AN INTERFACE SUBROUTINE TO ACCOMODATE THE FORTRAN
+*     THIS IS AN INTERFACE SUBROUTINE TO ACCOMMODATE THE FORTRAN
 *     REQUIREMENT THAT WHEN A DUMMY ARGUMENT IS AN ARRAY, THE
 *     ACTUAL ARGUMENT MUST ALSO BE AN ARRAY OR AN ARRAY ELEMENT.
 *
diff --git a/lapack-netlib/CBLAS/testing/c_sblat1.f b/lapack-netlib/CBLAS/testing/c_sblat1.f
index 773787d6f..89902f12d 100644
--- a/lapack-netlib/CBLAS/testing/c_sblat1.f
+++ b/lapack-netlib/CBLAS/testing/c_sblat1.f
@@ -653,7 +653,7 @@
       SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
 *     ************************* STEST1 *****************************
 *
-*     THIS IS AN INTERFACE SUBROUTINE TO ACCOMODATE THE FORTRAN
+*     THIS IS AN INTERFACE SUBROUTINE TO ACCOMMODATE THE FORTRAN
 *     REQUIREMENT THAT WHEN A DUMMY ARGUMENT IS AN ARRAY, THE
 *     ACTUAL ARGUMENT MUST ALSO BE AN ARRAY OR AN ARRAY ELEMENT.
 *
diff --git a/lapack-netlib/CBLAS/testing/c_zblat1.f b/lapack-netlib/CBLAS/testing/c_zblat1.f
index 03753e782..cd0c8541d 100644
--- a/lapack-netlib/CBLAS/testing/c_zblat1.f
+++ b/lapack-netlib/CBLAS/testing/c_zblat1.f
@@ -577,7 +577,7 @@
       SUBROUTINE STEST1(SCOMP1,STRUE1,SSIZE,SFAC)
 *     ************************* STEST1 *****************************
 *
-*     THIS IS AN INTERFACE SUBROUTINE TO ACCOMODATE THE FORTRAN
+*     THIS IS AN INTERFACE SUBROUTINE TO ACCOMMODATE THE FORTRAN
 *     REQUIREMENT THAT WHEN A DUMMY ARGUMENT IS AN ARRAY, THE
 *     ACTUAL ARGUMENT MUST ALSO BE AN ARRAY OR AN ARRAY ELEMENT.
 *