This is an archive of the discontinued LLVM Phabricator instance.

Differential D26422

Revert "Define __ANDROID_API__ for all Android builds."
ClosedPublic

Authored by srhines on Nov 8 2016, 2:03 PM.

Details

Reviewers
None
Commits
rG032a4be29f99: Revert "Define __ANDROID_API__ for all Android builds."
rC286298: Revert "Define __ANDROID_API__ for all Android builds."
rL286298: Revert "Define __ANDROID_API__ for all Android builds."
Summary

This reverts commit a8804ddd9fe71304b28e5b834d134fe93e568ee0.

Diff Detail

Repository
rL LLVM

Event Timeline

srhines updated this revision to Diff 77254.Nov 8 2016, 2:03 PM
srhines retitled this revision from to Revert "Define __ANDROID_API__ for all Android builds.".
srhines updated this object.
srhines added subscribers: danalbert, eugenis, pirama, cfe-commits.
Herald added a subscriber: tberghammer. · View Herald TranscriptNov 8 2016, 2:03 PM
Closed by commit rL286298: Revert "Define __ANDROID_API__ for all Android builds." (authored by srhines). · Explain WhyNov 8 2016, 2:04 PM
This revision was automatically updated to reflect the committed changes.
srhines added a comment.Nov 8 2016, 2:07 PM

Reverted because this broke builds:

clang-hexagon-elf
llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast
clang-ppc64be-linux-multistage
llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast

It isn't clear from the logs why these builds failed, since I did a general build, but perhaps there is something that is stripping out Android-specific targets there.

Revision Contents

PathSize
cfe/
trunk/
lib/
Basic/
2 lines
test/
Driver/
83 lines

Diff 77256

cfe/trunk/lib/Basic/Targets.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 459 Lines • ▼ Show 20 Lines void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
Builder.defineMacro("__gnu_linux__"); Builder.defineMacro("__gnu_linux__");
Builder.defineMacro("__ELF__"); Builder.defineMacro("__ELF__");
if (Triple.isAndroid()) { if (Triple.isAndroid()) {
Builder.defineMacro("__ANDROID__", "1"); Builder.defineMacro("__ANDROID__", "1");
unsigned Maj, Min, Rev; unsigned Maj, Min, Rev;
Triple.getEnvironmentVersion(Maj, Min, Rev); Triple.getEnvironmentVersion(Maj, Min, Rev);
this->PlatformName = "android"; this->PlatformName = "android";
this->PlatformMinVersion = VersionTuple(Maj, Min, Rev); this->PlatformMinVersion = VersionTuple(Maj, Min, Rev);
if (Maj)
Builder.defineMacro("__ANDROID_API__", Twine(Maj));
} }
if (Opts.POSIXThreads) if (Opts.POSIXThreads)
Builder.defineMacro("_REENTRANT"); Builder.defineMacro("_REENTRANT");
if (Opts.CPlusPlus) if (Opts.CPlusPlus)
Builder.defineMacro("_GNU_SOURCE"); Builder.defineMacro("_GNU_SOURCE");
if (this->HasFloat128) if (this->HasFloat128)
Builder.defineMacro("__FLOAT128__"); Builder.defineMacro("__FLOAT128__");
} }
▲ Show 20 Lines • Show All 8,336 Lines • Show Last 20 Lines

cfe/trunk/test/Driver/android-targets.cpp

// 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
cfe/trunk/lib/Basic/Targets.cpp