From: Martin Storsjo <martin@martin.st>
Date: Mon, 26 Mar 2018 08:41:10 +0000 (+0000)
Subject: [ARM] Simplify constructing the ARMArchFeature string. NFC.
X-Git-Tag: llvmorg-7.0.0-rc1~9672
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=439824622a7c4d1f9e9782256995d0f12f3e0e4a;p=platform%2Fupstream%2Fllvm.git

[ARM] Simplify constructing the ARMArchFeature string. NFC.

Differential Revision: https://reviews.llvm.org/D44819

llvm-svn: 328478
---

diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
index 7490a5c..0e470e0 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
@@ -140,24 +140,21 @@ std::string ARM_MC::ParseARMTriple(const Triple &TT, StringRef CPU) {
     ARMArchFeature = (ARMArchFeature + "+" + ARM::getArchName(ArchID)).str();
 
   if (TT.isThumb()) {
-    if (ARMArchFeature.empty())
-      ARMArchFeature = "+thumb-mode,+v4t";
-    else
-      ARMArchFeature += ",+thumb-mode,+v4t";
+    if (!ARMArchFeature.empty())
+      ARMArchFeature += ",";
+    ARMArchFeature += "+thumb-mode,+v4t";
   }
 
   if (TT.isOSNaCl()) {
-    if (ARMArchFeature.empty())
-      ARMArchFeature = "+nacl-trap";
-    else
-      ARMArchFeature += ",+nacl-trap";
+    if (!ARMArchFeature.empty())
+      ARMArchFeature += ",";
+    ARMArchFeature += "+nacl-trap";
   }
 
   if (TT.isOSWindows()) {
-    if (ARMArchFeature.empty())
-      ARMArchFeature = "+noarm";
-    else
-      ARMArchFeature += ",+noarm";
+    if (!ARMArchFeature.empty())
+      ARMArchFeature += ",";
+    ARMArchFeature += "+noarm";
   }
 
   return ARMArchFeature;