authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-06-07 22:24:09+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-06-07 22:24:09+02:00
log44155eb93c0823006f5a50ab7051770fd4d427de
tree41d33e7a7b6841c07551083533c150831ce18756
parent06d50d046a451e5966b1cb514b52c8cc42885484
signaturebadge-check Signed by PGP key B5690EEEBB952194

cmake: Simplify some arm/thumb checks.

I'm not convinced that some of the possibilities that these regexes allowed are real. I've literally never seen or heard of "armhfel", nor of "thumb" ever showing up in `uname -m`, etc.

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

CMakeLists.txt+2-3
...@@ -797,12 +797,11 @@ elseif(ZIG_HOST_TARGET_ARCH STREQUAL "amd64")...@@ -797,12 +797,11 @@ 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 MATCHES "^armv[7-8]l$")800elseif(ZIG_HOST_TARGET_ARCH MATCHES "^arm(el)?$" OR 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 MATCHES "^armv[7-8]b$")802elseif(ZIG_HOST_TARGET_ARCH STREQUAL "armeb" OR 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$" "\\2" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}")
806if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(eb)?$")805if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(eb)?$")
807 check_symbol_exists(__thumb__ "" ZIG_HOST_TARGET_DEFAULTS_TO_THUMB)806 check_symbol_exists(__thumb__ "" ZIG_HOST_TARGET_DEFAULTS_TO_THUMB)
808 if(ZIG_HOST_TARGET_DEFAULTS_TO_THUMB)807 if(ZIG_HOST_TARGET_DEFAULTS_TO_THUMB)