authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-06-07 22:12:03+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-06-07 22:12:03+02:00
log06d50d046a451e5966b1cb514b52c8cc42885484
treeab965506f236ef18c0e9b392dde1e13c9bdfee7a
parent2e3154428501d745f3f6e6e67231420cadb43bb4
signaturebadge-check Signed by PGP key B5690EEEBB952194

cmake: Fix arm/thumb arch checks

Closes #24114.

1 files changed, 4 insertions(+), 4 deletions(-)

CMakeLists.txt+4-4
...@@ -797,13 +797,13 @@ elseif(ZIG_HOST_TARGET_ARCH STREQUAL "amd64")...@@ -797,13 +797,13 @@ elseif(ZIG_HOST_TARGET_ARCH STREQUAL "amd64")
797 set(ZIG_HOST_TARGET_ARCH "x86_64")797 set(ZIG_HOST_TARGET_ARCH "x86_64")
798elseif(ZIG_HOST_TARGET_ARCH STREQUAL "arm64")798elseif(ZIG_HOST_TARGET_ARCH STREQUAL "arm64")
799 set(ZIG_HOST_TARGET_ARCH "aarch64")799 set(ZIG_HOST_TARGET_ARCH "aarch64")
800elseif(ZIG_HOST_TARGET_ARCH STREQUAL "armv7l")800elseif(ZIG_HOST_TARGET_ARCH MATCHES "^armv[7-8]l$")
801 set(ZIG_HOST_TARGET_ARCH "arm")801 set(ZIG_HOST_TARGET_ARCH "arm")
802elseif(ZIG_HOST_TARGET_ARCH STREQUAL "armv7b")802elseif(ZIG_HOST_TARGET_ARCH MATCHES "^armv[7-8]b$")
803 set(ZIG_HOST_TARGET_ARCH "armeb")803 set(ZIG_HOST_TARGET_ARCH "armeb")
804endif()804endif()
805string(REGEX REPLACE "^((arm|thumb)(hf?)?)el$" "\\1" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}")805string(REGEX REPLACE "^((arm|thumb)(hf?)?)el$" "\\2" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}")
806if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(hf?)?(eb)?$")806if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(eb)?$")
807 check_symbol_exists(__thumb__ "" ZIG_HOST_TARGET_DEFAULTS_TO_THUMB)807 check_symbol_exists(__thumb__ "" ZIG_HOST_TARGET_DEFAULTS_TO_THUMB)
808 if(ZIG_HOST_TARGET_DEFAULTS_TO_THUMB)808 if(ZIG_HOST_TARGET_DEFAULTS_TO_THUMB)
809 string(REGEX REPLACE "^arm" "thumb" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}")809 string(REGEX REPLACE "^arm" "thumb" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}")