about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/xmknod.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-07-21 15:53:53 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2020-10-09 17:02:07 -0300
commit81b83ff61f95f30ad53d6075247af0ea61a0b16e (patch)
tree8d1eb0eaa4170a5af411253e667016efb314b9d5 /sysdeps/unix/sysv/linux/xmknod.c
parentaa03f722f3b994aaf81e72a8904bf33196780930 (diff)
downloadglibc-81b83ff61f95f30ad53d6075247af0ea61a0b16e.tar.gz
glibc-81b83ff61f95f30ad53d6075247af0ea61a0b16e.tar.xz
glibc-81b83ff61f95f30ad53d6075247af0ea61a0b16e.zip
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 <lukma@denx.de>
Diffstat (limited to 'sysdeps/unix/sysv/linux/xmknod.c')
-rw-r--r--sysdeps/unix/sysv/linux/xmknod.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/sysdeps/unix/sysv/linux/xmknod.c b/sysdeps/unix/sysv/linux/xmknod.c
index 42809d4c57..82bb0bd953 100644
--- a/sysdeps/unix/sysv/linux/xmknod.c
+++ b/sysdeps/unix/sysv/linux/xmknod.c
@@ -17,29 +17,23 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <sys/stat.h>
-#include <sys/sysmacros.h>
 #include <fcntl.h>
-#include <sysdep.h>
+#include <errno.h>
+#include <shlib-compat.h>
 
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33)
 /* Create a device file named PATH, 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).  */
 int
+attribute_compat_text_section
 __xmknod (int vers, const char *path, mode_t mode, dev_t *dev)
 {
-  unsigned long long int k_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.  */
-  k_dev =  (*dev) & ((1ULL << 32) - 1);
-  if (k_dev != *dev)
-    return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
-
-  return INLINE_SYSCALL_CALL (mknodat, AT_FDCWD, path, mode,
-			      (unsigned int) k_dev);
+  return __mknodat (AT_FDCWD, path, mode, *dev);
 }
 
-weak_alias (__xmknod, _xmknod)
-libc_hidden_def (__xmknod)
+compat_symbol (libc, __xmknod, __xmknod, GLIBC_2_0);
+#endif