diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 18:31:36 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 18:31:36 -0300 |
| commit | 0d34473d8ecd2aec69229aa076e94977a3f45394 (patch) | |
| tree | e3d757b24dbe3c7e8ef6534a7e6a252ea67be0bb | |
| parent | c97e986e90c3f9719b6ba8409744ecdf21a63cf1 (diff) | |
| parent | dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b (diff) | |
| download | ffmpeg-streaming-0d34473d8ecd2aec69229aa076e94977a3f45394.zip ffmpeg-streaming-0d34473d8ecd2aec69229aa076e94977a3f45394.tar.gz | |
Merge commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b'
* commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b':
checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobber
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | tests/checkasm/aarch64/checkasm.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/checkasm/aarch64/checkasm.S b/tests/checkasm/aarch64/checkasm.S index 03bd983..53a2a47 100644 --- a/tests/checkasm/aarch64/checkasm.S +++ b/tests/checkasm/aarch64/checkasm.S @@ -55,13 +55,13 @@ endconst #define CLOBBER_STACK ((8*MAX_ARGS + 15) & ~15) function checkasm_stack_clobber, export=1 - mov x29, sp + mov x3, sp mov x2, #CLOBBER_STACK 1: stp x0, x1, [sp, #-16]! subs x2, x2, #16 b.gt 1b - mov sp, x29 + mov sp, x3 ret endfunc |
