diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-09 21:28:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-09 21:28:05 +0000 |
| commit | 8fa5c2528c04df00f9f9a3dc4047ae88d3f13524 (patch) | |
| tree | 00eb71b5f78b12233f6526954fbcf76c3aecbaf0 /libc/arch-arm64/bionic/setjmp.S | |
| parent | b222097dae05dfbca8000a18e0629c6bca7584c4 (diff) | |
| parent | fff3c0fdcf2a6f4301a238628fbf8182780a1612 (diff) | |
| download | bionic-8fa5c2528c04df00f9f9a3dc4047ae88d3f13524.zip bionic-8fa5c2528c04df00f9f9a3dc4047ae88d3f13524.tar.gz bionic-8fa5c2528c04df00f9f9a3dc4047ae88d3f13524.tar.bz2 | |
Merge "Align arm64 stacks to 16 bytes in __bionic_clone."
Diffstat (limited to 'libc/arch-arm64/bionic/setjmp.S')
| -rw-r--r-- | libc/arch-arm64/bionic/setjmp.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libc/arch-arm64/bionic/setjmp.S b/libc/arch-arm64/bionic/setjmp.S index 9a68d86..f9d2266 100644 --- a/libc/arch-arm64/bionic/setjmp.S +++ b/libc/arch-arm64/bionic/setjmp.S @@ -85,7 +85,7 @@ ENTRY(longjmp) ldr w9, .L_setjmp_magic ldr w10, [x0, #(_JB_MAGIC * 4)] cmp w9, w10 - b.ne botch + b.ne .L_fail /* restore core registers */ ldp x30, x10, [x0, #(_JB_CORE_BASE * 4 + 16 * 0)] @@ -105,10 +105,10 @@ ENTRY(longjmp) /* validate sp (sp mod 16 = 0) and lr (lr mod 4 = 0) */ tst x30, #3 - b.ne botch + b.ne .L_fail mov x10, sp tst x10, #15 - b.ne botch + b.ne .L_fail /* set return value */ cmp w1, wzr @@ -116,7 +116,7 @@ ENTRY(longjmp) ret /* validation failed, die die die */ -botch: +.L_fail: bl PIC_SYM(longjmperror, PLT) bl PIC_SYM(abort, PLT) b . - 8 /* Cannot get here */ |