[PATCH] D100505: Fix android-x86 library name in asan_device_setup.

Evgenii Stepanov via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Wed Apr 14 13:15:29 PDT 2021


eugenis created this revision.
eugenis added a reviewer: hans.
Herald added a subscriber: danielkiss.
eugenis requested review of this revision.
Herald added a project: Sanitizers.
Herald added a subscriber: Sanitizers.

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.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D100505

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


Index: compiler-rt/lib/asan/scripts/asan_device_setup
===================================================================
--- compiler-rt/lib/asan/scripts/asan_device_setup
+++ compiler-rt/lib/asan/scripts/asan_device_setup
@@ -94,7 +94,7 @@
     local _ARCH=
     local _ARCH64=
     if [[ $_ABI == x86* ]]; then
-        _ARCH=i386
+        _ARCH=i686
     elif [[ $_ABI == armeabi* ]]; then
         _ARCH=arm
     elif [[ $_ABI == arm64-v8a* ]]; then


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D100505.337534.patch
Type: text/x-patch
Size: 455 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210414/e2a1449b/attachment.bin>


More information about the llvm-commits mailing list