From 10e1629dc339af33989e6fcabb3fd2214d6322bc Mon Sep 17 00:00:00 2001 From: Simon Atanasyan Date: Thu, 12 Apr 2012 19:59:24 +0000 Subject: [PATCH] MIPS: Initialize MIPS CPU's name by default value. Otherwise MipsTargetInfoBase::getDefaultFeatures() might return an invalid features set with an empty feature name. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154606 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Basic/Targets.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 8cf27b301e..1ad37c4e57 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -3449,8 +3449,11 @@ protected: std::string ABI; public: - MipsTargetInfoBase(const std::string& triple, const std::string& ABIStr) + MipsTargetInfoBase(const std::string& triple, + const std::string& ABIStr, + const std::string& CPUStr) : TargetInfo(triple), + CPU(CPUStr), SoftFloat(false), SingleFloat(false), ABI(ABIStr) {} @@ -3575,7 +3578,7 @@ public: class Mips32TargetInfoBase : public MipsTargetInfoBase { public: Mips32TargetInfoBase(const std::string& triple) : - MipsTargetInfoBase(triple, "o32") { + MipsTargetInfoBase(triple, "o32", "mips32") { SizeType = UnsignedInt; PtrDiffType = SignedInt; } @@ -3679,7 +3682,7 @@ class Mips64TargetInfoBase : public MipsTargetInfoBase { virtual void SetDescriptionString(const std::string &Name) = 0; public: Mips64TargetInfoBase(const std::string& triple) : - MipsTargetInfoBase(triple, "n64") { + MipsTargetInfoBase(triple, "n64", "mips64") { LongWidth = LongAlign = 64; PointerWidth = PointerAlign = 64; LongDoubleWidth = LongDoubleAlign = 128; -- 2.40.0