floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ref #393: fix for INTERFACE64=0 and ARCH_X86 in divtable

This commit is contained in:
wernsaar 2014-06-21 12:29:23 +02:00
parent 23203d52c1
commit 438002204d
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -36,7 +36,7 @@ ifndef BINARY64
else else
@echo " BINARY ... 64bit " @echo " BINARY ... 64bit "
endif endif
ifdef INTERFACE64 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
@echo " C compiler ... $(C_COMPILER) (command line : $(CC))" @echo " C compiler ... $(C_COMPILER) (command line : $(CC))"

18
Makefile.system
View File

@ -52,7 +52,7 @@ ifdef TARGET_CORE
GETARCH_FLAGS := -DFORCE_$(TARGET_CORE) GETARCH_FLAGS := -DFORCE_$(TARGET_CORE)
endif endif
ifdef INTERFACE64 ifneq ($(INTERFACE64), 0)
GETARCH_FLAGS += -DUSE64BITINT GETARCH_FLAGS += -DUSE64BITINT
endif endif
@ -502,7 +502,7 @@ endif
else else
ifdef BINARY64 ifdef BINARY64
FCOMMON_OPT += -m64 FCOMMON_OPT += -m64
ifdef INTERFACE64 ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -fdefault-integer-8 FCOMMON_OPT += -fdefault-integer-8
endif endif
else else
@ -516,7 +516,7 @@ endif
ifeq ($(F_COMPILER), INTEL) ifeq ($(F_COMPILER), INTEL)
CCOMMON_OPT += -DF_INTERFACE_INTEL CCOMMON_OPT += -DF_INTERFACE_INTEL
ifdef INTERFACE64 ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8 FCOMMON_OPT += -i8
endif endif
ifdef USE_OPENMP ifdef USE_OPENMP
@ -536,7 +536,7 @@ 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)
FCOMMON_OPT += -qintsize=8 FCOMMON_OPT += -qintsize=8
endif endif
else else
@ -551,7 +551,7 @@ 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)
FCOMMON_OPT += -i8 FCOMMON_OPT += -i8
endif endif
FCOMMON_OPT += -tp p7-64 FCOMMON_OPT += -tp p7-64
@ -566,7 +566,7 @@ 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)
FCOMMON_OPT += -i8 FCOMMON_OPT += -i8
endif endif
endif endif
@ -593,7 +593,7 @@ 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)
FCOMMON_OPT += -i8 FCOMMON_OPT += -i8
endif endif
endif endif
@ -681,7 +681,7 @@ endif
endif endif
ifdef BINARY64 ifdef BINARY64
ifdef INTERFACE64 ifneq ($(INTERFACE64), 0)
CCOMMON_OPT += CCOMMON_OPT +=
#-DUSE64BITINT #-DUSE64BITINT
endif endif
@ -871,7 +871,7 @@ endif
LAPACK_CFLAGS = $(CFLAGS) LAPACK_CFLAGS = $(CFLAGS)
LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H
ifdef INTERFACE64 ifneq ($(INTERFACE64), 0)
LAPACK_CFLAGS += -DLAPACK_ILP64 LAPACK_CFLAGS += -DLAPACK_ILP64
endif endif
ifdef OS_WINDOWS ifdef OS_WINDOWS

2
driver/others/divtable.c
View File

@ -39,7 +39,7 @@
#include "common.h" #include "common.h"
#ifdef SMP #ifdef SMP
#ifndef USE64BITINT #if !defined(USE64BITINT) || defined(ARCH_X86)
unsigned int blas_quick_divide_table[] = { unsigned int blas_quick_divide_table[] = {
0x00000000, 0x00000001, 0x80000001, 0x55555556, 0x00000000, 0x00000001, 0x80000001, 0x55555556,
0x40000001, 0x33333334, 0x2aaaaaab, 0x24924925, 0x40000001, 0x33333334, 0x2aaaaaab, 0x24924925,