Skip to content

Commit 9c0965b

Browse files
authored
Merge branch 'OpenMathLib:develop' into issue5414
2 parents ea85b66 + 48e33f2 commit 9c0965b

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Makefile.power

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ ifeq ($(F_COMPILER), GFORTRAN)
118118
FCOMMON_OPT += -fno-optimize-sibling-calls
119119
endif
120120

121+
ifeq ($(F_COMPILER), FLANGNEW)
122+
override FCOMMON_OPT := $(filter-out -frecursive,$(FCOMMON_OPT))
123+
endif
124+
121125
FLAMEPATH = $(HOME)/flame/lib
122126

123127
#ifeq ($(CORE), CELL)
@@ -147,12 +151,15 @@ endif
147151
ifdef 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)),)
150156
ifeq ($(C_COMPILER)$(F_COMPILER)$(OSNAME), GCCIBMAIX)
151157
$(error Using GCC and XLF on AIX is not a supported combination.)
152158
endif
153159
ifeq ($(C_COMPILER)$(F_COMPILER)$(OSNAME), CLANGGFORTRANAIX)
154160
$(error Using Clang and gFortran on AIX is not a supported combination.)
155161
endif
162+
endif
156163

157164
ifeq ($(OSNAME), AIX)
158165
ifeq ($(C_COMPILER), GCC)

common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

786786
static __inline void compinv(FLOAT *b, FLOAT ar, FLOAT ai){
787787

0 commit comments

Comments
 (0)