diff options
Diffstat (limited to 'extra/openal/openal-i686.patch')
-rw-r--r-- | extra/openal/openal-i686.patch | 115 |
1 files changed, 65 insertions, 50 deletions
diff --git a/extra/openal/openal-i686.patch b/extra/openal/openal-i686.patch index 44261849..4a42844d 100644 --- a/extra/openal/openal-i686.patch +++ b/extra/openal/openal-i686.patch @@ -1,53 +1,68 @@ -diff -rauN openal/CMakeLists.txt openal-i686-patch/CMakeLists.txt ---- openal/CMakeLists.txt 2019-12-12 17:07:05.966917263 +0100 -+++ openal-i686-patch/CMakeLists.txt 2019-12-12 19:11:43.256675497 +0100 -@@ -307,28 +307,28 @@ - SET(SSE4_1_SWITCH "") - SET(FPU_NEON_SWITCH "") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0cf0613d..53b325db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -369,20 +369,25 @@ set(HAVE_SSE3 0) + set(HAVE_SSE4_1 0) + set(HAVE_NEON 0) --CHECK_C_COMPILER_FLAG(-msse2 HAVE_MSSE2_SWITCH) --IF(HAVE_MSSE2_SWITCH) -- SET(SSE2_SWITCH "-msse2") --ENDIF() --CHECK_C_COMPILER_FLAG(-msse3 HAVE_MSSE3_SWITCH) --IF(HAVE_MSSE3_SWITCH) -- SET(SSE3_SWITCH "-msse3") --ENDIF() --CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_MSSE4_1_SWITCH) --IF(HAVE_MSSE4_1_SWITCH) -- SET(SSE4_1_SWITCH "-msse4.1") --ENDIF() --CHECK_C_COMPILER_FLAG(-mfpu=neon HAVE_MFPU_NEON_SWITCH) --IF(HAVE_MFPU_NEON_SWITCH) -- SET(FPU_NEON_SWITCH "-mfpu=neon") --ENDIF() -+#~ CHECK_C_COMPILER_FLAG(-msse2 HAVE_MSSE2_SWITCH) -+#~ IF(HAVE_MSSE2_SWITCH) -+ #~ SET(SSE2_SWITCH "-msse2") -+#~ ENDIF() -+#~ CHECK_C_COMPILER_FLAG(-msse3 HAVE_MSSE3_SWITCH) -+#~ IF(HAVE_MSSE3_SWITCH) -+ #~ SET(SSE3_SWITCH "-msse3") -+#~ ENDIF() -+#~ CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_MSSE4_1_SWITCH) -+#~ IF(HAVE_MSSE4_1_SWITCH) -+ #~ SET(SSE4_1_SWITCH "-msse4.1") -+#~ ENDIF() -+#~ CHECK_C_COMPILER_FLAG(-mfpu=neon HAVE_MFPU_NEON_SWITCH) -+#~ IF(HAVE_MFPU_NEON_SWITCH) -+ #~ SET(FPU_NEON_SWITCH "-mfpu=neon") -+#~ ENDIF() +-# Check for SSE+SSE2 support ++# Check for SSE support + option(ALSOFT_REQUIRE_SSE "Require SSE support" OFF) +-option(ALSOFT_REQUIRE_SSE2 "Require SSE2 support" OFF) +-if(HAVE_XMMINTRIN_H AND HAVE_EMMINTRIN_H) ++if(HAVE_XMMINTRIN_H) + option(ALSOFT_CPUEXT_SSE "Enable SSE support" ON) +- option(ALSOFT_CPUEXT_SSE2 "Enable SSE2 support" ON) +- if(ALSOFT_CPUEXT_SSE AND ALSOFT_CPUEXT_SSE2) ++ if(ALSOFT_CPUEXT_SSE) + set(HAVE_SSE 1) +- set(HAVE_SSE2 1) + endif() + endif() + if(ALSOFT_REQUIRE_SSE AND NOT HAVE_SSE) + message(FATAL_ERROR "Failed to enabled required SSE CPU extensions") + endif() ++ ++option(ALSOFT_REQUIRE_SSE2 "Require SSE2 support" OFF) ++if(HAVE_EMMINTRIN_H) ++ option(ALSOFT_CPUEXT_SSE2 "Enable SSE2 support" ON) ++ if(HAVE_SSE AND ALSOFT_CPUEXT_SSE2) ++ set(HAVE_SSE2 1) ++ endif() ++endif() + if(ALSOFT_REQUIRE_SSE2 AND NOT HAVE_SSE2) + message(FATAL_ERROR "Failed to enable required SSE2 CPU extensions") + endif() +@@ -758,9 +763,13 @@ set(ALC_OBJS --CHECK_INCLUDE_FILE(xmmintrin.h HAVE_XMMINTRIN_H "${SSE2_SWITCH}") --CHECK_INCLUDE_FILE(emmintrin.h HAVE_EMMINTRIN_H "${SSE2_SWITCH}") --CHECK_INCLUDE_FILE(pmmintrin.h HAVE_PMMINTRIN_H "${SSE3_SWITCH}") --CHECK_INCLUDE_FILE(smmintrin.h HAVE_SMMINTRIN_H "${SSE4_1_SWITCH}") --CHECK_INCLUDE_FILE(arm_neon.h HAVE_ARM_NEON_H "${FPU_NEON_SWITCH}") -+#~ CHECK_INCLUDE_FILE(xmmintrin.h HAVE_XMMINTRIN_H "${SSE2_SWITCH}") -+#~ CHECK_INCLUDE_FILE(emmintrin.h HAVE_EMMINTRIN_H "${SSE2_SWITCH}") -+#~ CHECK_INCLUDE_FILE(pmmintrin.h HAVE_PMMINTRIN_H "${SSE3_SWITCH}") -+#~ CHECK_INCLUDE_FILE(smmintrin.h HAVE_SMMINTRIN_H "${SSE4_1_SWITCH}") -+#~ CHECK_INCLUDE_FILE(arm_neon.h HAVE_ARM_NEON_H "${FPU_NEON_SWITCH}") + # Include SIMD mixers + set(CPU_EXTS "Default") ++if(HAVE_SSE) ++ set(CORE_OBJS ${CORE_OBJS} core/mixer/mixer_sse.cpp) ++ set(CPU_EXTS "${CPU_EXTS}, SSE") ++endif() + if(HAVE_SSE2) +- set(CORE_OBJS ${CORE_OBJS} core/mixer/mixer_sse.cpp core/mixer/mixer_sse2.cpp) +- set(CPU_EXTS "${CPU_EXTS}, SSE, SSE2") ++ set(CORE_OBJS ${CORE_OBJS} core/mixer/mixer_sse2.cpp) ++ set(CPU_EXTS "${CPU_EXTS}, SSE2") + endif() + if(HAVE_SSE3) + set(CORE_OBJS ${CORE_OBJS} core/mixer/mixer_sse3.cpp) +diff --git a/core/mixer/mixer_sse.cpp b/core/mixer/mixer_sse.cpp +index 23caf797..c0fd8fa1 100644 +--- a/core/mixer/mixer_sse.cpp ++++ b/core/mixer/mixer_sse.cpp +@@ -15,9 +15,8 @@ struct BSincTag; + struct FastBSincTag; - SET(SSE_FLAGS ) - SET(FPMATH_SET "0") + +-/* SSE2 is required for any SSE support. */ +-#if defined(__GNUC__) && !defined(__clang__) && !defined(__SSE2__) +-#pragma GCC target("sse2") ++#if defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__) ++#pragma GCC target("sse") + #endif + + namespace { |