diff options
| author | Kostya Kortchinsky <kostyak@google.com> | 2019-12-20 08:23:57 -0800 |
|---|---|---|
| committer | Kostya Kortchinsky <kostyak@google.com> | 2019-12-20 12:59:33 -0800 |
| commit | 0fd6f19025a79e331bdbaf35541a2e90a95faa71 (patch) | |
| tree | 44781f7e39614fce0b64526cdacbef6bc7b94c22 /compiler-rt | |
| parent | dc03b960d0236c18ed4382cea7bb3eb49329ed04 (diff) | |
| download | bcm5719-llvm-0fd6f19025a79e331bdbaf35541a2e90a95faa71.tar.gz bcm5719-llvm-0fd6f19025a79e331bdbaf35541a2e90a95faa71.zip | |
[scudo][standalone] Support __BIONIC__
Summary:
Some Android builds that we are interested in define `__BIONIC__`
but not `__ANDROID__`, so expand `SCUDO_ANDROID` to encompass those.
Reviewers: cferris, hctim, pcc, eugenis, morehouse
Subscribers: krytarowski, #sanitizers, llvm-commits
Tags: #sanitizers, #llvm
Differential Revision: https://reviews.llvm.org/D71772
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/scudo/standalone/platform.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler-rt/lib/scudo/standalone/platform.h b/compiler-rt/lib/scudo/standalone/platform.h index a897a566f9b..a4c2a0b2660 100644 --- a/compiler-rt/lib/scudo/standalone/platform.h +++ b/compiler-rt/lib/scudo/standalone/platform.h @@ -9,13 +9,17 @@ #ifndef SCUDO_PLATFORM_H_ #define SCUDO_PLATFORM_H_ +// Transitive includes of stdint.h specify some of the defines checked below. +#include <stdint.h> + #if defined(__linux__) #define SCUDO_LINUX 1 #else #define SCUDO_LINUX 0 #endif -#if defined(__ANDROID__) +// See https://android.googlesource.com/platform/bionic/+/master/docs/defines.md +#if defined(__BIONIC__) #define SCUDO_ANDROID 1 #else #define SCUDO_ANDROID 0 |
