summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Kledzik <kledzik@apple.com>2014-01-23 18:42:10 +0000
committerNick Kledzik <kledzik@apple.com>2014-01-23 18:42:10 +0000
commita3667741192e8ef640535b4af0d7ad6f22230b36 (patch)
tree148ab2ddce110f765b2dad7f56fca742a38d4551
parent8cb8b2086426108c6ea737d83cfd739ae5e5d8d9 (diff)
downloadlibcxxabi_35a-a3667741192e8ef640535b4af0d7ad6f22230b36.tar.gz
Add missing alignment directives in assembly
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@199915 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--src/Unwind/UnwindRegistersRestore.S2
-rw-r--r--src/Unwind/UnwindRegistersSave.S2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/Unwind/UnwindRegistersRestore.S b/src/Unwind/UnwindRegistersRestore.S
index 15e2072..9f07705 100644
--- a/src/Unwind/UnwindRegistersRestore.S
+++ b/src/Unwind/UnwindRegistersRestore.S
@@ -266,6 +266,7 @@ Lnovec:
; On entry:
; thread_state pointer is in x0
;
+ .align 2
DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind15Registers_arm646jumptoEv)
; skip restore of x0,x1 for now
ldp x2, x3, [x0, #0x010]
@@ -315,6 +316,7 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind15Registers_arm646jumptoEv)
@ On entry:
@ thread_state pointer is in r0
@
+ .align 2
DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind13Registers_arm6jumptoEv)
@ Use lr as base so that r0 can be restored.
mov lr, r0
diff --git a/src/Unwind/UnwindRegistersSave.S b/src/Unwind/UnwindRegistersSave.S
index 6f19f6c..681b44c 100644
--- a/src/Unwind/UnwindRegistersSave.S
+++ b/src/Unwind/UnwindRegistersSave.S
@@ -238,6 +238,7 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext)
; On entry:
; thread_state pointer is in x0
;
+ .align 2
DEFINE_LIBUNWIND_FUNCTION(unw_getcontext)
stp x0, x1, [x0, #0x000]
stp x2, x3, [x0, #0x010]
@@ -287,6 +288,7 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext)
@ On entry:
@ thread_state pointer is in r0
@
+ .align 2
DEFINE_LIBUNWIND_FUNCTION(unw_getcontext)
@ 32bit thumb-2 restrictions for stm:
@ . the sp (r13) cannot be in the list