From 74d682b4436dcf2ad210c049c71e85b1d4688609 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Tue, 10 Dec 2013 00:15:35 +0000
Subject: [PATCH] Simplify further.

Thanks to Jim Grosbach for noticing it.

llvm-svn: 196846
---
 llvm/lib/Target/ARM/ARMTargetMachine.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
index 0c4adafbe160..37e5f40f364e 100644
--- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp
+++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
@@ -75,24 +75,16 @@ static std::string computeDataLayout(ARMSubtarget &ST) {
   else
     Ret += "-f64:64:64-i64:64:64";
 
-  if (ST.isThumb()) {
-    if (ST.isAPCS_ABI())
-      Ret += "-i16:16:32-i8:8:32-i1:8:32";
-    else
-      Ret += "-i16:16:32-i8:8:32-i1:8:32";
-  }
+  if (ST.isThumb())
+    Ret += "-i16:16:32-i8:8:32-i1:8:32";
 
   if (ST.isAPCS_ABI())
     Ret += "-v128:32:128-v64:32:64";
   else
     Ret += "-v128:64:128-v64:64:64";
 
-  if (ST.isThumb()) {
-    if (ST.isAPCS_ABI())
-      Ret += "-a:0:32";
-    else
-      Ret += "-a:0:32";
-  }
+  if (ST.isThumb())
+    Ret += "-a:0:32";
 
   Ret += "-n32";