diff options
| author | Richard Henderson <rth@redhat.com> | 2014-05-29 12:14:49 -0400 |
|---|---|---|
| committer | Will Newton <will.newton@linaro.org> | 2014-07-03 15:26:51 +0100 |
| commit | 7547e32c642fe95ca3b1515ecdb8c941a4526266 (patch) | |
| tree | cf044db2c0467016fef91d6bdfe290d4807b502e | |
| parent | 289c2dc3764625068bf11332f482266a334f2c9f (diff) | |
aarch64: Remove PSEUDO_RET
| -rw-r--r-- | libc/ports/ChangeLog.aarch64.linaro | 6 | ||||
| -rw-r--r-- | libc/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h | 23 |
2 files changed, 9 insertions, 20 deletions
diff --git a/libc/ports/ChangeLog.aarch64.linaro b/libc/ports/ChangeLog.aarch64.linaro index f7c952c64..86f44a348 100644 --- a/libc/ports/ChangeLog.aarch64.linaro +++ b/libc/ports/ChangeLog.aarch64.linaro @@ -1,5 +1,11 @@ 2014-05-30 Richard Henderson <rth@twiddle.net> + * sysdeps/unix/sysv/linux/aarch64/sysdep.h (PSEUDO_RET): Remove. + (PSEUDO_RET_NOERRNO): Remove. + (ret): Don't redefine. + (ret_NOERRNO): Define in terms of ret. + (ret_ERRVAL): Likewise. + * sysdeps/unix/sysv/linux/aarch64/ioctl.S (__ioctl): Remove the use of PSEUDO_RET; perform the error check directly. diff --git a/libc/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/libc/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h index 4d434845d..3bebdd6c8 100644 --- a/libc/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/libc/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -61,15 +61,6 @@ cmn x0, #4095; \ b.cs .Lsyscall_error; -/* Notice the use of 'RET' instead of 'ret' the assembler is case - insensitive and eglibc already uses the preprocessor symbol 'ret' - so we use the upper case 'RET' to force through a ret instruction - to the assembler */ -# define PSEUDO_RET \ - RET; -# undef ret -# define ret PSEUDO_RET - # undef PSEUDO_END # define PSEUDO_END(name) \ SYSCALL_ERROR_HANDLER \ @@ -81,20 +72,12 @@ ENTRY (name); \ DO_CALL (syscall_name, args); -/* Notice the use of 'RET' instead of 'ret' the assembler is case - insensitive and eglibc already uses the preprocessor symbol 'ret' - so we use the upper case 'RET' to force through a ret instruction - to the assembler */ -# define PSEUDO_RET_NOERRNO \ - RET; - -# undef ret_NOERRNO -# define ret_NOERRNO PSEUDO_RET_NOERRNO - # undef PSEUDO_END_NOERRNO # define PSEUDO_END_NOERRNO(name) \ END (name) +# define ret_NOERRNO ret + /* The function has to return the error code. */ # undef PSEUDO_ERRVAL # define PSEUDO_ERRVAL(name, syscall_name, args) \ @@ -107,7 +90,7 @@ # define PSEUDO_END_ERRVAL(name) \ END (name) -# define ret_ERRVAL PSEUDO_RET_NOERRNO +# define ret_ERRVAL ret # if NOT_IN_libc # define SYSCALL_ERROR .Lsyscall_error |