[compiler-rt] Partially revert 8bd2722

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.

Author: mstorsjo

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