[libcxx-commits] [PATCH] D98320: [compiler-rt] Simplify toplevel arm/thumb checks

[Martin Storsjö via Phabricator via libcxx-commits]

mstorsjo created this revision.
mstorsjo added reviewers: MaskRay, phosek, rprichard.
Herald added subscribers: kristof.beyls, mgorny, dberris.
mstorsjo requested review of this revision.
Herald added a project: Sanitizers.
Herald added a subscriber: Sanitizers.

Mapping of arm*hf to armhf is done in construct_compiler_rt_default_triple
now after D98173 <https://reviews.llvm.org/D98173> (making it available for builds that target
compiler-rt/lib/builtins directly, too). Do the check for thumb for any arm
target, not only armhf.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D98320

Files:
  compiler-rt/CMakeLists.txt


Index: compiler-rt/CMakeLists.txt
===================================================================
--- compiler-rt/CMakeLists.txt
+++ compiler-rt/CMakeLists.txt
@@ -109,11 +109,8 @@
 endif()
 
 construct_compiler_rt_default_triple()
-if ("${COMPILER_RT_DEFAULT_TARGET_TRIPLE}" MATCHES ".*hf$")
-  if (${COMPILER_RT_DEFAULT_TARGET_ARCH} MATCHES "^arm")
-    set(COMPILER_RT_DEFAULT_TARGET_ARCH "armhf")
-    CHECK_SYMBOL_EXISTS (__thumb__ "" COMPILER_RT_ARM_THUMB)
-  endif()
+if (${COMPILER_RT_DEFAULT_TARGET_ARCH} MATCHES "^arm")
+  CHECK_SYMBOL_EXISTS (__thumb__ "" COMPILER_RT_ARM_THUMB)
 endif()
 if ("${COMPILER_RT_DEFAULT_TARGET_TRIPLE}" MATCHES ".*android.*")
   set(ANDROID 1)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D98320.329542.patch
Type: text/x-patch
Size: 688 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210310/68e3f3f6/attachment-0001.bin>