From 81b83ff61f95f30ad53d6075247af0ea61a0b16e Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 21 Jul 2020 15:53:53 -0300 Subject: linux: Move xmknod{at} to compat symbols It also decouple mknod{at} from xmknod{at}. The riscv32 ABI was added on 2.33, so it is safe to remove the old __xmknot{at} symbols and just provide the newer mknod{at} ones. Checked with a build for all affected ABIs. I also checked on x86_64, i686, powerpc, powerpc64le, sparcv9, sparc64, s390, and s390x. Reviewed-by: Lukasz Majewski --- sysdeps/unix/sysv/linux/xmknodat.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'sysdeps/unix/sysv/linux/xmknodat.c') diff --git a/sysdeps/unix/sysv/linux/xmknodat.c b/sysdeps/unix/sysv/linux/xmknodat.c index 5640a49..fae3fe5 100644 --- a/sysdeps/unix/sysv/linux/xmknodat.c +++ b/sysdeps/unix/sysv/linux/xmknodat.c @@ -15,18 +15,11 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include -#include -#include #include -#include - -#include -#include - +#include +#include +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Create a device file named PATH relative to FD, with permission and special bits MODE and device number DEV (which can be constructed from major and minor device numbers with the `makedev' macro above). */ @@ -36,12 +29,8 @@ __xmknodat (int vers, int fd, const char *file, mode_t mode, dev_t *dev) if (vers != _MKNOD_VER) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - /* We must convert the value to dev_t type used by the kernel. */ - unsigned long long int k_dev = (*dev) & ((1ULL << 32) - 1); - if (k_dev != *dev) - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - - return INLINE_SYSCALL (mknodat, 4, fd, file, mode, (unsigned int) k_dev); + return __mknodat (fd, file, mode, *dev); } -libc_hidden_def (__xmknodat) +compat_symbol (libc, __xmknodat, __xmknodat, GLIBC_2_4); +#endif -- cgit v1.1