diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Eigen/src/Core/util/XprHelper.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7162e4457..4016de370 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,13 +98,13 @@ if(CMAKE_COMPILER_IS_GNUCXX) message("Enabling SSE4.2 in tests/examples") endif() - option(EIGEN_TEST_ALTIVEC "Enable/Disable altivec in tests/examples" OFF) + option(EIGEN_TEST_ALTIVEC "Enable/Disable AltiVec in tests/examples" OFF) if(EIGEN_TEST_ALTIVEC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maltivec -mabi=altivec") message("Enabling AltiVec in tests/examples") endif() - option(EIGEN_TEST_NEON "Enable/Disable altivec in tests/examples" OFF) + option(EIGEN_TEST_NEON "Enable/Disable Neon in tests/examples" OFF) if(EIGEN_TEST_NEON) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=softfp -mfpu=neon -mcpu=cortex-a8") message("Enabling NEON in tests/examples") diff --git a/Eigen/src/Core/util/XprHelper.h b/Eigen/src/Core/util/XprHelper.h index 67665d91d..eff055b04 100644 --- a/Eigen/src/Core/util/XprHelper.h +++ b/Eigen/src/Core/util/XprHelper.h @@ -90,12 +90,11 @@ class ei_compute_matrix_flags is_dynamic_size_storage = MaxRows==Dynamic || MaxCols==Dynamic, #if !defined(__ARM_NEON__) is_fixed_size_aligned - = (!is_dynamic_size_storage) + = (!is_dynamic_size_storage) && (((MaxCols*MaxRows) % ei_packet_traits<Scalar>::size) == 0), #else // FIXME!!! This is a hack because ARM gcc does not honour __attribute__((aligned(16))) properly - is_fixed_size_aligned = 0 + is_fixed_size_aligned = 0, #endif - && (((MaxCols*MaxRows) % ei_packet_traits<Scalar>::size) == 0), aligned_bit = (((Options&DontAlign)==0) && (is_dynamic_size_storage || is_fixed_size_aligned)) ? AlignedBit : 0, |