[compiler-rt] 3fb48b7 - [compiler-rt][Android] Use correct builtins library name for tests

[Ryan Prichard via llvm-commits]

Author: Ryan Prichard
Date: 2020-07-01T14:30:25-07:00
New Revision: 3fb48b70884aedc6344c17bfa1ac1c01bdc454a3

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

LOG: [compiler-rt][Android] Use correct builtins library name for tests

The builtins library name is special on Android:

 * There is an "-android" suffix.

 * For the compiler-rt i386 architecture, Android targets i686 (in the
   triple and in the builtins library filename)

With this change, check-builtins works with Android.

Reviewed By: compnerd

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

Added: 
    

Modified: 
    compiler-rt/test/lit.common.configured.in

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in
index a0203c085565..4a3e268c8a6f 100644
--- a/compiler-rt/test/lit.common.configured.in
+++ b/compiler-rt/test/lit.common.configured.in
@@ -48,6 +48,11 @@ config.available_features.add('target-is-%s' % config.target_arch)
 
 if config.enable_per_target_runtime_dir:
   set_default("target_suffix", "")
+elif config.android:
+  if config.target_arch == "i386":
+    set_default("target_suffix", "-i686-android")
+  else:
+    set_default("target_suffix", "-%s-android" % config.target_arch)
 else:
   set_default("target_suffix", "-%s" % config.target_arch)