diff options
| -rw-r--r-- | llvm/lib/Target/AArch64/AArch64Subtarget.cpp | 7 | ||||
| -rw-r--r-- | llvm/lib/Target/AArch64/AArch64Subtarget.h | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/llvm/lib/Target/AArch64/AArch64Subtarget.cpp b/llvm/lib/Target/AArch64/AArch64Subtarget.cpp index 2d346cb512a..61bfd7a0811 100644 --- a/llvm/lib/Target/AArch64/AArch64Subtarget.cpp +++ b/llvm/lib/Target/AArch64/AArch64Subtarget.cpp @@ -36,7 +36,8 @@ UseAddressTopByteIgnored("aarch64-use-tbi", cl::desc("Assume that top byte of " "an address is ignored"), cl::init(false), cl::Hidden); AArch64Subtarget & -AArch64Subtarget::initializeSubtargetDependencies(StringRef FS) { +AArch64Subtarget::initializeSubtargetDependencies(StringRef FS, + StringRef CPUString) { // Determine default and user-specified characteristics if (CPUString.empty()) @@ -90,8 +91,8 @@ AArch64Subtarget::AArch64Subtarget(const Triple &TT, const std::string &CPU, const std::string &FS, const TargetMachine &TM, bool LittleEndian) : AArch64GenSubtargetInfo(TT, CPU, FS), ReserveX18(TT.isOSDarwin()), - IsLittle(LittleEndian), CPUString(CPU), TargetTriple(TT), FrameLowering(), - InstrInfo(initializeSubtargetDependencies(FS)), TSInfo(), + IsLittle(LittleEndian), TargetTriple(TT), FrameLowering(), + InstrInfo(initializeSubtargetDependencies(FS, CPU)), TSInfo(), TLInfo(TM, *this), GISel() {} const CallLowering *AArch64Subtarget::getCallLowering() const { diff --git a/llvm/lib/Target/AArch64/AArch64Subtarget.h b/llvm/lib/Target/AArch64/AArch64Subtarget.h index bda29196388..9f51c6be635 100644 --- a/llvm/lib/Target/AArch64/AArch64Subtarget.h +++ b/llvm/lib/Target/AArch64/AArch64Subtarget.h @@ -97,9 +97,6 @@ protected: bool IsLittle; - /// CPUString - String name of used CPU. - std::string CPUString; - /// TargetTriple - What processor and OS we're targeting. Triple TargetTriple; @@ -116,7 +113,8 @@ private: /// initializeSubtargetDependencies - Initializes using CPUString and the /// passed in feature string so that we can use initializer lists for /// subtarget initialization. - AArch64Subtarget &initializeSubtargetDependencies(StringRef FS); + AArch64Subtarget &initializeSubtargetDependencies(StringRef FS, + StringRef CPUString); /// Initialize properties based on the selected processor family. void initializeProperties(); |
