[compiler-rt] fbb9132 - Fix android-x86 library name in asan_device_setup.

[Evgenii Stepanov via llvm-commits]

Author: Evgenii Stepanov
Date: 2021-04-19T17:39:58-07:00
New Revision: fbb9132e71a200c12f416d30f4528b58c6c283f2

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

LOG: Fix android-x86 library name in asan_device_setup.

https://reviews.llvm.org/D26764 removed i686 variants of compiler-rt
libraries and canonicalized the i386 name.

https://reviews.llvm.org/D37278 partially reverted the previous change
to keep i686 name on Android, but did not update asan_device_setup
script.

This changes fixes asan_device_setup.

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

Added: 
    

Modified: 
    compiler-rt/lib/asan/scripts/asan_device_setup

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/asan/scripts/asan_device_setup b/compiler-rt/lib/asan/scripts/asan_device_setup
index 27fedea3f863a..95f9d35f51ee6 100755
--- a/compiler-rt/lib/asan/scripts/asan_device_setup
+++ b/compiler-rt/lib/asan/scripts/asan_device_setup
@@ -94,7 +94,7 @@ function get_device_arch { # OUT OUT64
     local _ARCH=
     local _ARCH64=
     if [[ $_ABI == x86* ]]; then
-        _ARCH=i386
+        _ARCH=i686
     elif [[ $_ABI == armeabi* ]]; then
         _ARCH=arm
     elif [[ $_ABI == arm64-v8a* ]]; then