Patch to fix build on armvX.

Tested for no-harm on amd64.

PR:		225693
Submitted by:	mikael.urankar
Approved by:	maintainer timeout (> 2 weeks)
This commit is contained in:
Mark Linimon 2018-03-29 04:04:21 +00:00
parent 845b20b1ff
commit c949a53eed
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=465863
2 changed files with 10 additions and 2 deletions

View file

@ -1,6 +1,6 @@
--- common_arm.h.orig 2016-09-01 03:58:42 UTC --- common_arm.h.orig 2016-09-01 03:58:42 UTC
+++ common_arm.h +++ 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 #endif
@ -10,6 +10,10 @@
+#define fnmacd vmls.f64 +#define fnmacd vmls.f64
+#define fnmuls vnmul.f32 +#define fnmuls vnmul.f32
+#define fnmuld vnmul.f64 +#define fnmuld vnmul.f64
+#define fldmias vldmia
+#define fstmias vstmia
+#define fldmiad vldmia
+#define fstmiad vstmia
+#endif +#endif
#ifndef F_INTERFACE #ifndef F_INTERFACE

View file

@ -1,12 +1,16 @@
--- cpuid_arm.c.orig 2016-09-01 03:58:42 UTC --- cpuid_arm.c.orig 2016-09-01 03:58:42 UTC
+++ cpuid_arm.c +++ cpuid_arm.c
@@ -181,7 +181,8 @@ int detect(void) @@ -181,7 +181,12 @@ int detect(void)
} }
} }
- -
+#else +#else
+#if (__ARM_ARCH == 7)
+ return CPU_ARMV7;
+#else
+ return CPU_ARMV6; + return CPU_ARMV6;
+#endif
#endif #endif
return CPU_UNKNOWN; return CPU_UNKNOWN;