openblas: bump to 0.3.7
This commit is contained in:
Dr. Thomas Orgis
parent
ad64f818be
commit
0abf14be0d
|
|
@ -8,7 +8,7 @@
|
|||
# OPENBLAS_VARIANT = (openblas|openblas_pthread|openblas_openmp)
|
||||
# being set.
|
||||
|
||||
PORTVERSION= 0.3.5
|
||||
PORTVERSION= 0.3.7
|
||||
DISTNAME= OpenBLAS-${PORTVERSION}
|
||||
PKGNAME= ${OPENBLAS_VARIANT}-${PORTVERSION}
|
||||
# ThOr: I do not like that. Can we rather rename the benchmark files
|
||||
|
|
@ -79,7 +79,7 @@ MAKE_FLAGS+= OPENBLAS_CMAKE_DIR=${PREFIX}/lib/cmake/${OPENBLAS_VARIANT}
|
|||
# Need to settle on a convention for SYMBOLSUFFIX first, see
|
||||
# https://github.com/xianyi/OpenBLAS/issues/646 .
|
||||
.if ${OPENBLAS_VARIANT} == openblas
|
||||
MAKE_FLAGS+= USE_OPENMP=0 USE_THREAD=0
|
||||
MAKE_FLAGS+= USE_OPENMP=0 USE_THREAD=0 USE_LOCKING=1
|
||||
BENCHMARK_ENV= USE_SIMPLE_THREADED_LEVEL3=1
|
||||
.elif ${OPENBLAS_VARIANT} == openblas_pthread
|
||||
BENCHMARK_ENV= OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD$
|
||||
|
||||
SHA1 (openblas/OpenBLAS-0.3.5.tar.gz) = 3ec3607d37c2ea1f7ec1d255f5f38d437489c24d
|
||||
RMD160 (openblas/OpenBLAS-0.3.5.tar.gz) = 9b7aa282cc2e5925219d14502bdd32917d0bbcdd
|
||||
SHA512 (openblas/OpenBLAS-0.3.5.tar.gz) = 91b3074eb922453bf843158b4281cde65db9e8bbdd7590e75e9e6cdcb486157f7973f2936f327bb3eb4f1702ce0ba51ae6729d8d4baf2d986c50771e8f696df0
|
||||
Size (openblas/OpenBLAS-0.3.5.tar.gz) = 11848689 bytes
|
||||
SHA1 (openblas/OpenBLAS-0.3.7.tar.gz) = 6a79b36d1bf73584a513139806d226f9189d621e
|
||||
RMD160 (openblas/OpenBLAS-0.3.7.tar.gz) = 72103fa62efaa9ab77f80f9ae70b1417fa6f2122
|
||||
SHA512 (openblas/OpenBLAS-0.3.7.tar.gz) = 9c4898301c675471bbce2bb99b6bbe7c90724784fac06504416d4bd5da3cd4488f727b0a118c9a38ea342daac2af9e32597a847004241cc57de693b58b856262
|
||||
Size (openblas/OpenBLAS-0.3.7.tar.gz) = 11986592 bytes
|
||||
SHA1 (openblas/large.tgz) = a689e5b180595b40c5719b0f358b31b15b57a2db
|
||||
RMD160 (openblas/large.tgz) = 8010ff4002ef42cf22a9ee9345011d68fc27d855
|
||||
SHA512 (openblas/large.tgz) = e24db2b8a4253ccff9ca196815901c1fefd55e882f4fe1085715ac84b8f318e1842a91072130c17fdd144344ffc80233a77500da9349acb54e504b3935825965
|
||||
|
|
@ -12,17 +12,17 @@ SHA1 (openblas/timing.tgz) = fd47fc3f26d142a791df51e4a422a49662507252
|
|||
RMD160 (openblas/timing.tgz) = f0fe220e7ab611d4db8d8cab960361955e2ab093
|
||||
SHA512 (openblas/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
|
||||
Size (openblas/timing.tgz) = 1059485 bytes
|
||||
SHA1 (patch-Makefile) = e430fecf10b51ebc5fd0d38258b03a2af8c7fdb6
|
||||
SHA1 (patch-Makefile.install) = d7c5ee17feb43843060a36e9b7de693f06944db9
|
||||
SHA1 (patch-Makefile.rule) = ec2663c22ca68059181fe90047b97131764ea32a
|
||||
SHA1 (patch-Makefile.system) = a288bb24a8d2352a2da6d76c5042a2f50fc89a67
|
||||
SHA1 (patch-Makefile) = 6029076c34765e53a26617fb4bd36b56ba413f1b
|
||||
SHA1 (patch-Makefile.install) = 08c80677f8040623eaf5277cf92b5f5969fb4a07
|
||||
SHA1 (patch-Makefile.rule) = 7074d322579d77edcd6cfa938ed862037a777187
|
||||
SHA1 (patch-Makefile.system) = c8479e170ec0ec657e1c14ee505d0da41cb3d221
|
||||
SHA1 (patch-c_check) = c5990809434a259399c75e660aad5abe83899548
|
||||
SHA1 (patch-common__arm.h) = f08ec61bee8317daac267e90a79f46097b3431c9
|
||||
SHA1 (patch-cpuid__arm.c) = 20f95cede90cbe548c0cd09ed2e3d37d1d4aeabd
|
||||
SHA1 (patch-cpuid__arm64.c) = bbeb7222b32ec821511a6798fc27ff7269700662
|
||||
SHA1 (patch-cpuid_ia64.c) = 39649319b8c0a37b8d494e3c03b1ddb6fb616603
|
||||
SHA1 (patch-driver_others_memory.c) = 24adfd60c4baade965745bb6c21c6a3f955e4e50
|
||||
SHA1 (patch-exports+Makefile) = b1b087f07cffa3b0338a1cae8155995ebb658b30
|
||||
SHA1 (patch-exports+Makefile) = 10d84c9d04bcb8cc88374dabc60016c9c25feb70
|
||||
SHA1 (patch-f_check) = 9162d6a31f96c6af5aada82f6e78cf0385384215
|
||||
SHA1 (patch-getarch.c) = 3d0ea5b989c6402d9e2f03a6cc2de848f06ca16d
|
||||
SHA1 (patch-interface__ztrmv.c) = 6038946f8fb9542e680178ece2bd0d0d5853baad
|
||||
SHA1 (patch-utest_Makefile) = f6347c95c7da3b7d4488cbfb7001b367b042a421
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ $NetBSD$
|
|||
|
||||
Remove special library names.
|
||||
|
||||
--- Makefile.orig 2018-12-31 23:09:59.000000000 +0100
|
||||
+++ Makefile 2019-03-22 18:49:13.168527565 +0100
|
||||
@@ -100,7 +100,6 @@
|
||||
--- Makefile.orig 2019-08-11 21:23:27.000000000 +0000
|
||||
+++ Makefile
|
||||
@@ -100,7 +100,6 @@ ifneq ($(NO_SHARED), 1)
|
||||
ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku))
|
||||
@$(MAKE) -C exports so
|
||||
@ln -fs $(LIBSONAME) $(LIBPREFIX).so
|
||||
|
|
@ -12,15 +12,16 @@ Remove special library names.
|
|||
endif
|
||||
ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD OpenBSD NetBSD DragonFly))
|
||||
@$(MAKE) -C exports so
|
||||
@@ -108,7 +107,6 @@
|
||||
@@ -108,8 +107,6 @@ ifeq ($(OSNAME), $(filter $(OSNAME),Free
|
||||
endif
|
||||
ifeq ($(OSNAME), Darwin)
|
||||
@$(MAKE) -C exports dyn
|
||||
- @ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
|
||||
- @ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
|
||||
endif
|
||||
ifeq ($(OSNAME), WINNT)
|
||||
@$(MAKE) -C exports dll
|
||||
@@ -142,7 +140,6 @@
|
||||
@@ -146,7 +143,6 @@ ifeq ($(NO_SHARED), 1)
|
||||
$(error OpenBLAS: neither static nor shared are enabled.)
|
||||
endif
|
||||
endif
|
||||
|
|
@ -28,7 +29,7 @@ Remove special library names.
|
|||
@for d in $(SUBDIRS) ; \
|
||||
do if test -d $$d; then \
|
||||
$(MAKE) -C $$d $(@F) || exit 1 ; \
|
||||
@@ -176,7 +173,6 @@
|
||||
@@ -180,7 +176,6 @@ endif
|
||||
prof : prof_blas prof_lapack
|
||||
|
||||
prof_blas :
|
||||
|
|
@ -36,7 +37,7 @@ Remove special library names.
|
|||
for d in $(SUBDIRS) ; \
|
||||
do if test -d $$d; then \
|
||||
$(MAKE) -C $$d prof || exit 1 ; \
|
||||
@@ -187,7 +183,6 @@
|
||||
@@ -191,7 +186,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
|
||||
endif
|
||||
|
||||
blas :
|
||||
|
|
@ -44,7 +45,7 @@ Remove special library names.
|
|||
for d in $(BLASDIRS) ; \
|
||||
do if test -d $$d; then \
|
||||
$(MAKE) -C $$d libs || exit 1 ; \
|
||||
@@ -195,7 +190,6 @@
|
||||
@@ -199,7 +193,6 @@ blas :
|
||||
done
|
||||
|
||||
hpl :
|
||||
|
|
@ -52,7 +53,7 @@ Remove special library names.
|
|||
for d in $(BLASDIRS) ../laswp exports ; \
|
||||
do if test -d $$d; then \
|
||||
$(MAKE) -C $$d $(@F) || exit 1 ; \
|
||||
@@ -209,7 +203,6 @@
|
||||
@@ -213,7 +206,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
|
||||
endif
|
||||
|
||||
hpl_p :
|
||||
|
|
@ -60,7 +61,7 @@ Remove special library names.
|
|||
for d in $(SUBDIRS) ../laswp exports ; \
|
||||
do if test -d $$d; then \
|
||||
$(MAKE) -C $$d $(@F) || exit 1 ; \
|
||||
@@ -251,7 +244,7 @@
|
||||
@@ -255,7 +247,7 @@ ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTR
|
||||
-@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
||||
-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
||||
-@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@ $NetBSD$
|
|||
|
||||
Second part of removing the special library names.
|
||||
|
||||
--- Makefile.install.orig 2018-12-31 23:09:59.000000000 +0100
|
||||
+++ Makefile.install 2019-03-22 17:43:08.922196943 +0100
|
||||
@@ -61,8 +61,6 @@
|
||||
ifndef NO_STATIC
|
||||
--- Makefile.install.orig 2019-08-11 21:23:27.000000000 +0000
|
||||
+++ Makefile.install
|
||||
@@ -61,8 +61,6 @@ endif
|
||||
ifneq ($(NO_STATIC),1)
|
||||
@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
|
||||
@install -pm644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
|
||||
- @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
|
||||
- ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
|
||||
endif
|
||||
#for install shared library
|
||||
ifndef NO_SHARED
|
||||
@@ -70,8 +68,7 @@
|
||||
ifneq ($(NO_SHARED),1)
|
||||
@@ -70,8 +68,7 @@ ifneq ($(NO_SHARED),1)
|
||||
ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku))
|
||||
@install -pm755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
|
||||
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
|
||||
|
|
@ -23,3 +23,21 @@ Second part of removing the special library names.
|
|||
endif
|
||||
|
||||
ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD OpenBSD NetBSD DragonFly))
|
||||
@@ -110,16 +107,13 @@ endif
|
||||
ifneq ($(NO_STATIC),1)
|
||||
@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
|
||||
@installbsd -c -m 644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
|
||||
- @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
|
||||
- ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
|
||||
endif
|
||||
#for install shared library
|
||||
ifneq ($(NO_SHARED),1)
|
||||
@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
|
||||
@installbsd -c -m 755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
|
||||
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
|
||||
- ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
|
||||
- ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
|
||||
+ ln -fs $(LIBSONAME) $(LIBPREFIX).so
|
||||
endif
|
||||
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@ $NetBSD$
|
|||
|
||||
Respect env
|
||||
|
||||
--- Makefile.rule.orig 2015-10-27 20:44:50 UTC
|
||||
--- Makefile.rule.orig 2019-08-11 21:23:27.000000000 +0000
|
||||
+++ Makefile.rule
|
||||
@@ -19,10 +19,10 @@ VERSION = 0.2.15
|
||||
@@ -24,10 +24,10 @@ VERSION = 0.3.7
|
||||
|
||||
# C compiler including binary type(32bit / 64bit). Default is gcc.
|
||||
# Don't use Intel Compiler or PGI, it won't generate right codes as I expect.
|
||||
-# CC = gcc
|
||||
+CC = %%CC%%
|
||||
+CC = gcc
|
||||
|
||||
# Fortran compiler. Default is g77.
|
||||
-# FC = gfortran
|
||||
+FC = %%FC%%
|
||||
+FC = gfortran
|
||||
|
||||
# Even you can specify cross compiler. Meanwhile, please set HOSTCC.
|
||||
|
||||
|
|
|
|||
|
|
@ -3,17 +3,262 @@ $NetBSD$
|
|||
Fully control the library name via LIBNAMESUFFIX
|
||||
And the ARCH_ thing.
|
||||
|
||||
--- Makefile.system.orig 2018-12-31 23:09:59.000000000 +0100
|
||||
+++ Makefile.system 2019-03-22 17:52:10.951870000 +0100
|
||||
@@ -265,6 +265,7 @@
|
||||
--- Makefile.system.orig 2019-08-11 21:23:27.000000000 +0000
|
||||
+++ Makefile.system
|
||||
@@ -15,13 +15,13 @@ ARCH := $(shell uname -m)
|
||||
endif
|
||||
|
||||
# Catch conflicting usage of ARCH in some BSD environments
|
||||
-ifeq ($(ARCH), amd64)
|
||||
+ifeq ($(ARCH_), amd64)
|
||||
override ARCH=x86_64
|
||||
-else ifeq ($(ARCH), powerpc64)
|
||||
+else ifeq ($(ARCH_), powerpc64)
|
||||
override ARCH=power
|
||||
-else ifeq ($(ARCH), i386)
|
||||
+else ifeq ($(ARCH_), i386)
|
||||
override ARCH=x86
|
||||
-else ifeq ($(ARCH), aarch64)
|
||||
+else ifeq ($(ARCH_), aarch64)
|
||||
override ARCH=arm64
|
||||
endif
|
||||
|
||||
@@ -143,7 +143,7 @@ endif
|
||||
|
||||
|
||||
# On x86_64 build getarch with march=native. This is required to detect AVX512 support in getarch.
|
||||
-ifeq ($(ARCH), x86_64)
|
||||
+ifeq ($(ARCH_), x86_64)
|
||||
ifneq ($(C_COMPILER), PGI)
|
||||
GETARCH_FLAGS += -march=native
|
||||
endif
|
||||
@@ -285,6 +285,7 @@ MD5SUM = md5 -r
|
||||
endif
|
||||
|
||||
ifneq (,$(findstring $(OSNAME), FreeBSD OpenBSD DragonFly))
|
||||
+EXTRALIB += -lm %%LDFLAGS%%
|
||||
+EXTRALIB += -lm -Wl,-R/stuff/sw/env/system-gcc/pkgsrc/cvs-20190321/lib
|
||||
MD5SUM = md5 -r
|
||||
endif
|
||||
|
||||
@@ -1204,31 +1205,15 @@
|
||||
@@ -341,7 +342,7 @@ endif
|
||||
|
||||
# Ensure the correct stack alignment on Win32
|
||||
# http://permalink.gmane.org/gmane.comp.lib.openblas.general/97
|
||||
-ifeq ($(ARCH), x86)
|
||||
+ifeq ($(ARCH_), x86)
|
||||
CCOMMON_OPT += -mincoming-stack-boundary=2
|
||||
FCOMMON_OPT += -mincoming-stack-boundary=2
|
||||
endif
|
||||
@@ -383,8 +384,8 @@ CCOMMON_OPT += -DQUAD_PRECISION
|
||||
NO_EXPRECISION = 1
|
||||
endif
|
||||
|
||||
-ifneq ($(ARCH), x86)
|
||||
-ifneq ($(ARCH), x86_64)
|
||||
+ifneq ($(ARCH_), x86)
|
||||
+ifneq ($(ARCH_), x86_64)
|
||||
NO_EXPRECISION = 1
|
||||
endif
|
||||
endif
|
||||
@@ -413,7 +414,7 @@ endif
|
||||
# Architecture dependent settings
|
||||
#
|
||||
|
||||
-ifeq ($(ARCH), x86)
|
||||
+ifeq ($(ARCH_), x86)
|
||||
ifndef BINARY
|
||||
NO_BINARY_MODE = 1
|
||||
endif
|
||||
@@ -439,7 +440,7 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH), x86_64)
|
||||
+ifeq ($(ARCH_), x86_64)
|
||||
|
||||
ifeq ($(CORE), generic)
|
||||
NO_EXPRECISION = 1
|
||||
@@ -503,12 +504,12 @@ endif
|
||||
|
||||
|
||||
ifeq ($(DYNAMIC_ARCH), 1)
|
||||
-ifeq ($(ARCH), x86)
|
||||
+ifeq ($(ARCH_), x86)
|
||||
DYNAMIC_CORE = KATMAI COPPERMINE NORTHWOOD PRESCOTT BANIAS \
|
||||
CORE2 PENRYN DUNNINGTON NEHALEM ATHLON OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH), x86_64)
|
||||
+ifeq ($(ARCH_), x86_64)
|
||||
DYNAMIC_CORE = PRESCOTT CORE2
|
||||
ifeq ($(DYNAMIC_OLDER), 1)
|
||||
DYNAMIC_CORE += PENRYN DUNNINGTON
|
||||
@@ -542,14 +543,14 @@ CCOMMON_OPT += $(XCCOMMON_OPT)
|
||||
#CCOMMON_OPT += -DDYNAMIC_LIST='$(DYNAMIC_LIST)'
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH), arm64)
|
||||
+ifeq ($(ARCH_), arm64)
|
||||
DYNAMIC_CORE = ARMV8
|
||||
DYNAMIC_CORE += CORTEXA57
|
||||
DYNAMIC_CORE += THUNDERX
|
||||
DYNAMIC_CORE += THUNDERX2T99
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH), power)
|
||||
+ifeq ($(ARCH_), power)
|
||||
DYNAMIC_CORE = POWER6
|
||||
DYNAMIC_CORE += POWER8
|
||||
DYNAMIC_CORE += POWER9
|
||||
@@ -561,7 +562,7 @@ override DYNAMIC_ARCH=
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH), ia64)
|
||||
+ifeq ($(ARCH_), ia64)
|
||||
NO_BINARY_MODE = 1
|
||||
BINARY_DEFINED = 1
|
||||
|
||||
@@ -573,16 +574,16 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH), $(filter $(ARCH),mips64 mips))
|
||||
+ifeq ($(ARCH_), $(filter $(ARCH_),mips64 mips))
|
||||
NO_BINARY_MODE = 1
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH), alpha)
|
||||
+ifeq ($(ARCH_), alpha)
|
||||
NO_BINARY_MODE = 1
|
||||
BINARY_DEFINED = 1
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH), arm)
|
||||
+ifeq ($(ARCH_), arm)
|
||||
NO_BINARY_MODE = 1
|
||||
BINARY_DEFINED = 1
|
||||
|
||||
@@ -604,7 +605,7 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH), arm64)
|
||||
+ifeq ($(ARCH_), arm64)
|
||||
NO_BINARY_MODE = 1
|
||||
BINARY_DEFINED = 1
|
||||
endif
|
||||
@@ -630,14 +631,14 @@ endif
|
||||
|
||||
ifdef NO_BINARY_MODE
|
||||
|
||||
-ifeq ($(ARCH), $(filter $(ARCH),mips64))
|
||||
+ifeq ($(ARCH_), $(filter $(ARCH_),mips64))
|
||||
ifdef BINARY64
|
||||
CCOMMON_OPT += -mabi=64
|
||||
else
|
||||
CCOMMON_OPT += -mabi=n32
|
||||
endif
|
||||
BINARY_DEFINED = 1
|
||||
-else ifeq ($(ARCH), $(filter $(ARCH),mips))
|
||||
+else ifeq ($(ARCH_), $(filter $(ARCH_),mips))
|
||||
CCOMMON_OPT += -mabi=32
|
||||
BINARY_DEFINED = 1
|
||||
endif
|
||||
@@ -772,13 +773,13 @@ ifneq ($(NO_LAPACK), 1)
|
||||
EXTRALIB += -lgfortran
|
||||
endif
|
||||
ifdef NO_BINARY_MODE
|
||||
-ifeq ($(ARCH), $(filter $(ARCH),mips64))
|
||||
+ifeq ($(ARCH_), $(filter $(ARCH_),mips64))
|
||||
ifdef BINARY64
|
||||
FCOMMON_OPT += -mabi=64
|
||||
else
|
||||
FCOMMON_OPT += -mabi=n32
|
||||
endif
|
||||
-else ifeq ($(ARCH), $(filter $(ARCH),mips))
|
||||
+else ifeq ($(ARCH_), $(filter $(ARCH_),mips))
|
||||
FCOMMON_OPT += -mabi=32
|
||||
endif
|
||||
else
|
||||
@@ -882,7 +883,7 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH), $(filter $(ARCH),mips64 mips))
|
||||
+ifeq ($(ARCH_), $(filter $(ARCH_),mips64 mips))
|
||||
ifndef BINARY64
|
||||
FCOMMON_OPT += -n32
|
||||
else
|
||||
@@ -912,7 +913,7 @@ endif
|
||||
|
||||
ifeq ($(C_COMPILER), OPEN64)
|
||||
|
||||
-ifeq ($(ARCH), $(filter $(ARCH),mips64 mips))
|
||||
+ifeq ($(ARCH_), $(filter $(ARCH_),mips64 mips))
|
||||
ifndef BINARY64
|
||||
CCOMMON_OPT += -n32
|
||||
else
|
||||
@@ -938,7 +939,7 @@ endif
|
||||
|
||||
ifeq ($(C_COMPILER), SUN)
|
||||
CCOMMON_OPT += -w
|
||||
-ifeq ($(ARCH), x86)
|
||||
+ifeq ($(ARCH_), x86)
|
||||
CCOMMON_OPT += -m32
|
||||
else
|
||||
FCOMMON_OPT += -m64
|
||||
@@ -947,7 +948,7 @@ endif
|
||||
|
||||
ifeq ($(F_COMPILER), SUN)
|
||||
CCOMMON_OPT += -DF_INTERFACE_SUN
|
||||
-ifeq ($(ARCH), x86)
|
||||
+ifeq ($(ARCH_), x86)
|
||||
FCOMMON_OPT += -m32
|
||||
else
|
||||
FCOMMON_OPT += -m64
|
||||
@@ -1008,7 +1009,7 @@ ifeq ($(NO_AVX), 1)
|
||||
CCOMMON_OPT += -DNO_AVX
|
||||
endif
|
||||
|
||||
-ifeq ($(ARCH), x86)
|
||||
+ifeq ($(ARCH_), x86)
|
||||
CCOMMON_OPT += -DNO_AVX
|
||||
endif
|
||||
|
||||
@@ -1023,7 +1024,7 @@ endif
|
||||
ifdef SMP
|
||||
CCOMMON_OPT += -DSMP_SERVER
|
||||
|
||||
-ifeq ($(ARCH), mips64)
|
||||
+ifeq ($(ARCH_), mips64)
|
||||
ifneq ($(CORE), LOONGSON3B)
|
||||
USE_SIMPLE_THREADED_LEVEL3 = 1
|
||||
endif
|
||||
@@ -1098,9 +1099,9 @@ else
|
||||
LIBPREFIX = lib$(LIBNAMEBASE)
|
||||
endif
|
||||
|
||||
-KERNELDIR = $(TOPDIR)/kernel/$(ARCH)
|
||||
+KERNELDIR = $(TOPDIR)/kernel/$(ARCH_)
|
||||
|
||||
-include $(TOPDIR)/Makefile.$(ARCH)
|
||||
+include $(TOPDIR)/Makefile.$(ARCH_)
|
||||
|
||||
CCOMMON_OPT += -DASMNAME=$(FU)$(*F) -DASMFNAME=$(FU)$(*F)$(BU) -DNAME=$(*F)$(BU) -DCNAME=$(*F) -DCHAR_NAME=\"$(*F)$(BU)\" -DCHAR_CNAME=\"$(*F)\"
|
||||
|
||||
@@ -1116,8 +1117,8 @@ ifneq ($(OSNAME), Linux)
|
||||
NO_AFFINITY = 1
|
||||
endif
|
||||
|
||||
-ifneq ($(ARCH), x86_64)
|
||||
-ifneq ($(ARCH), x86)
|
||||
+ifneq ($(ARCH_), x86_64)
|
||||
+ifneq ($(ARCH_), x86)
|
||||
ifneq ($(CORE), LOONGSON3B)
|
||||
NO_AFFINITY = 1
|
||||
endif
|
||||
@@ -1242,31 +1243,15 @@ ifndef LIBSUFFIX
|
||||
LIBSUFFIX = a
|
||||
endif
|
||||
|
||||
|
|
@ -49,7 +294,7 @@ And the ARCH_ thing.
|
|||
endif
|
||||
LIBDYNNAME = $(LIBNAME:.$(LIBSUFFIX)=.dylib)
|
||||
LIBDEFNAME = $(LIBNAME:.$(LIBSUFFIX)=.def)
|
||||
@@ -1259,7 +1244,7 @@
|
||||
@@ -1297,7 +1282,7 @@ LIB_COMPONENTS = CBLAS
|
||||
endif
|
||||
|
||||
export OSNAME
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
Check for old GCC
|
||||
Passing a priority level to constructor/destructor only works on GCC >= 4.3.0;
|
||||
improve the upstream check so that the build works with base GCC.
|
||||
|
||||
--- driver/others/memory.c.orig 2016-04-12 19:29:19 UTC
|
||||
+++ driver/others/memory.c
|
||||
@@ -144,7 +144,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
||||
#if defined(_MSC_VER) && !defined(__clang__)
|
||||
#define CONSTRUCTOR __cdecl
|
||||
#define DESTRUCTOR __cdecl
|
||||
-#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) && defined(C_GCC)
|
||||
+#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) || (defined(C_GCC) && ((__GNUC__ == 4) && (__GNUC_MINOR__ < 3)))
|
||||
#define CONSTRUCTOR __attribute__ ((constructor))
|
||||
#define DESTRUCTOR __attribute__ ((destructor))
|
||||
#else
|
||||
|
|
@ -2,9 +2,22 @@ $NetBSD$
|
|||
|
||||
Improve dynamic lib naming
|
||||
|
||||
--- exports/Makefile.orig 2018-12-31 23:09:59.000000000 +0100
|
||||
+++ exports/Makefile 2019-03-22 17:22:50.811953116 +0100
|
||||
@@ -160,6 +160,7 @@
|
||||
--- exports/Makefile.orig 2019-08-11 21:23:27.000000000 +0000
|
||||
+++ exports/Makefile
|
||||
@@ -100,10 +100,10 @@ dll : ../$(LIBDLLNAME)
|
||||
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) $(EXTRALIB)
|
||||
|
||||
$(LIBPREFIX).def : gensymbol
|
||||
- perl ./gensymbol win2k $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
+ perl ./gensymbol win2k $(ARCH_) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
|
||||
libgoto_hpl.def : gensymbol
|
||||
- perl ./gensymbol win2khpl $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
+ perl ./gensymbol win2khpl $(ARCH_) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
|
||||
ifeq ($(OSNAME), Darwin)
|
||||
INTERNALNAME = $(LIBPREFIX).$(MAJOR_VERSION).dylib
|
||||
@@ -173,6 +173,7 @@ endif
|
||||
#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
|
||||
ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD OpenBSD NetBSD DragonFly))
|
||||
|
||||
|
|
@ -12,7 +25,7 @@ Improve dynamic lib naming
|
|||
so : ../$(LIBSONAME)
|
||||
|
||||
ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
|
||||
@@ -171,6 +172,7 @@
|
||||
@@ -184,6 +185,7 @@ else
|
||||
endif
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
||||
-Wl,--whole-archive $< -Wl,--no-whole-archive \
|
||||
|
|
@ -20,3 +33,32 @@ Improve dynamic lib naming
|
|||
$(FEXTRALIB) $(EXTRALIB)
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
||||
rm -f linktest
|
||||
@@ -234,23 +236,23 @@ static : ../$(LIBNAME)
|
||||
rm -f goto.$(SUFFIX)
|
||||
|
||||
osx.def : gensymbol ../Makefile.system ../getarch.c
|
||||
- perl ./gensymbol osx $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
+ perl ./gensymbol osx $(ARCH_) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
|
||||
aix.def : gensymbol ../Makefile.system ../getarch.c
|
||||
- perl ./gensymbol aix $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
+ perl ./gensymbol aix $(ARCH_) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
|
||||
objcopy.def : gensymbol ../Makefile.system ../getarch.c
|
||||
- perl ./gensymbol objcopy $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
+ perl ./gensymbol objcopy $(ARCH_) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
|
||||
objconv.def : gensymbol ../Makefile.system ../getarch.c
|
||||
- perl ./gensymbol objconv $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
+ perl ./gensymbol objconv $(ARCH_) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
|
||||
|
||||
test : linktest.c
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) -lm && echo OK.
|
||||
rm -f linktest
|
||||
|
||||
linktest.c : gensymbol ../Makefile.system ../getarch.c
|
||||
- perl ./gensymbol linktest $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > linktest.c
|
||||
+ perl ./gensymbol linktest $(ARCH_) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > linktest.c
|
||||
|
||||
clean ::
|
||||
@rm -f *.def *.dylib __.SYMDEF* *.renamed
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
$NetBSD$
|
||||
|
||||
--- utest/Makefile.orig 2020-01-08 19:47:09.730906975 +0000
|
||||
+++ utest/Makefile
|
||||
@@ -16,8 +16,12 @@ OBJS=utest_main.o test_amax.o test_rotmg
|
||||
|
||||
ifneq ($(NO_LAPACK), 1)
|
||||
OBJS += test_potrs.o
|
||||
+ifneq ($(NO_LAPACKE), 1)
|
||||
+ifneq ($(NO_CBLAS), 1)
|
||||
OBJS += test_kernel_regress.o
|
||||
endif
|
||||
+endif
|
||||
+endif
|
||||
|
||||
#this does not work with OpenMP nor with native Windows or Android threads
|
||||
# FIXME TBD if this works on OSX, SunOS, POWER and zarch
|
||||
Loading…
Reference in New Issue