diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2016-07-05 18:00:23 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2016-07-05 18:00:23 +0000 |
| commit | e2fc5d984d0bcb0eba77ce5030f053dfc0eae2a2 (patch) | |
| tree | b21dcab8cdbe07ded020ad2c036bd62d4b8d88ce /src/UnwindRegistersSave.S | |
| parent | ca83053650e2c15214b17a869aae5d544c9a59da (diff) | |
| download | src-vendor/llvm-libunwind/libunwind-r272680.tar.gz src-vendor/llvm-libunwind/libunwind-r272680.zip | |
Import LLVM libunwind snapshot revision 272680vendor/llvm-libunwind/libunwind-r272680
Significant upstream revisions:
260595: [AArch64] Fix libunwind build when using GNU assembler
270692: Introduce a native-only unwinder build.
270972: Disable cross-unwinding by default.
271004: [libunwind] Improve unwinder stack usage - II
272680: [libunwind] Improve unwinder stack usage - III
Obtained from: https://llvm.org/svn/llvm-project/libunwind/trunk/
Diffstat (limited to 'src/UnwindRegistersSave.S')
| -rw-r--r-- | src/UnwindRegistersSave.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/UnwindRegistersSave.S b/src/UnwindRegistersSave.S index f84b7114f777..82becffa0e45 100644 --- a/src/UnwindRegistersSave.S +++ b/src/UnwindRegistersSave.S @@ -263,11 +263,11 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext) stp x22,x23, [x0, #0x0B0] stp x24,x25, [x0, #0x0C0] stp x26,x27, [x0, #0x0D0] - stp x28,fp, [x0, #0x0E0] - str lr, [x0, #0x0F0] + stp x28,x29, [x0, #0x0E0] + str x30, [x0, #0x0F0] mov x1,sp str x1, [x0, #0x0F8] - str lr, [x0, #0x100] // store return address as pc + str x30, [x0, #0x100] // store return address as pc // skip cpsr stp d0, d1, [x0, #0x110] stp d2, d3, [x0, #0x120] |