[PATCH] D71772: [scudo][standalone] Support __BIONIC__

Peter Collingbourne via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Fri Dec 20 09:50:00 PST 2019


pcc added inline comments.


================
Comment at: compiler-rt/lib/scudo/standalone/platform.h:18
 
-#if defined(__ANDROID__)
+#if defined(__ANDROID__) || defined(__BIONIC__)
 #define SCUDO_ANDROID 1
----------------
cryptoad wrote:
> pcc wrote:
> > Maybe just `#if defined(__BIONIC__)`?
> We still want Scudo to work on Android outside of Bionic (eg: .so or just statically linked to a binary) in which case I don't think __BIONIC__ will be defined.
I don't think that `__BIONIC__` means that we're compiling as part of Bionic, it just means that the libc is Bionic. See:
https://android.googlesource.com/platform/bionic/+/master/docs/defines.md

To confuse matters, we also have `_BIONIC`, which, at least within scudo, does mean that we're compiling as part of Bionic. It may be a good idea to rename this macro to something more clear.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D71772/new/

https://reviews.llvm.org/D71772





More information about the llvm-commits mailing list