From 3cda1ce50aa4a5243461ddb2cb0b474a4b3d4f5b Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 13 Feb 2018 22:44:45 +0100 Subject: [PATCH] Revert insiduous suppression of the -fopenmp flag in the LAPACK subtree This was added in #1046 citing a problem with mingw, but in effect it quietly reduces thread safety on all non-Windows platforms (while -fopenmp is already disabled for Windows builds through the toplevel Makefile.system). Removing the filter fixes #1425 --- lapack-netlib/SRC/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lapack-netlib/SRC/Makefile b/lapack-netlib/SRC/Makefile index 9cc2ea51b..531cb51fc 100644 --- a/lapack-netlib/SRC/Makefile +++ b/lapack-netlib/SRC/Makefile @@ -533,7 +533,9 @@ ZLASRC = $(filter-out $(ZLAPACKOBJS),$(ZLASRC_O)) DSLASRC = $(filter-out $(SLAPACKOBJS),$(DSLASRC_O)) ZCLASRC = $(filter-out $(CLAPACKOBJS),$(ZCLASRC_O)) -OPTS1 = $(filter-out -fopenmp, $(OPTS)) +#from commit 1046, supposedly related to mingw but breaks thread safety +#in insiduous ways on all platforms when used in place of OPTS below +#OPTS1 = $(filter-out -fopenmp, $(OPTS)) #end filter out @@ -597,10 +599,10 @@ clean: rm -f *.o DEPRECATED/*.o .f.o: - $(FORTRAN) $(OPTS1) -c -o $@ $< + $(FORTRAN) $(OPTS) -c -o $@ $< .F.o: - $(FORTRAN) $(OPTS1) -c $< -o $@ + $(FORTRAN) $(OPTS) -c $< -o $@ slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $< dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<