Date: Thu, 29 Mar 2018 04:04:22 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465863 - head/math/openblas/files Message-ID: <201803290404.w2T44Mjb013840@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon Date: Thu Mar 29 04:04:21 2018 New Revision: 465863 URL: https://svnweb.freebsd.org/changeset/ports/465863 Log: Patch to fix build on armvX. Tested for no-harm on amd64. PR: 225693 Submitted by: mikael.urankar Approved by: maintainer timeout (> 2 weeks) Modified: head/math/openblas/files/patch-common__arm.h head/math/openblas/files/patch-cpuid__arm.c Modified: head/math/openblas/files/patch-common__arm.h ============================================================================== --- head/math/openblas/files/patch-common__arm.h Thu Mar 29 03:37:40 2018 (r465862) +++ head/math/openblas/files/patch-common__arm.h Thu Mar 29 04:04:21 2018 (r465863) @@ -1,6 +1,6 @@ --- common_arm.h.orig 2016-09-01 03:58:42 UTC +++ common_arm.h -@@ -93,6 +93,13 @@ static inline int blas_quickdivide(blasi +@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasint x, blasint #endif @@ -10,6 +10,10 @@ +#define fnmacd vmls.f64 +#define fnmuls vnmul.f32 +#define fnmuld vnmul.f64 ++#define fldmias vldmia ++#define fstmias vstmia ++#define fldmiad vldmia ++#define fstmiad vstmia +#endif #ifndef F_INTERFACE Modified: head/math/openblas/files/patch-cpuid__arm.c ============================================================================== --- head/math/openblas/files/patch-cpuid__arm.c Thu Mar 29 03:37:40 2018 (r465862) +++ head/math/openblas/files/patch-cpuid__arm.c Thu Mar 29 04:04:21 2018 (r465863) @@ -1,12 +1,16 @@ --- cpuid_arm.c.orig 2016-09-01 03:58:42 UTC +++ cpuid_arm.c -@@ -181,7 +181,8 @@ int detect(void) +@@ -181,7 +181,12 @@ int detect(void) } } - +#else ++#if (__ARM_ARCH == 7) ++ return CPU_ARMV7; ++#else + return CPU_ARMV6; ++#endif #endif return CPU_UNKNOWN;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803290404.w2T44Mjb013840>