diff options
| author | Daniel Sanders <daniel.sanders@imgtec.com> | 2014-02-26 10:20:15 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2014-02-26 10:20:15 +0000 |
| commit | f6679de299c8a73a77ee5e145b04b3394b44354e (patch) | |
| tree | 5865690a445be2bcffa84b7473823be5c2815810 | |
| parent | 2b442bffcbcc58cfa84a8179ee191fc9e8b54a3d (diff) | |
| download | llvm-f6679de299c8a73a77ee5e145b04b3394b44354e.tar.gz llvm-f6679de299c8a73a77ee5e145b04b3394b44354e.tar.bz2 llvm-f6679de299c8a73a77ee5e145b04b3394b44354e.tar.xz | |
[mips] Treat -mcpu=generic the same way as an empty CPU string.
Summary:
This should fix the MCJIT unit tests that were broken by r201792 on the MIPS buildbot.
MIPS currently uses the default implementation of sys::getHostCPUName() which
always returns "generic". For now, we will accept "generic" and coerce it to
"mips32" or "mips64" depending on the target architecture like we do for empty
CPU names.
Reviewers: jacksprat, matheusalmeida
Reviewed By: jacksprat
Differential Revision: http://llvm-reviews.chandlerc.com/D2878
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202253 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/Mips/MipsSubtarget.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp b/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp index 637b668f67..faecde41b0 100644 --- a/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp +++ b/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp @@ -42,7 +42,7 @@ using namespace llvm; /// Select the Mips CPU for the given triple and cpu name. /// FIXME: Merge with the copy in MipsSubtarget.cpp static inline StringRef selectMipsCPU(StringRef TT, StringRef CPU) { - if (CPU.empty()) { + if (CPU.empty() || CPU == "generic") { Triple TheTriple(TT); if (TheTriple.getArch() == Triple::mips || TheTriple.getArch() == Triple::mipsel) diff --git a/lib/Target/Mips/MipsSubtarget.cpp b/lib/Target/Mips/MipsSubtarget.cpp index f16fb79828..af83d61f09 100644 --- a/lib/Target/Mips/MipsSubtarget.cpp +++ b/lib/Target/Mips/MipsSubtarget.cpp @@ -62,7 +62,7 @@ Mips16ConstantIslands( /// Select the Mips CPU for the given triple and cpu name. /// FIXME: Merge with the copy in MipsMCTargetDesc.cpp static inline StringRef selectMipsCPU(StringRef TT, StringRef CPU) { - if (CPU.empty()) { + if (CPU.empty() || CPU == "generic") { Triple TheTriple(TT); if (TheTriple.getArch() == Triple::mips || TheTriple.getArch() == Triple::mipsel) |