diff --git a/core/SCsub b/core/SCsub index dfd8ab17bee6..7c1b8c233d62 100644 --- a/core/SCsub +++ b/core/SCsub @@ -139,11 +139,10 @@ if env["builtin_zstd"]: "decompress/zstd_ddict.c", "decompress/zstd_decompress_block.c", "decompress/zstd_decompress.c", + "decompress/huf_decompress_amd64.S", ] - if env["platform"] in ["android", "ios", "linuxbsd", "macos"] and env["arch"] == "x86_64": + if env["platform"] in ["android", "ios", "linuxbsd", "macos"] and env["arch"] != "x86_64": # Match platforms with ZSTD_ASM_SUPPORTED in common/portability_macros.h - thirdparty_zstd_sources.append("decompress/huf_decompress_amd64.S") - else: env.Append(CPPDEFINES=["ZSTD_DISABLE_ASM"]) thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources] diff --git a/platform/macos/detect.py b/platform/macos/detect.py index 1ce7c86c7b88..c68accede1db 100644 --- a/platform/macos/detect.py +++ b/platform/macos/detect.py @@ -73,7 +73,7 @@ def configure(env: "SConsEnvironment"): ## Build type if env["target"] == "template_release": - if env["arch"] != "arm64": + if not env["arch"] in ["arm64", "arm32"]: env.Prepend(CCFLAGS=["-msse2"]) elif env.dev_build: env.Prepend(LINKFLAGS=["-Xlinker", "-no_deduplicate"]) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 13fdfe276215..a81f6347e068 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -705,7 +705,7 @@ def configure_mingw(env: "SConsEnvironment"): # TODO: Re-evaluate the need for this / streamline with common config. if env["target"] == "template_release": - if env["arch"] != "arm64": + if not env["arch"] in ["arm64", "arm32"]: env.Append(CCFLAGS=["-msse2"]) elif env.dev_build: # Allow big objects. It's supposed not to have drawbacks but seems to break