aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2020-07-08 07:49:40 -0700
committerAlistair Francis <alistair.francis@wdc.com>2020-08-27 08:17:41 -0700
commit4875afe5526efe86478abe33e8b1320969d766d5 (patch)
tree666e5b6490e65364882337c7f0e2c4b2f69b39c6
parent2b09ebeee766be3678896b2a0e61e54a8ad10128 (diff)
downloadglibc-4875afe5526efe86478abe33e8b1320969d766d5.tar
glibc-4875afe5526efe86478abe33e8b1320969d766d5.tar.gz
glibc-4875afe5526efe86478abe33e8b1320969d766d5.tar.bz2
glibc-4875afe5526efe86478abe33e8b1320969d766d5.zip
RISC-V: Cleanup some of the sysdep.h code
Remove a duplicate inclusion of <sysdeps/unix/sysdep.h> which is already pulled via <sysdeps/unix/sysv/linux/generic/sysdep.h>, and the inclusion of <errno.h> whose definition of `__set_errno' is not needed here. Reviewed-by: Maciej W. Rozycki <macro@wdc.com>
-rw-r--r--sysdeps/unix/sysv/linux/riscv/sysdep.h17
1 files changed, 4 insertions, 13 deletions
diff --git a/sysdeps/unix/sysv/linux/riscv/sysdep.h b/sysdeps/unix/sysv/linux/riscv/sysdep.h
index 83e4adf6a2..fbb3a02bbd 100644
--- a/sysdeps/unix/sysv/linux/riscv/sysdep.h
+++ b/sysdeps/unix/sysv/linux/riscv/sysdep.h
@@ -22,6 +22,9 @@
#include <sysdeps/unix/sysv/linux/generic/sysdep.h>
#include <tls.h>
+#undef SYS_ify
+#define SYS_ify(syscall_name) __NR_##syscall_name
+
#ifdef __ASSEMBLER__
# include <sys/asm.h>
@@ -107,19 +110,7 @@
# undef ret_ERRVAL
# define ret_ERRVAL ret
-#endif /* __ASSEMBLER__ */
-
-/* In order to get __set_errno() definition in INLINE_SYSCALL. */
-#ifndef __ASSEMBLER__
-# include <errno.h>
-#endif
-
-#include <sysdeps/unix/sysdep.h>
-
-#undef SYS_ify
-#define SYS_ify(syscall_name) __NR_##syscall_name
-
-#ifndef __ASSEMBLER__
+#else /* !__ASSEMBLER__ */
# define VDSO_NAME "LINUX_4.15"
# define VDSO_HASH 182943605