File tree Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -118,6 +118,10 @@ ifeq ($(F_COMPILER), GFORTRAN)
118118FCOMMON_OPT += -fno-optimize-sibling-calls
119119endif
120120
121+ ifeq ($(F_COMPILER), FLANGNEW)
122+ override FCOMMON_OPT := $(filter-out -frecursive,$(FCOMMON_OPT))
123+ endif
124+
121125FLAMEPATH = $(HOME)/flame/lib
122126
123127#ifeq ($(CORE), CELL)
@@ -147,12 +151,15 @@ endif
147151ifdef BINARY64
148152
149153
154+ #Skip C/Fortran compiler combination checks in AIX if NO_FORTRAN or ONLY_CBLAS is set
155+ ifeq ($(filter 1,$(NO_FORTRAN) $(ONLY_CBLAS)),)
150156ifeq ($(C_COMPILER)$(F_COMPILER)$(OSNAME), GCCIBMAIX)
151157$(error Using GCC and XLF on AIX is not a supported combination.)
152158endif
153159ifeq ($(C_COMPILER)$(F_COMPILER)$(OSNAME), CLANGGFORTRANAIX)
154160$(error Using Clang and gFortran on AIX is not a supported combination.)
155161endif
162+ endif
156163
157164ifeq ($(OSNAME), AIX)
158165ifeq ($(C_COMPILER), GCC)
Original file line number Diff line number Diff line change @@ -781,7 +781,7 @@ static __inline int readenv_atoi(char *env) {
781781#endif
782782#endif
783783
784- #if !defined(XDOUBLE ) || !defined(QUAD_PRECISION )
784+ #if !defined(BFLOAT16 ) && (!defined( XDOUBLE ) || !defined(QUAD_PRECISION ) )
785785
786786static __inline void compinv (FLOAT * b , FLOAT ar , FLOAT ai ){
787787
You can’t perform that action at this time.
0 commit comments