diff options
| -rw-r--r-- | lib/Basic/Targets.cpp | 2 | ||||
| -rw-r--r-- | test/Preprocessor/init.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 291eaeb05f..b4e17818c7 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -316,6 +316,8 @@ protected: DefineStd(Builder, "linux", Opts); Builder.defineMacro("__gnu_linux__"); Builder.defineMacro("__ELF__"); + if (Triple.getEnvironment() == llvm::Triple::ANDROIDEABI) + Builder.defineMacro("__ANDROID__", "1"); if (Opts.POSIXThreads) Builder.defineMacro("_REENTRANT"); if (Opts.CPlusPlus) diff --git a/test/Preprocessor/init.c b/test/Preprocessor/init.c index e0f45f1728..0505fffedd 100644 --- a/test/Preprocessor/init.c +++ b/test/Preprocessor/init.c @@ -1762,3 +1762,6 @@ // NORTTI: __GXX_ABI_VERSION // NORTTI-NOT:#define __GXX_RTTI // NORTTI: __STDC__ +// +// RUN: %clang_cc1 -triple arm-linux-androideabi -E -dM < /dev/null | FileCheck -check-prefix ANDROID %s +// ANDROID: __ANDROID__ 1 |