diff options
author | Nadav Rotem <nrotem@apple.com> | 2013-02-27 05:56:20 +0000 |
---|---|---|
committer | Nadav Rotem <nrotem@apple.com> | 2013-02-27 05:56:20 +0000 |
commit | 08ab877cc77fe85aa3da4bc03b975487098aa658 (patch) | |
tree | 960671bd70c54104c0ec72a90b025233c4f4b47c /llvm/lib/Target/X86/X86Subtarget.cpp | |
parent | 464e807d41b73e960ca1aac901c9a320bc93eb60 (diff) | |
download | bcm5719-llvm-08ab877cc77fe85aa3da4bc03b975487098aa658.tar.gz bcm5719-llvm-08ab877cc77fe85aa3da4bc03b975487098aa658.zip |
Revert r176166 because it broke one of the lit tests.
llvm-svn: 176171
Diffstat (limited to 'llvm/lib/Target/X86/X86Subtarget.cpp')
-rw-r--r-- | llvm/lib/Target/X86/X86Subtarget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Target/X86/X86Subtarget.cpp b/llvm/lib/Target/X86/X86Subtarget.cpp index ec8733fba6f..0f2c008ab96 100644 --- a/llvm/lib/Target/X86/X86Subtarget.cpp +++ b/llvm/lib/Target/X86/X86Subtarget.cpp @@ -332,9 +332,9 @@ void X86Subtarget::resetSubtargetFeatures(const MachineFunction *MF) { "target-cpu"); Attribute FSAttr = FnAttrs.getAttribute(AttributeSet::FunctionIndex, "target-features"); - StringRef CPU = - !CPUAttr.hasAttribute(Attribute::None) ? CPUAttr.getValueAsString() : ""; - StringRef FS = + std::string CPU = + !CPUAttr.hasAttribute(Attribute::None) ?CPUAttr.getValueAsString() : ""; + std::string FS = !FSAttr.hasAttribute(Attribute::None) ? FSAttr.getValueAsString() : ""; if (!FS.empty()) { initializeEnvironment(); @@ -343,7 +343,7 @@ void X86Subtarget::resetSubtargetFeatures(const MachineFunction *MF) { } void X86Subtarget::resetSubtargetFeatures(StringRef CPU, StringRef FS) { - StringRef CPUName = CPU; + std::string CPUName = CPU; if (!FS.empty() || !CPU.empty()) { if (CPUName.empty()) { #if defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86)\ |