diff options
| author | Miao Wang <miaowang@google.com> | 2015-07-15 15:44:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-15 15:44:20 +0000 |
| commit | dd9b850119e4b275c32266aada5ed4f056e891eb (patch) | |
| tree | 8aa0fca8a31de7cb0b09ca6810d20534fc44659b | |
| parent | ba5b34da65630f3bfcaa20ae962e8d5bad1276a7 (diff) | |
| parent | 8a387c93d83d5375edf414497775e6145b447f40 (diff) | |
| download | eigen-dd9b850119e4b275c32266aada5ed4f056e891eb.tar.gz | |
Merge "Make eigen and libblas able to build for API8 x86 target."
| -rw-r--r-- | Eigen/src/Core/util/Memory.h | 2 | ||||
| -rw-r--r-- | blas/Android.mk | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index b9af5cf8c..754e29bc5 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -72,7 +72,7 @@ #define EIGEN_HAS_POSIX_MEMALIGN 0 #endif -#ifdef EIGEN_VECTORIZE_SSE +#if defined(EIGEN_VECTORIZE_SSE) && !defined(EIGEN_ANDROID_POSIX_MEMALIGN_WR) #define EIGEN_HAS_MM_MALLOC 1 #else #define EIGEN_HAS_MM_MALLOC 0 diff --git a/blas/Android.mk b/blas/Android.mk index 1d4300bae..edddaea1b 100644 --- a/blas/Android.mk +++ b/blas/Android.mk @@ -60,6 +60,9 @@ LOCAL_CLANG := true # EIGEN_ANDROID_SSE_WR is for "Eigen Android SSE Work Around" # Will be removed after we understand it better. LOCAL_CFLAGS += -DEIGEN_ANDROID_SSE_WR +# EIGEN_ANDROID_POSIX_MEMALIGN_WR is for "Eigen Android posix_memalign Work Around" +# Only used for build for low Android API(x86 target) without posix_memalign. +LOCAL_CFLAGS += -DEIGEN_ANDROID_POSIX_MEMALIGN_WR LOCAL_MODULE := libF77blasV8 LOCAL_SDK_VERSION := 8 LOCAL_NDK_STL_VARIANT := stlport_static |