fixed bug for INTERFACE64

This commit is contained in:
wernsaar 2014-06-22 09:49:20 +02:00
parent 438002204d
commit 316df0e821
2 changed files with 23 additions and 0 deletions

View File

@ -36,9 +36,13 @@ ifndef BINARY64
else else
@echo " BINARY ... 64bit " @echo " BINARY ... 64bit "
endif endif
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)
@echo " Use 64 bits int (equivalent to \"-i8\" in Fortran) " @echo " Use 64 bits int (equivalent to \"-i8\" in Fortran) "
endif endif
endif
@echo " C compiler ... $(C_COMPILER) (command line : $(CC))" @echo " C compiler ... $(C_COMPILER) (command line : $(CC))"
ifndef NOFORTRAN ifndef NOFORTRAN
@echo " Fortran compiler ... $(F_COMPILER) (command line : $(FC))" @echo " Fortran compiler ... $(F_COMPILER) (command line : $(FC))"

View File

@ -52,9 +52,11 @@ ifdef TARGET_CORE
GETARCH_FLAGS := -DFORCE_$(TARGET_CORE) GETARCH_FLAGS := -DFORCE_$(TARGET_CORE)
endif endif
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)
GETARCH_FLAGS += -DUSE64BITINT GETARCH_FLAGS += -DUSE64BITINT
endif endif
endif
ifndef GEMM_MULTITHREAD_THRESHOLD ifndef GEMM_MULTITHREAD_THRESHOLD
GEMM_MULTITHREAD_THRESHOLD=4 GEMM_MULTITHREAD_THRESHOLD=4
@ -502,9 +504,11 @@ endif
else else
ifdef BINARY64 ifdef BINARY64
FCOMMON_OPT += -m64 FCOMMON_OPT += -m64
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -fdefault-integer-8 FCOMMON_OPT += -fdefault-integer-8
endif endif
endif
else else
FCOMMON_OPT += -m32 FCOMMON_OPT += -m32
endif endif
@ -516,9 +520,11 @@ endif
ifeq ($(F_COMPILER), INTEL) ifeq ($(F_COMPILER), INTEL)
CCOMMON_OPT += -DF_INTERFACE_INTEL CCOMMON_OPT += -DF_INTERFACE_INTEL
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8 FCOMMON_OPT += -i8
endif endif
endif
ifdef USE_OPENMP ifdef USE_OPENMP
FCOMMON_OPT += -openmp FCOMMON_OPT += -openmp
endif endif
@ -536,9 +542,11 @@ CCOMMON_OPT += -DF_INTERFACE_IBM
# FCOMMON_OPT += -qarch=440 # FCOMMON_OPT += -qarch=440
ifdef BINARY64 ifdef BINARY64
FCOMMON_OPT += -q64 FCOMMON_OPT += -q64
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -qintsize=8 FCOMMON_OPT += -qintsize=8
endif endif
endif
else else
FCOMMON_OPT += -q32 FCOMMON_OPT += -q32
endif endif
@ -551,9 +559,11 @@ ifeq ($(F_COMPILER), PGI)
CCOMMON_OPT += -DF_INTERFACE_PGI CCOMMON_OPT += -DF_INTERFACE_PGI
COMMON_PROF += -DPGICOMPILER COMMON_PROF += -DPGICOMPILER
ifdef BINARY64 ifdef BINARY64
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8 FCOMMON_OPT += -i8
endif endif
endif
FCOMMON_OPT += -tp p7-64 FCOMMON_OPT += -tp p7-64
else else
FCOMMON_OPT += -tp p7 FCOMMON_OPT += -tp p7
@ -566,10 +576,12 @@ endif
ifeq ($(F_COMPILER), PATHSCALE) ifeq ($(F_COMPILER), PATHSCALE)
CCOMMON_OPT += -DF_INTERFACE_PATHSCALE CCOMMON_OPT += -DF_INTERFACE_PATHSCALE
ifdef BINARY64 ifdef BINARY64
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8 FCOMMON_OPT += -i8
endif endif
endif endif
endif
ifneq ($(ARCH), mips64) ifneq ($(ARCH), mips64)
ifndef BINARY64 ifndef BINARY64
@ -593,10 +605,12 @@ endif
ifeq ($(F_COMPILER), OPEN64) ifeq ($(F_COMPILER), OPEN64)
CCOMMON_OPT += -DF_INTERFACE_OPEN64 CCOMMON_OPT += -DF_INTERFACE_OPEN64
ifdef BINARY64 ifdef BINARY64
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8 FCOMMON_OPT += -i8
endif endif
endif endif
endif
ifeq ($(ARCH), mips64) ifeq ($(ARCH), mips64)
ifndef BINARY64 ifndef BINARY64
@ -681,11 +695,13 @@ endif
endif endif
ifdef BINARY64 ifdef BINARY64
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)
CCOMMON_OPT += CCOMMON_OPT +=
#-DUSE64BITINT #-DUSE64BITINT
endif endif
endif endif
endif
ifeq ($(NEED_PIC), 1) ifeq ($(NEED_PIC), 1)
ifeq ($(C_COMPILER), IBM) ifeq ($(C_COMPILER), IBM)
@ -871,9 +887,12 @@ endif
LAPACK_CFLAGS = $(CFLAGS) LAPACK_CFLAGS = $(CFLAGS)
LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)
LAPACK_CFLAGS += -DLAPACK_ILP64 LAPACK_CFLAGS += -DLAPACK_ILP64
endif endif
endif
ifdef OS_WINDOWS ifdef OS_WINDOWS
LAPACK_CFLAGS += -DOPENBLAS_OS_WINDOWS LAPACK_CFLAGS += -DOPENBLAS_OS_WINDOWS
endif endif