Also set alignment of stack-based structs to 4 in thumb mode.

llvm-svn: 33741

2 files changed, 7 insertions, 8 deletions

diff --git a/llvm/lib/Target/ARM/ARMRegisterInfo.cpp b/llvm/lib/Target/ARM/ARMRegisterInfo.cpp
index 3b8dba3211b..9c9aef75990 100644
--- a/llvm/lib/Target/ARM/ARMRegisterInfo.cpp
+++ b/llvm/lib/Target/ARM/ARMRegisterInfo.cpp
@@ -708,8 +708,7 @@ void ARMRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II) const{
     }
 
     Offset += InstrOffs * Scale;
-    assert((Scale == 1 || (Offset & (Scale-1)) == 0) &&
-           "Can't encode this offset!");
+    assert((Offset & (Scale-1)) == 0 && "Can't encode this offset!");
     if (Offset < 0) {
       Offset = -Offset;
       isSub = true;
diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
index 41456ba7360..0b743487213 100644
--- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp
+++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
@@ -35,12 +35,12 @@ namespace {
 ARMTargetMachine::ARMTargetMachine(const Module &M, const std::string &FS)
   : Subtarget(M, FS),
     DataLayout(Subtarget.isTargetDarwin() ?
-               (Subtarget.isThumb() ?
-                std::string("e-p:32:32-d:32:32-l:32:32-s:16:32-b:8:32-B:8:32") :
-                std::string("e-p:32:32-d:32:32-l:32:32")) :
-               (Subtarget.isThumb() ?
-                std::string("e-p:32:32-d:32:64-l:32:64-s:16:32-b:8:32-B:8:32") :
-                std::string("e-p:32:32-d:32:64-l:32:64"))),
+          (Subtarget.isThumb() ?
+           std::string("e-p:32:32-d:32:32-l:32:32-s:16:32-b:8:32-B:8:32-A:32") :
+           std::string("e-p:32:32-d:32:32-l:32:32")) :
+          (Subtarget.isThumb() ?
+           std::string("e-p:32:32-d:32:64-l:32:64-s:16:32-b:8:32-B:8:32-A:32") :
+           std::string("e-p:32:32-d:32:64-l:32:64"))),
     InstrInfo(Subtarget),
     FrameInfo(Subtarget) {}