Branch: master

835eebc8 2016-10-02 17:20:40 Timothy Pearson
Temporarily disable FFTS AltiVec support pending update to use new data types
M lib/ffts/src/macros.h
diff --git a/lib/ffts/src/macros.h b/lib/ffts/src/macros.h
index b755775..e7e349f 100644
--- a/lib/ffts/src/macros.h
+++ b/lib/ffts/src/macros.h
@@ -42,8 +42,9 @@
 #include "macros-neon.h"
 #elif HAVE_SSE
 #include "macros-sse.h"
-#elif __powerpc__
-#include "macros-altivec.h"
+// NOTE: AltiVec support disabled until updated to provide new V4SF variable type
+//#elif __powerpc__
+//#include "macros-altivec.h"
 #else
 #include "macros-alpha.h"
 #endif
@@ -201,4 +202,4 @@
 #define V4SF_S_4(r0, r1, r2, r3, o0, o1, o2, o3) \
     V4SF_ST(o0, r0); V4SF_ST(o1, r1); V4SF_ST(o2, r2); V4SF_ST(o3, r3);
 
-#endif /* FFTS_MACROS_H */
\ No newline at end of file
+#endif /* FFTS_MACROS_H */
db047c23 2016-10-02 17:29:17 Timothy Pearson
Pass correct options to FFTS ARM builds
M lib/ffts/debian/rules
diff --git a/lib/ffts/debian/rules b/lib/ffts/debian/rules
index fe423d8..070c5fd 100755
--- a/lib/ffts/debian/rules
+++ b/lib/ffts/debian/rules
@@ -21,7 +21,11 @@
 ifneq (,$(findstring x86_64-,$(DEB_BUILD_GNU_TYPE)))
 	cdbs_configure_flags := --enable-single --enable-sse --enable-shared --disable-rpath
 else ifneq (,$(findstring arm-,$(DEB_BUILD_GNU_TYPE)))
-	cdbs_configure_flags := --enable-single --enable-neon --enable-shared --disable-rpath
+	ifneq(,$(findstring armhf,$(DEB_HOST_ARCH)))
+		cdbs_configure_flags := --enable-single --enable-neon --float_abi=hard --enable-shared --disable-rpath
+	else
+else ifneq (,$(findstring aarch64-,$(DEB_BUILD_GNU_TYPE)))
+	cdbs_configure_flags := --enable-single --enable-neon --float_abi=hard --enable-shared --disable-rpath
 else
 	cdbs_configure_flags := --enable-single --enable-shared --disable-rpath
 endif