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
This commit is contained in:
parent
6940c59a88
commit
3cda1ce50a
|
@ -533,7 +533,9 @@ ZLASRC = $(filter-out $(ZLAPACKOBJS),$(ZLASRC_O))
|
||||||
DSLASRC = $(filter-out $(SLAPACKOBJS),$(DSLASRC_O))
|
DSLASRC = $(filter-out $(SLAPACKOBJS),$(DSLASRC_O))
|
||||||
ZCLASRC = $(filter-out $(CLAPACKOBJS),$(ZCLASRC_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
|
#end filter out
|
||||||
|
|
||||||
|
|
||||||
|
@ -597,10 +599,10 @@ clean:
|
||||||
rm -f *.o DEPRECATED/*.o
|
rm -f *.o DEPRECATED/*.o
|
||||||
|
|
||||||
.f.o:
|
.f.o:
|
||||||
$(FORTRAN) $(OPTS1) -c -o $@ $<
|
$(FORTRAN) $(OPTS) -c -o $@ $<
|
||||||
|
|
||||||
.F.o:
|
.F.o:
|
||||||
$(FORTRAN) $(OPTS1) -c $< -o $@
|
$(FORTRAN) $(OPTS) -c $< -o $@
|
||||||
|
|
||||||
slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
|
slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
|
||||||
dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
|
dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
|
||||||
|
|
Loading…
Reference in New Issue