mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-02-05 14:34:55 +00:00
Rename ANDROIDEABI to Android.
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:
parent
f55ef64544
commit
43bf70986b
@ -110,7 +110,7 @@ public:
|
||||
GNUEABIHF,
|
||||
EABI,
|
||||
MachO,
|
||||
ANDROIDEABI
|
||||
Android
|
||||
};
|
||||
|
||||
private:
|
||||
|
@ -139,7 +139,7 @@ const char *Triple::getEnvironmentTypeName(EnvironmentType Kind) {
|
||||
case GNUEABI: return "gnueabi";
|
||||
case EABI: return "eabi";
|
||||
case MachO: return "macho";
|
||||
case ANDROIDEABI: return "androideabi";
|
||||
case Android: return "android";
|
||||
}
|
||||
|
||||
llvm_unreachable("Invalid EnvironmentType!");
|
||||
@ -307,7 +307,7 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
|
||||
.StartsWith("gnueabi", Triple::GNUEABI)
|
||||
.StartsWith("gnu", Triple::GNU)
|
||||
.StartsWith("macho", Triple::MachO)
|
||||
.StartsWith("androideabi", Triple::ANDROIDEABI)
|
||||
.StartsWith("android", Triple::Android)
|
||||
.Default(Triple::UnknownEnvironment);
|
||||
}
|
||||
|
||||
|
@ -774,7 +774,7 @@ bool AddressSanitizer::runOnModule(Module &M) {
|
||||
/*hasSideEffects=*/true);
|
||||
|
||||
llvm::Triple targetTriple(M.getTargetTriple());
|
||||
bool isAndroid = targetTriple.getEnvironment() == llvm::Triple::ANDROIDEABI;
|
||||
bool isAndroid = targetTriple.getEnvironment() == llvm::Triple::Android;
|
||||
|
||||
MappingOffset = isAndroid ? kDefaultShadowOffsetAndroid :
|
||||
(LongSize == 32 ? kDefaultShadowOffset32 : kDefaultShadowOffset64);
|
||||
|
Loading…
x
Reference in New Issue
Block a user