Date: Sat, 25 Feb 2017 18:19:51 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434832 - in head/math/openblas: . files Message-ID: <201702251819.v1PIJpiJ072015@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Sat Feb 25 18:19:50 2017 New Revision: 434832 URL: https://svnweb.freebsd.org/changeset/ports/434832 Log: math/openblas: Fix build on 12-CURRENT armv6. The build still fails on 11 armv6, however MFC of r313873 will hopefully fix the build there as well. While here also add LICENSE_FILE and fix portlint warnings. PR: 217279 Submitted by: mikael.urankar@gmail.com Approved by: phd_kimberlite@yahoo.co.jp (maintainer), swills (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D9801 Added: head/math/openblas/files/patch-common__arm.h (contents, props changed) head/math/openblas/files/patch-cpuid__arm.c (contents, props changed) Modified: head/math/openblas/Makefile head/math/openblas/files/patch-interface__ztrmv.c Modified: head/math/openblas/Makefile ============================================================================== --- head/math/openblas/Makefile Sat Feb 25 17:52:25 2017 (r434831) +++ head/math/openblas/Makefile Sat Feb 25 18:19:50 2017 (r434832) @@ -14,6 +14,7 @@ MAINTAINER= phd_kimberlite@yahoo.co.jp COMMENT= Optimized BLAS library based on GotoBLAS2 LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= xianyi Added: head/math/openblas/files/patch-common__arm.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/openblas/files/patch-common__arm.h Sat Feb 25 18:19:50 2017 (r434832) @@ -0,0 +1,24 @@ +--- common_arm.h.orig 2016-09-01 03:58:42 UTC ++++ common_arm.h +@@ -93,6 +93,13 @@ static inline int blas_quickdivide(blasi + + #endif + ++/* Translate pre-UAL asm to UAL equivalents */ ++#if defined(__clang__) ++#define fnmacs vmls.f32 ++#define fnmacd vmls.f64 ++#define fnmuls vnmul.f32 ++#define fnmuld vnmul.f64 ++#endif + + #ifndef F_INTERFACE + #define REALNAME ASMNAME +@@ -105,7 +112,6 @@ static inline int blas_quickdivide(blasi + #define PROLOGUE \ + .arm ;\ + .global REALNAME ;\ +- .func REALNAME ;\ + REALNAME: + + #define EPILOGUE Added: head/math/openblas/files/patch-cpuid__arm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/openblas/files/patch-cpuid__arm.c Sat Feb 25 18:19:50 2017 (r434832) @@ -0,0 +1,12 @@ +--- cpuid_arm.c.orig 2016-09-01 03:58:42 UTC ++++ cpuid_arm.c +@@ -181,7 +181,8 @@ int detect(void) + } + + } +- ++#else ++ return CPU_ARMV6; + #endif + + return CPU_UNKNOWN; Modified: head/math/openblas/files/patch-interface__ztrmv.c ============================================================================== --- head/math/openblas/files/patch-interface__ztrmv.c Sat Feb 25 17:52:25 2017 (r434831) +++ head/math/openblas/files/patch-interface__ztrmv.c Sat Feb 25 18:19:50 2017 (r434832) @@ -1,6 +1,6 @@ ---- interface/ztrmv.c.orig 2016-08-31 20:58:42.000000000 -0700 -+++ interface/ztrmv.c 2017-01-01 10:26:22.759442000 -0800 -@@ -242,7 +242,7 @@ +--- interface/ztrmv.c.orig 2016-09-01 03:58:42 UTC ++++ interface/ztrmv.c +@@ -242,7 +242,7 @@ void CNAME(enum CBLAS_ORDER order, enum else #endif {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702251819.v1PIJpiJ072015>