commit d054eda44114df411a2749e7b6b85d27509a0af1
author Chad Rosier <mcrosier@apple.com> Fri Nov 09 17:29:38 2012 +0000
committer Chad Rosier <mcrosier@apple.com> Fri Nov 09 17:29:38 2012 +0000
tree 8744edd554eca7b5cdd98a3a285432ae748fea26
parent b754687fd7391213f455ffa52d1bcfbe11052bc0

Add support for -mstrict-align compiler option for ARM targets.
rdar://12340498


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167620 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/ARM/ARMFastISel.cpp

diff --git a/lib/Target/ARM/ARMFastISel.cpp b/lib/Target/ARM/ARMFastISel.cpp
index 6611862..7527c84 100644
--- a/lib/Target/ARM/ARMFastISel.cpp
+++ b/lib/Target/ARM/ARMFastISel.cpp
@@ -1028,7 +1028,8 @@
       RC = &ARM::GPRRegClass;
       break;
     case MVT::i16:
-      if (Alignment && Alignment < 2 && !Subtarget->allowsUnalignedMem())
+      if (Alignment && Alignment < 2 && (!Subtarget->allowsUnalignedMem() ||
+                                         TM.Options.StrictAlign))
         return false;
 
       if (isThumb2) {
@@ -1043,7 +1044,8 @@
       RC = &ARM::GPRRegClass;
       break;
     case MVT::i32:
-      if (Alignment && Alignment < 4 && !Subtarget->allowsUnalignedMem())
+      if (Alignment && Alignment < 4 && (!Subtarget->allowsUnalignedMem() ||
+                                         TM.Options.StrictAlign))
         return false;
 
       if (isThumb2) {
@@ -1152,7 +1154,8 @@
       }
       break;
     case MVT::i16:
-      if (Alignment && Alignment < 2 && !Subtarget->allowsUnalignedMem())
+      if (Alignment && Alignment < 2 && (!Subtarget->allowsUnalignedMem() ||
+                                         TM.Options.StrictAlign))
         return false;
 
       if (isThumb2) {
@@ -1166,7 +1169,8 @@
       }
       break;
     case MVT::i32:
-      if (Alignment && Alignment < 4 && !Subtarget->allowsUnalignedMem())
+      if (Alignment && Alignment < 4 && (!Subtarget->allowsUnalignedMem() ||
+                                         TM.Options.StrictAlign))
         return false;
 
       if (isThumb2) {