maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Define __ANDROID_API__ for all Android builds." 

Summary: This reverts commit a8804ddd9fe71304b28e5b834d134fe93e568ee0.

Subscribers: cfe-commits, pirama, eugenis, tberghammer, danalbert

Differential Revision: https://reviews.llvm.org/D26422

llvm-svn: 286298
This commit is contained in:
Stephen Hines 2016-11-08 21:54:49 +00:00
parent 6955feebf3
commit 032a4be29f
2 changed files with 0 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Basic/Targets.cpp
View File

@ -465,8 +465,6 @@ protected:
Triple.getEnvironmentVersion(Maj, Min, Rev);
this->PlatformName = "android";
this->PlatformMinVersion = VersionTuple(Maj, Min, Rev);
if (Maj)
Builder.defineMacro("__ANDROID_API__", Twine(Maj));
}
if (Opts.POSIXThreads)
Builder.defineMacro("_REENTRANT");

83
clang/test/Driver/android-targets.cpp
View File

@ -1,83 +0,0 @@
// Test API-related defines for various Android targets.
//
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target arm-linux-androideabi \
// RUN: | FileCheck %s
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target arm-linux-androideabi19 \
// RUN: | FileCheck %s -check-prefix=LEVEL19
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target arm-linux-androideabi20 \
// RUN: | FileCheck %s -check-prefix=LEVEL20
//
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target aarch64-linux-android \
// RUN: | FileCheck %s
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target aarch64-linux-android19 \
// RUN: | FileCheck %s -check-prefix=LEVEL19
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target aarch64-linux-android20 \
// RUN: | FileCheck %s -check-prefix=LEVEL20
//
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target i686-linux-android \
// RUN: | FileCheck %s
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target i686-linux-android19 \
// RUN: | FileCheck %s -check-prefix=LEVEL19
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target i686-linux-android20 \
// RUN: | FileCheck %s -check-prefix=LEVEL20
//
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target x86_64-linux-android \
// RUN: | FileCheck %s
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target x86_64-linux-android19 \
// RUN: | FileCheck %s -check-prefix=LEVEL19
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target x86_64-linux-android20 \
// RUN: | FileCheck %s -check-prefix=LEVEL20
//
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target mipsel-linux-android \
// RUN: | FileCheck %s
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target mipsel-linux-android19 \
// RUN: | FileCheck %s -check-prefix=LEVEL19
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target mipsel-linux-android20 \
// RUN: | FileCheck %s -check-prefix=LEVEL20
//
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target mips64el-linux-android \
// RUN: | FileCheck %s
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target mips64el-linux-android19 \
// RUN: | FileCheck %s -check-prefix=LEVEL19
// RUN: %clang %s -emit-llvm -S -c -o - \
// RUN: -target mips64el-linux-android20 \
// RUN: | FileCheck %s -check-prefix=LEVEL20
// CHECK: __ANDROID__defined
// LEVEL19: __ANDROID__defined
// LEVEL20: __ANDROID__defined
#ifdef __ANDROID__
void __ANDROID__defined(void) {}
#endif
// CHECK-NOT: __ANDROID_API__defined
// LEVEL19: __ANDROID_API__defined
// LEVEL20: __ANDROID_API__defined
#ifdef __ANDROID_API__
void __ANDROID_API__defined(void) {}
int android_api = __ANDROID_API__;
#endif
// CHECK-NOT: __ANDROID_API__20
// LEVEL19-NOT: __ANDROID_API__20
// LEVEL20: __ANDROID_API__20
#if __ANDROID_API__ >= 20
void __ANDROID_API__20(void) {}
#endif