From eabcd35d265e480ba2af0bd6fae1d7aabdfeb860 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Tue, 28 Apr 2020 12:27:52 -0500 Subject: [PATCH] Disable use of AVX instructions in libsoxr --- cmake-proxies/libsoxr/CMakeLists.txt | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/cmake-proxies/libsoxr/CMakeLists.txt b/cmake-proxies/libsoxr/CMakeLists.txt index 5b450495d..ae74da359 100644 --- a/cmake-proxies/libsoxr/CMakeLists.txt +++ b/cmake-proxies/libsoxr/CMakeLists.txt @@ -11,7 +11,7 @@ list( APPEND SOURCES ${TARGET_ROOT}/src/cr32.c ${TARGET_ROOT}/src/cr32s.c ${TARGET_ROOT}/src/cr64.c - ${TARGET_ROOT}/src/cr64s.c +# ${TARGET_ROOT}/src/cr64s.c ${TARGET_ROOT}/src/data-io.c ${TARGET_ROOT}/src/dbesi0.c ${TARGET_ROOT}/src/fft4g.c @@ -19,10 +19,10 @@ list( APPEND SOURCES ${TARGET_ROOT}/src/fft4g64.c ${TARGET_ROOT}/src/filter.c ${TARGET_ROOT}/src/pffft32s.c - ${TARGET_ROOT}/src/pffft64s.c +# ${TARGET_ROOT}/src/pffft64s.c ${TARGET_ROOT}/src/soxr.c ${TARGET_ROOT}/src/util32s.c - ${TARGET_ROOT}/src/util64s.c +# ${TARGET_ROOT}/src/util64s.c ${TARGET_ROOT}/src/vr32.c ) @@ -71,17 +71,19 @@ set( WITH_VR32 YES ) find_package( SIMD32 ) if( SIMD32_FOUND ) - set( WITH_CR32S ON ) + set( WITH_CR32S YES ) string( STRIP ${SIMD32_C_FLAGS} SIMD32_C_FLAGS ) list( APPEND OPTIONS ${SIMD32_C_FLAGS} ) endif() -find_package( SIMD64 ) -if( SIMD64_FOUND ) - set( WITH_CR64S ON ) - string( STRIP ${SIMD64_C_FLAGS} SIMD64_C_FLAGS ) - list( APPEND OPTIONS ${SIMD64_C_FLAGS} ) -endif() +# Disabling since we do not want AVX instructions in distribution builds +# +#find_package( SIMD64 ) +#if( SIMD64_FOUND ) +# set( WITH_CR64S ON ) +# string( STRIP ${SIMD64_C_FLAGS} SIMD64_C_FLAGS ) +# list( APPEND OPTIONS ${SIMD64_C_FLAGS} ) +#endif() set( WITH_HI_PREC_CLOCK YES ) set( WITH_FLOAT_STD_PREC_CLOCK NO )