aarch64: Remove PSEUDO_RET

diff --git a/ChangeLog b/ChangeLog
index 1d85abef6e3099198f70c2829fb6163e21b09d16..818dd07a16b23a23c2e80edf80969a583d14f3b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
index 4686599a7efd2ec189a72dc70d96e2f5b0c9ec74..3f3c7096834dcd0fda6a1a779e7b6f8e6c264106 100644 (file)
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h
+++ b/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