This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v3.5 2/2] aarch64: Remove PSEUDO_RET
- From: Richard Henderson <rth at twiddle dot net>
- To: libc-alpha at sourceware dot org
- Cc: marcus dot shawcroft at gmail dot com, Richard Henderson <rth at redhat dot com>
- Date: Thu, 29 May 2014 10:04:38 -0700
- Subject: [PATCH v3.5 2/2] aarch64: Remove PSEUDO_RET
- Authentication-results: sourceware.org; auth=none
- References: <1401383078-32544-1-git-send-email-rth at twiddle dot net>
From: Richard Henderson <rth@redhat.com>
---
sysdeps/unix/sysv/linux/aarch64/sysdep.h | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
index 4686599..3f3c709 100644
--- 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
--
1.9.3