41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
Index: src/config/makefile.h
|
|
===================================================================
|
|
--- src/config/makefile.h (revision 28470)
|
|
+++ src/config/makefile.h (revision 28471)
|
|
@@ -910,6 +910,7 @@
|
|
GNUMINOR=$(shell $(FC) -dM -E - < /dev/null 2> /dev/null | egrep __VERS | cut -c24)
|
|
GNU_GE_4_6 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 6 \) ] && echo true)
|
|
GNU_GE_4_8 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 8 \) ] && echo true)
|
|
+ GNU_GE_6 = $(shell [ $(GNUMAJOR) -ge 6 ] && echo true)
|
|
endif
|
|
ifeq ($(GNU_GE_4_6),true)
|
|
DEFINES += -DGCC46
|
|
@@ -921,6 +922,9 @@
|
|
|
|
FOPTIONS += -Warray-bounds
|
|
endif
|
|
+ ifeq ($(GNU_GE_6),true)
|
|
+ FOPTIMIZE += -fno-tree-dominator-opts # solvation/hnd_cosmo_lib breaks
|
|
+ endif
|
|
ifdef USE_OPENMP
|
|
FOPTIONS += -fopenmp
|
|
LDOPTIONS += -fopenmp
|
|
@@ -1067,6 +1071,7 @@
|
|
GNUMINOR=$(shell $(FC) -dM -E - < /dev/null 2> /dev/null | egrep __VERS | cut -c24)
|
|
GNU_GE_4_6 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 6 \) ] && echo true)
|
|
GNU_GE_4_8 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 8 \) ] && echo true)
|
|
+ GNU_GE_6 = $(shell [ $(GNUMAJOR) -ge 6 ] && echo true)
|
|
ifeq ($(GNU_GE_4_6),true)
|
|
DEFINES += -DGCC46
|
|
endif
|
|
@@ -1076,6 +1081,9 @@
|
|
#gone FFLAGS_FORGA += -fno-aggressive-loop-optimizations
|
|
FOPTIONS += -Warray-bounds
|
|
endif # GNU_GE_4_8
|
|
+ ifeq ($(GNU_GE_6),true)
|
|
+ FOPTIMIZE += -fno-tree-dominator-opts # solvation/hnd_cosmo_lib breaks
|
|
+ endif
|
|
endif # GNUMAJOR
|
|
|
|
ifdef USE_OPENMP
|