authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-06-08 09:22:55+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-06-08 09:22:55+02:00
log201c0f54a597a53d04c782687c903cd5ea177066
tree41d33e7a7b6841c07551083533c150831ce18756
parent2e3154428501d745f3f6e6e67231420cadb43bb4
parent44155eb93c0823006f5a50ab7051770fd4d427de
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #24117 from ziglang/cmake-arm

cmake: Fix arm/thumb arch checks

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

CMakeLists.txt+3-4
......@@ -797,13 +797,12 @@ elseif(ZIG_HOST_TARGET_ARCH STREQUAL "amd64")
797797 set(ZIG_HOST_TARGET_ARCH "x86_64")
798798elseif(ZIG_HOST_TARGET_ARCH STREQUAL "arm64")
799799 set(ZIG_HOST_TARGET_ARCH "aarch64")
800elseif(ZIG_HOST_TARGET_ARCH STREQUAL "armv7l")
800elseif(ZIG_HOST_TARGET_ARCH MATCHES "^arm(el)?$" OR ZIG_HOST_TARGET_ARCH MATCHES "^armv[7-8]l$")
801801 set(ZIG_HOST_TARGET_ARCH "arm")
802elseif(ZIG_HOST_TARGET_ARCH STREQUAL "armv7b")
802elseif(ZIG_HOST_TARGET_ARCH STREQUAL "armeb" OR ZIG_HOST_TARGET_ARCH MATCHES "^armv[7-8]b$")
803803 set(ZIG_HOST_TARGET_ARCH "armeb")
804804endif()
805string(REGEX REPLACE "^((arm|thumb)(hf?)?)el$" "\\1" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}")
806if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(hf?)?(eb)?$")
805if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(eb)?$")
807806 check_symbol_exists(__thumb__ "" ZIG_HOST_TARGET_DEFAULTS_TO_THUMB)
808807 if(ZIG_HOST_TARGET_DEFAULTS_TO_THUMB)
809808 string(REGEX REPLACE "^arm" "thumb" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}")