[compiler-rt] 7b153b4 - [compiler-rt] Partially revert 8bd2722f65cfd7883ed9769f7bad3ff50e4c6905

[Martin Storsjö via llvm-commits]

Author: Martin Storsjö
Date: 2021-03-11T22:41:10+02:00
New Revision: 7b153b43d3a14d76975039408c4b922beb576735

URL: https://github.com/llvm/llvm-project/commit/7b153b43d3a14d76975039408c4b922beb576735
DIFF: https://github.com/llvm/llvm-project/commit/7b153b43d3a14d76975039408c4b922beb576735.diff

LOG: [compiler-rt] Partially revert 8bd2722f65cfd7883ed9769f7bad3ff50e4c6905

Don't normalize arm architecture names; doing that loses the ability
to pick the right implementation of builtins for each architecture
variant. When building compiler-rt builtins as part of a
runtimes build, builtins for multiple armv* variants could be built
in the same directory, and with the simplified architecture name,
they'd all be built in the same directory, overlapping each other.

Added: 
    

Modified: 
    compiler-rt/cmake/Modules/CompilerRTUtils.cmake

Removed: 
    


################################################################################
diff  --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
index 64bedb278d9f..a5a49ceebdc5 100644
--- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
+++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
@@ -332,13 +332,6 @@ macro(construct_compiler_rt_default_triple)
   if("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "^i.86$")
     # Android uses i686, but that's remapped at a later stage.
     set(COMPILER_RT_DEFAULT_TARGET_ARCH "i386")
-  elseif ("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "^arm" AND
-          NOT "${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "^arm64")
-    if ("${COMPILER_RT_DEFAULT_TARGET_TRIPLE}" MATCHES ".*hf$")
-      set(COMPILER_RT_DEFAULT_TARGET_ARCH "armhf")
-    else()
-      set(COMPILER_RT_DEFAULT_TARGET_ARCH "arm")
-    endif()
   endif()
 
   # Determine if test target triple is specified explicitly, and doesn't match the