diff options
| author | Michael Kuperstein <michael.m.kuperstein@intel.com> | 2015-10-27 07:23:59 +0000 |
|---|---|---|
| committer | Michael Kuperstein <michael.m.kuperstein@intel.com> | 2015-10-27 07:23:59 +0000 |
| commit | e1194bdb4f665ea525ee2b5bfa266403e5ea0fcd (patch) | |
| tree | 29819139f07e75901e5a6e5b624f00d031bf236d /llvm/lib | |
| parent | 99af5b2ea7d25f44edeb9182b926943b4666f713 (diff) | |
| download | bcm5719-llvm-e1194bdb4f665ea525ee2b5bfa266403e5ea0fcd.tar.gz bcm5719-llvm-e1194bdb4f665ea525ee2b5bfa266403e5ea0fcd.zip | |
[X86] Make elfiamcu an OS, not an environment.
GNU tools require elfiamcu to take up the entire OS field, so, e.g.
i?86-*-linux-elfiamcu is not considered a legal triple.
Make us compatible.
Differential Revision: http://reviews.llvm.org/D14081
llvm-svn: 251390
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Support/Triple.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86Subtarget.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp index f3b3de7af3f..142a9b9e200 100644 --- a/llvm/lib/Support/Triple.cpp +++ b/llvm/lib/Support/Triple.cpp @@ -181,6 +181,7 @@ const char *Triple::getOSTypeName(OSType Kind) { case NVCL: return "nvcl"; case AMDHSA: return "amdhsa"; case PS4: return "ps4"; + case ELFIAMCU: return "elfiamcu"; } llvm_unreachable("Invalid OSType"); @@ -202,7 +203,6 @@ const char *Triple::getEnvironmentTypeName(EnvironmentType Kind) { case Cygnus: return "cygnus"; case AMDOpenCL: return "amdopencl"; case CoreCLR: return "coreclr"; - case ELFIAMCU: return "elfiamcu"; } llvm_unreachable("Invalid EnvironmentType!"); @@ -436,6 +436,7 @@ static Triple::OSType parseOS(StringRef OSName) { .StartsWith("nvcl", Triple::NVCL) .StartsWith("amdhsa", Triple::AMDHSA) .StartsWith("ps4", Triple::PS4) + .StartsWith("elfiamcu", Triple::ELFIAMCU) .Default(Triple::UnknownOS); } @@ -454,7 +455,6 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) { .StartsWith("cygnus", Triple::Cygnus) .StartsWith("amdopencl", Triple::AMDOpenCL) .StartsWith("coreclr", Triple::CoreCLR) - .StartsWith("elfiamcu", Triple::ELFIAMCU) .Default(Triple::UnknownEnvironment); } diff --git a/llvm/lib/Target/X86/X86Subtarget.h b/llvm/lib/Target/X86/X86Subtarget.h index c1842e1a5fd..85d4d1ae404 100644 --- a/llvm/lib/Target/X86/X86Subtarget.h +++ b/llvm/lib/Target/X86/X86Subtarget.h @@ -418,7 +418,7 @@ public: bool isTargetNaCl() const { return TargetTriple.isOSNaCl(); } bool isTargetNaCl32() const { return isTargetNaCl() && !is64Bit(); } bool isTargetNaCl64() const { return isTargetNaCl() && is64Bit(); } - bool isTargetMCU() const { return TargetTriple.isEnvironmentIAMCU(); } + bool isTargetMCU() const { return TargetTriple.isOSIAMCU(); } bool isTargetWindowsMSVC() const { return TargetTriple.isWindowsMSVCEnvironment(); |
