[FFmpeg-cvslog] Merge commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 23 18:31:36 2017 -0300| [0d34473d8ecd2aec69229aa076e94977a3f45394] | committer: James Almer

Merge commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b'

* commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b':
  checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobber

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d34473d8ecd2aec69229aa076e94977a3f45394
---

 tests/checkasm/aarch64/checkasm.S | 4 ++--
 1 file 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
 


======================================================================