Merge 6e37a9e4da
into 6184224a66
This commit is contained in:
commit
47a83cdd9b
2 changed files with 3 additions and 3 deletions
|
@ -26,8 +26,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS} -flax-vector-conversions")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS} -flax-vector-conversions")
|
||||||
elseif (ARM_TARGET EQUAL 7)
|
elseif (ARM_TARGET EQUAL 7)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv7-a -mfpu=neon")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=native -mfpu=neon")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv7-a -mfpu=neon -flax-vector-conversions")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native -mfpu=neon -flax-vector-conversions")
|
||||||
else()
|
else()
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
|
||||||
|
|
|
@ -209,7 +209,7 @@ FORCE_INLINE void _sse2neon_smp_mb(void)
|
||||||
/* Architecture-specific build options */
|
/* Architecture-specific build options */
|
||||||
/* FIXME: #pragma GCC push_options is only available on GCC */
|
/* FIXME: #pragma GCC push_options is only available on GCC */
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
#if defined(__arm__) && __ARM_ARCH == 7
|
#if defined(__arm__)
|
||||||
/* According to ARM C Language Extensions Architecture specification,
|
/* According to ARM C Language Extensions Architecture specification,
|
||||||
* __ARM_NEON is defined to a value indicating the Advanced SIMD (NEON)
|
* __ARM_NEON is defined to a value indicating the Advanced SIMD (NEON)
|
||||||
* architecture supported.
|
* architecture supported.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue