diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2018-03-29 12:04:21 +0800 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2018-03-29 12:04:21 +0800 |
| commit | c949a53eed5acddca8e0eee851a65567647c0f1f (patch) | |
| tree | e3d1f1350d75773776cc4a36504e9e9a51ebbe8a | |
| parent | 845b20b1ff858caedad45d2d716d959061dfcac0 (diff) | |
| download | freebsd-ports-c949a53eed5acddca8e0eee851a65567647c0f1f.tar.gz freebsd-ports-c949a53eed5acddca8e0eee851a65567647c0f1f.tar.zst freebsd-ports-c949a53eed5acddca8e0eee851a65567647c0f1f.zip | |
Patch to fix build on armvX.
Tested for no-harm on amd64.
PR: 225693
Submitted by: mikael.urankar
Approved by: maintainer timeout (> 2 weeks)
Notes
Notes:
svn path=/head/; revision=465863
| -rw-r--r-- | math/openblas/files/patch-common__arm.h | 6 | ||||
| -rw-r--r-- | math/openblas/files/patch-cpuid__arm.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/math/openblas/files/patch-common__arm.h b/math/openblas/files/patch-common__arm.h index 8d61c3e232d8..f42591543dc0 100644 --- a/math/openblas/files/patch-common__arm.h +++ b/math/openblas/files/patch-common__arm.h @@ -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 diff --git a/math/openblas/files/patch-cpuid__arm.c b/math/openblas/files/patch-cpuid__arm.c index 11bdbb26c5f2..0aa24dc52a12 100644 --- a/math/openblas/files/patch-cpuid__arm.c +++ b/math/openblas/files/patch-cpuid__arm.c @@ -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; |