diff options
| author | Richard Henderson <rth@redhat.com> | 2014-05-25 14:07:17 -0400 |
|---|---|---|
| committer | Richard Henderson <rth@redhat.com> | 2014-05-25 14:07:17 -0400 |
| commit | 5591f178e7d20f10c3250f2ce49986d2d7d5dfb3 (patch) | |
| tree | 4ec1b0909304f5e3385956281e44af9818bf6eb4 | |
| parent | df5496b406e163c2c10127a3b75fb72e1abe1fc0 (diff) | |
| download | glibc-5591f178e7d20f10c3250f2ce49986d2d7d5dfb3.tar.gz glibc-5591f178e7d20f10c3250f2ce49986d2d7d5dfb3.tar.xz glibc-5591f178e7d20f10c3250f2ce49986d2d7d5dfb3.zip | |
aarch64: Share code in syscall-cancel.h
Fold nocancel and error handling paths.
| -rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h index 26d4c0ec8b..41502de602 100644 --- a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h @@ -27,24 +27,17 @@ # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ .section ".text"; \ - .type __##syscall_name##_nocancel,%function; \ - .globl __##syscall_name##_nocancel; \ -__##syscall_name##_nocancel: \ - cfi_startproc; \ +ENTRY (__##syscall_name##_nocancel); \ +.Lpseudo_nocancel: \ DO_CALL (syscall_name, args); \ +.Lpseudo_finish: \ cmn x0, 4095; \ b.cs .Lsyscall_error; \ - PSEUDO_RET; \ - cfi_endproc; \ + .subsection 2; \ .size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \ ENTRY (name); \ SINGLE_THREAD_P; \ - bne .Lpseudo_cancel; \ - DO_CALL (syscall_name, 0); \ - cmn x0, 4095; \ - b.cs .Lsyscall_error; \ - PSEUDO_RET; \ -.Lpseudo_cancel: \ + beq .Lpseudo_nocancel; \ DOCARGS_##args; /* save syscall args etc. around CENABLE. */ \ CENABLE; \ mov x16, x0; /* put mask in safe place. */ \ @@ -60,8 +53,15 @@ ENTRY (name); \ ldr x30, [sp], 16; \ cfi_adjust_cfa_offset (-16); \ cfi_restore (x30); \ - cmn x0, 4095; \ - b.cs .Lsyscall_error; + b .Lpseudo_finish; \ + cfi_endproc; \ + .size name, .-name; \ + .previous + +# undef PSEUDO_END +# define PSEUDO_END(name) \ + SYSCALL_ERROR_HANDLER; \ + cfi_endproc # define DOCARGS_0 \ str x30, [sp, -16]!; \ |