mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
linux: Consolidate INLINE_SYSCALL
With all Linux ABIs using the expected Linux kABI to indicate syscalls errors, there is no need to replicate the INLINE_SYSCALL. The generic Linux sysdep.h includes errno.h even for !__ASSEMBLER__, which is ok now and it allows cleanup some archaic code that assume otherwise. Checked with a build against all affected ABIs.
This commit is contained in:
@ -15,8 +15,43 @@
|
||||
License along with the GNU C Library; if not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef _SYSDEP_LINUX_H
|
||||
#define _SYSDEP_LINUX_H
|
||||
|
||||
#include <bits/wordsize.h>
|
||||
#include <kernel-features.h>
|
||||
#include <errno.h>
|
||||
|
||||
#undef INTERNAL_SYSCALL_DECL
|
||||
#define INTERNAL_SYSCALL_DECL(err) do { } while (0)
|
||||
|
||||
#undef INTERNAL_SYSCALL_ERROR_P
|
||||
#define INTERNAL_SYSCALL_ERROR_P(val, err) \
|
||||
((unsigned long int) (val) > -4096UL)
|
||||
|
||||
#ifndef SYSCALL_ERROR_LABEL
|
||||
# define SYSCALL_ERROR_LABEL(sc_err) \
|
||||
({ \
|
||||
__set_errno (sc_err); \
|
||||
-1L; \
|
||||
})
|
||||
#endif
|
||||
|
||||
/* Define a macro which expands into the inline wrapper code for a system
|
||||
call. It sets the errno and returns -1 on a failure, or the syscall
|
||||
return value otherwise. */
|
||||
#undef INLINE_SYSCALL
|
||||
#define INLINE_SYSCALL(name, nr, args...) \
|
||||
({ \
|
||||
INTERNAL_SYSCALL_DECL (sc_err); \
|
||||
long int sc_ret = INTERNAL_SYSCALL (name, sc_err, nr, args); \
|
||||
__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (sc_ret, sc_err)) \
|
||||
? SYSCALL_ERROR_LABEL (INTERNAL_SYSCALL_ERRNO (sc_ret, sc_err)) \
|
||||
: sc_ret; \
|
||||
})
|
||||
|
||||
#undef INTERNAL_SYSCALL_ERRNO
|
||||
#define INTERNAL_SYSCALL_ERRNO(val, err) (-(val))
|
||||
|
||||
/* Set error number and return -1. A target may choose to return the
|
||||
internal function, __syscall_error, which sets errno and returns -1.
|
||||
@ -66,3 +101,5 @@
|
||||
/* Exports the __send symbol on send.c linux implementation (some ABI have
|
||||
it missing due the usage of a old generic version without it). */
|
||||
#define HAVE_INTERNAL_SEND_SYMBOL 1
|
||||
|
||||
#endif /* _SYSDEP_LINUX_H */
|
||||
|
Reference in New Issue
Block a user