From 316df0e821046b817d9a8ca21fd940959d7da299 Mon Sep 17 00:00:00 2001 From: wernsaar Date: Sun, 22 Jun 2014 09:49:20 +0200 Subject: [PATCH] fixed bug for INTERFACE64 --- Makefile | 4 ++++ Makefile.system | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/Makefile b/Makefile index ab8602f2f..ad6925d1c 100644 --- a/Makefile +++ b/Makefile @@ -36,9 +36,13 @@ ifndef BINARY64 else @echo " BINARY ... 64bit " endif + +ifdef INTERFACE64 ifneq ($(INTERFACE64), 0) @echo " Use 64 bits int (equivalent to \"-i8\" in Fortran) " endif +endif + @echo " C compiler ... $(C_COMPILER) (command line : $(CC))" ifndef NOFORTRAN @echo " Fortran compiler ... $(F_COMPILER) (command line : $(FC))" diff --git a/Makefile.system b/Makefile.system index 5d5f0f980..4d7eb1610 100644 --- a/Makefile.system +++ b/Makefile.system @@ -52,9 +52,11 @@ ifdef TARGET_CORE GETARCH_FLAGS := -DFORCE_$(TARGET_CORE) endif +ifdef INTERFACE64 ifneq ($(INTERFACE64), 0) GETARCH_FLAGS += -DUSE64BITINT endif +endif ifndef GEMM_MULTITHREAD_THRESHOLD GEMM_MULTITHREAD_THRESHOLD=4 @@ -502,9 +504,11 @@ endif else ifdef BINARY64 FCOMMON_OPT += -m64 +ifdef INTERFACE64 ifneq ($(INTERFACE64), 0) FCOMMON_OPT += -fdefault-integer-8 endif +endif else FCOMMON_OPT += -m32 endif @@ -516,9 +520,11 @@ endif ifeq ($(F_COMPILER), INTEL) CCOMMON_OPT += -DF_INTERFACE_INTEL +ifdef INTERFACE64 ifneq ($(INTERFACE64), 0) FCOMMON_OPT += -i8 endif +endif ifdef USE_OPENMP FCOMMON_OPT += -openmp endif @@ -536,9 +542,11 @@ CCOMMON_OPT += -DF_INTERFACE_IBM # FCOMMON_OPT += -qarch=440 ifdef BINARY64 FCOMMON_OPT += -q64 +ifdef INTERFACE64 ifneq ($(INTERFACE64), 0) FCOMMON_OPT += -qintsize=8 endif +endif else FCOMMON_OPT += -q32 endif @@ -551,9 +559,11 @@ ifeq ($(F_COMPILER), PGI) CCOMMON_OPT += -DF_INTERFACE_PGI COMMON_PROF += -DPGICOMPILER ifdef BINARY64 +ifdef INTERFACE64 ifneq ($(INTERFACE64), 0) FCOMMON_OPT += -i8 endif +endif FCOMMON_OPT += -tp p7-64 else FCOMMON_OPT += -tp p7 @@ -566,10 +576,12 @@ endif ifeq ($(F_COMPILER), PATHSCALE) CCOMMON_OPT += -DF_INTERFACE_PATHSCALE ifdef BINARY64 +ifdef INTERFACE64 ifneq ($(INTERFACE64), 0) FCOMMON_OPT += -i8 endif endif +endif ifneq ($(ARCH), mips64) ifndef BINARY64 @@ -593,10 +605,12 @@ endif ifeq ($(F_COMPILER), OPEN64) CCOMMON_OPT += -DF_INTERFACE_OPEN64 ifdef BINARY64 +ifdef INTERFACE64 ifneq ($(INTERFACE64), 0) FCOMMON_OPT += -i8 endif endif +endif ifeq ($(ARCH), mips64) ifndef BINARY64 @@ -681,11 +695,13 @@ endif endif ifdef BINARY64 +ifdef INTERFACE64 ifneq ($(INTERFACE64), 0) CCOMMON_OPT += #-DUSE64BITINT endif endif +endif ifeq ($(NEED_PIC), 1) ifeq ($(C_COMPILER), IBM) @@ -871,9 +887,12 @@ endif LAPACK_CFLAGS = $(CFLAGS) LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H +ifdef INTERFACE64 ifneq ($(INTERFACE64), 0) LAPACK_CFLAGS += -DLAPACK_ILP64 endif +endif + ifdef OS_WINDOWS LAPACK_CFLAGS += -DOPENBLAS_OS_WINDOWS endif