6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-14 14:24:05 +00:00
Code Issues Projects Releases Wiki Activity

Rename ANDROIDEABI to Android.

Browse Source 
Most of the code guarded with ANDROIDEABI are not
ARM-specific, and having no relation with arm-eabi.
Thus, it will be more natural to call this
environment "Android" instead of "ANDROIDEABI".

Note: We are not using ANDROID because several projects
are using "-DANDROID" as the conditional compilation
flag.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163087 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Logan Chien
2012-09-02 09:29:46 +00:00
parent f55ef64544
commit 43bf70986b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/ADT/Triple.h
View File

@ -110,7 +110,7 @@ public:
GNUEABIHF, GNUEABIHF,
EABI, EABI,
MachO, MachO,
ANDROIDEABI Android
}; };
private: private:

4
lib/Support/Triple.cpp
View File

@ -139,7 +139,7 @@ const char *Triple::getEnvironmentTypeName(EnvironmentType Kind) {
case GNUEABI: return "gnueabi"; case GNUEABI: return "gnueabi";
case EABI: return "eabi"; case EABI: return "eabi";
case MachO: return "macho"; case MachO: return "macho";
case ANDROIDEABI: return "androideabi"; case Android: return "android";
} }
llvm_unreachable("Invalid EnvironmentType!"); llvm_unreachable("Invalid EnvironmentType!");
@ -307,7 +307,7 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
.StartsWith("gnueabi", Triple::GNUEABI) .StartsWith("gnueabi", Triple::GNUEABI)
.StartsWith("gnu", Triple::GNU) .StartsWith("gnu", Triple::GNU)
.StartsWith("macho", Triple::MachO) .StartsWith("macho", Triple::MachO)
.StartsWith("androideabi", Triple::ANDROIDEABI) .StartsWith("android", Triple::Android)
.Default(Triple::UnknownEnvironment); .Default(Triple::UnknownEnvironment);
} }

2
lib/Transforms/Instrumentation/AddressSanitizer.cpp
View File

@ -774,7 +774,7 @@ bool AddressSanitizer::runOnModule(Module &M) {
/*hasSideEffects=*/true); /*hasSideEffects=*/true);
llvm::Triple targetTriple(M.getTargetTriple()); llvm::Triple targetTriple(M.getTargetTriple());
bool isAndroid = targetTriple.getEnvironment() == llvm::Triple::ANDROIDEABI; bool isAndroid = targetTriple.getEnvironment() == llvm::Triple::Android;
MappingOffset = isAndroid ? kDefaultShadowOffsetAndroid : MappingOffset = isAndroid ? kDefaultShadowOffsetAndroid :
(LongSize == 32 ? kDefaultShadowOffset32 : kDefaultShadowOffset64); (LongSize == 32 ? kDefaultShadowOffset32 : kDefaultShadowOffset64);