[libwebp] Do not emit AVX when not requested by the toolchain (#21644)

Co-authored-by: Zhao Liu <v-zhli17@microsoft.com>
This commit is contained in:
JonLiu1993 2023-07-14 11:27:50 -07:00 committed by GitHub
parent 7771648f32
commit 25be4c4c0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 3 deletions

View File

@ -1,13 +1,22 @@
diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake
index bc0dbc9..381f64a 100644
index bc0dbc9..f9b7327 100644
--- a/cmake/cpu.cmake
+++ b/cmake/cpu.cmake
@@ -48,7 +48,7 @@ if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "MSVC")
if(MSVC_VERSION GREATER_EQUAL 1800 AND NOT CMAKE_C_FLAGS MATCHES "/arch:")
set(SIMD_ENABLE_FLAGS)
else()
- set(SIMD_ENABLE_FLAGS "/arch:AVX;/arch:SSE2;;;;")
+ set(SIMD_ENABLE_FLAGS "/arch:SSE2;;;;;")
endif()
set(SIMD_DISABLE_FLAGS)
else()
@@ -97,7 +97,7 @@ foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE})
set(CMAKE_REQUIRED_FLAGS ${SIMD_COMPILE_FLAG})
webp_check_compiler_flag(${WEBP_SIMD_FLAG} ${WEBP_ENABLE_SIMD})
else()
- if(MSVC AND SIMD_ENABLE_FLAGS)
+ if(MSVC AND SIMD_ENABLE_FLAGS AND NOT (CMAKE_GENERATOR_PLATFORM MATCHES "^ARM"))
+ if(MSVC AND NOT (CMAKE_GENERATOR_PLATFORM MATCHES "^ARM"))
# The detection for SSE2/SSE4 support under MSVC is based on the compiler
# version so e.g., clang-cl will require flags to enable the assembly.
list(GET SIMD_ENABLE_FLAGS ${I_SIMD} SIMD_COMPILE_FLAG)

View File

@ -1,6 +1,7 @@
{
"name": "libwebp",
"version": "1.3.0",
"port-version": 1,
"description": "WebP codec: library to encode and decode images in WebP format",
"homepage": "https://github.com/webmproject/libwebp",
"license": "BSD-3-Clause",

View File

@ -4770,7 +4770,7 @@
},
"libwebp": {
"baseline": "1.3.0",
"port-version": 0
"port-version": 1
},
"libwebsockets": {
"baseline": "4.3.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "519daa6213a5995a860ed724c465adf9ff83b52a",
"version": "1.3.0",
"port-version": 1
},
{
"git-tree": "d11b6a22e2acdba95c761dd4045cd8d66095f42d",
"version": "1.3.0",