[compiler-rt] ac716c0 - [builtins][Android] Fix 386->686 adjustment

[Ryan Prichard via llvm-commits]

Author: Ryan Prichard
Date: 2020-06-19T16:08:20-07:00
New Revision: ac716c0cc42afc8a179751794da5c661a9ca3f30

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

LOG: [builtins][Android] Fix 386->686 adjustment

At this point in this code:
 - COMPILER_RT_DEFAULT_TARGET_TRIPLE is "i686-linux-android"
 - arch is "i386"

The get_compiler_rt_target function currently turns that into:

   i686-android-linux-android

The ${COMPILER_RT_OS_SUFFIX} is "-android" and redundant, so stop
adding it.

The get_compiler_rt_target() function is used for the
LLVM_ENABLE_PER_TARGET_RUNTIME_DIR mode that isn't normally used with
Android.

Differential Revision: https://reviews.llvm.org/D82150

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 0a686e38ff88..d3607edd5882 100644
--- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
+++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
@@ -368,7 +368,7 @@ function(get_compiler_rt_target arch variable)
     # Use exact spelling when building only for the target specified to CMake.
     set(target "${COMPILER_RT_DEFAULT_TARGET_TRIPLE}")
   elseif(ANDROID AND ${arch} STREQUAL "i386")
-    set(target "i686${COMPILER_RT_OS_SUFFIX}${triple_suffix}")
+    set(target "i686${triple_suffix}")
   else()
     set(target "${arch}${triple_suffix}")
   endif()