From 3179bf24b4b41c1a5e045a1f342f54a02d212406 Mon Sep 17 00:00:00 2001 From: Rafael Espindola <rafael.espindola@gmail.com> Date: Tue, 17 Dec 2013 21:28:36 +0000 Subject: [PATCH] Handle i64 first for clarity. No functionality change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@197524 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMTargetMachine.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp index 0c9e0a47201..960f5ca5ed2 100644 --- a/lib/Target/ARM/ARMTargetMachine.cpp +++ b/lib/Target/ARM/ARMTargetMachine.cpp @@ -76,13 +76,14 @@ static std::string computeDataLayout(ARMSubtarget &ST) { if (ST.isThumb()) Ret += "-i1:8:32-i8:8:32-i16:16:32"; - // We have 64 bits floats and integers. The APCS ABI requires them to be - // aligned s them to 32 bits, others to 64 bits. We always try to align to - // 64 bits. + // ABIs other than APC have 64 bit integers with natural alignment. + if (!ST.isAPCS_ABI()) + Ret += "-i64:64"; + + // We have 64 bits floats. The APCS ABI requires them to be aligned to 32 + // bits, others to 64 bits. We always try to align to 64 bits. if (ST.isAPCS_ABI()) Ret += "-f64:32:64"; - else - Ret += "-i64:64"; // We have 128 and 64 bit vectors. The APCS ABI aligns them to 32 bits, others // to 64. We always ty to give them natural alignment.