commit 075759aaddb1daf9aa801fc75a0909c510081f6d
author Yaron Keren <yaron.keren@gmail.com> Mon Mar 30 15:42:36 2015 +0000
committer Yaron Keren <yaron.keren@gmail.com> Mon Mar 30 15:42:36 2015 +0000
tree 88e604bd3bfca09b26acf2438fff4a82a41b4de6
parent bbe1756a8c55bb0195bcbe257cfff4b73d94c8ac

Remove more superfluous .str() and replace std::string concatenation with Twine.

Following r233392, http://llvm.org/viewvc/llvm-project?rev=233392&view=rev.

llvm-svn: 233555

llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp

diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
index 7ff7f9a..0587335 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
@@ -255,7 +255,7 @@
   std::string ArchFS = ARM_MC::ParseARMTriple(TT, CPU);
   if (!FS.empty()) {
     if (!ArchFS.empty())
-      ArchFS = ArchFS + "," + FS.str();
+      ArchFS = (Twine(ArchFS) + "," + FS).str();
     else
       ArchFS = FS;
   }