diff options
| author | Dan Albert <danalbert@google.com> | 2019-01-08 22:31:19 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2019-01-08 22:31:19 +0000 |
| commit | 706b1f3aeb62cd494d83bb152e0a871f549b8c3f (patch) | |
| tree | 73479cf5dc4f5bb228f011bcb0ba9c8ecd7d0d64 | |
| parent | 39c97bf6cd42969bf7088d8b07f19fcc45dbc8ea (diff) | |
| download | llvm-706b1f3aeb62cd494d83bb152e0a871f549b8c3f.zip llvm-706b1f3aeb62cd494d83bb152e0a871f549b8c3f.tar.gz llvm-706b1f3aeb62cd494d83bb152e0a871f549b8c3f.tar.bz2 | |
Android is not GNU, so don't claim that it is.
Reviewers: pirama, srhines
Reviewed By: srhines
Subscribers: kristina, cfe-commits
Differential Revision: https://reviews.llvm.org/D55953
llvm-svn: 350664
| -rw-r--r-- | clang/lib/Basic/Targets/OSTargets.h | 3 | ||||
| -rw-r--r-- | clang/test/Preprocessor/init.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Basic/Targets/OSTargets.h b/clang/lib/Basic/Targets/OSTargets.h index 42ce896..085efa0 100644 --- a/clang/lib/Basic/Targets/OSTargets.h +++ b/clang/lib/Basic/Targets/OSTargets.h @@ -345,7 +345,6 @@ protected: // Linux defines; list based off of gcc output DefineStd(Builder, "unix", Opts); DefineStd(Builder, "linux", Opts); - Builder.defineMacro("__gnu_linux__"); Builder.defineMacro("__ELF__"); if (Triple.isAndroid()) { Builder.defineMacro("__ANDROID__", "1"); @@ -355,6 +354,8 @@ protected: this->PlatformMinVersion = VersionTuple(Maj, Min, Rev); if (Maj) Builder.defineMacro("__ANDROID_API__", Twine(Maj)); + } else { + Builder.defineMacro("__gnu_linux__"); } if (Opts.POSIXThreads) Builder.defineMacro("_REENTRANT"); diff --git a/clang/test/Preprocessor/init.c b/clang/test/Preprocessor/init.c index ff48b11..940ddda 100644 --- a/clang/test/Preprocessor/init.c +++ b/clang/test/Preprocessor/init.c @@ -9057,6 +9057,7 @@ // RUN: %clang_cc1 -triple arm-linux-androideabi -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix ANDROID %s // ANDROID-NOT:#define __ANDROID_API__ // ANDROID:#define __ANDROID__ 1 +// ANDROID-NOT:#define __gnu_linux__ // // RUN: %clang_cc1 -x c++ -triple i686-linux-android -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix I386-ANDROID-CXX %s // I386-ANDROID-CXX:#define __STDCPP_DEFAULT_NEW_ALIGNMENT__ 8U @@ -9067,6 +9068,7 @@ // RUN: %clang_cc1 -triple arm-linux-androideabi20 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix ANDROID20 %s // ANDROID20:#define __ANDROID_API__ 20 // ANDROID20:#define __ANDROID__ 1 +// ANDROID-NOT:#define __gnu_linux__ // // RUN: %clang_cc1 -triple lanai-unknown-unknown -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix LANAI %s // LANAI: #define __lanai__ 1 |