[PATCH 2/2] Revert "linux: Move xmknod{at} to compat symbols"

Adhemerval Zanella adhemerval.zanella@linaro.org
Thu Oct 22 19:03:02 GMT 2020


This reverts commit 81b83ff61f95f30ad53d6075247af0ea61a0b16e responsible
to make both __xmknod{at} compatible symbols.

The idea is to not force static libraries built against old glibc
to update against new glibcs (since they reference the the
xmknod{at} symbols).
---
 sysdeps/mach/hurd/xmknod.c         | 11 -----------
 sysdeps/mach/hurd/xmknodat.c       | 11 -----------
 sysdeps/unix/sysv/linux/xmknod.c   |  3 ---
 sysdeps/unix/sysv/linux/xmknodat.c |  2 --
 4 files changed, 27 deletions(-)

diff --git a/sysdeps/mach/hurd/xmknod.c b/sysdeps/mach/hurd/xmknod.c
index a1b5af086d..fa69bc3bec 100644
--- a/sysdeps/mach/hurd/xmknod.c
+++ b/sysdeps/mach/hurd/xmknod.c
@@ -17,7 +17,6 @@
 
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <shlib-compat.h>
 
 /* Create a device file named FILE_NAME, with permission and special bits MODE
    and device number DEV (which can be constructed from major and minor
@@ -28,13 +27,3 @@ __xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev)
   return __xmknodat (vers, AT_FDCWD, file_name, mode, dev);
 }
 libc_hidden_def (__xmknod)
-
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33)
-int
-__xmknod_compat (int vers, const char *file_name, mode_t mode, dev_t *dev)
-{
-  return __xmknod (vers, file_name, mode, dev);
-}
-
-compat_symbol (libc, __xmknod_compat, __xmknod, GLIBC_2_0);
-#endif
diff --git a/sysdeps/mach/hurd/xmknodat.c b/sysdeps/mach/hurd/xmknodat.c
index 90724694d5..e46c63036e 100644
--- a/sysdeps/mach/hurd/xmknodat.c
+++ b/sysdeps/mach/hurd/xmknodat.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/sysmacros.h>
-#include <shlib-compat.h>
 
 /* Create a device file named PATH relative to FD, with permission and
    special bits MODE and device number DEV (which can be constructed
@@ -118,13 +117,3 @@ __xmknodat (int vers, int fd, const char *path, mode_t mode, dev_t *dev)
   return 0;
 }
 libc_hidden_def (__xmknodat)
-
-#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33)
-int
-__xmknodat_compat (int vers, int fd, const char *path, mode_t mode, dev_t *dev)
-{
-  return __xmknodat (vers, fd, path, mode, dev);
-}
-
-compat_symbol (libc, __xmknodat_compat, __xmknodat, GLIBC_2_4);
-#endif
diff --git a/sysdeps/unix/sysv/linux/xmknod.c b/sysdeps/unix/sysv/linux/xmknod.c
index 82bb0bd953..f7eb104423 100644
--- a/sysdeps/unix/sysv/linux/xmknod.c
+++ b/sysdeps/unix/sysv/linux/xmknod.c
@@ -26,7 +26,6 @@
    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)
 {
   if (vers != _MKNOD_VER)
@@ -34,6 +33,4 @@ __xmknod (int vers, const char *path, mode_t mode, dev_t *dev)
 
   return __mknodat (AT_FDCWD, path, mode, *dev);
 }
-
-compat_symbol (libc, __xmknod, __xmknod, GLIBC_2_0);
 #endif
diff --git a/sysdeps/unix/sysv/linux/xmknodat.c b/sysdeps/unix/sysv/linux/xmknodat.c
index fae3fe54d1..b1a43229c8 100644
--- a/sysdeps/unix/sysv/linux/xmknodat.c
+++ b/sysdeps/unix/sysv/linux/xmknodat.c
@@ -31,6 +31,4 @@ __xmknodat (int vers, int fd, const char *file, mode_t mode, dev_t *dev)
 
   return __mknodat (fd, file, mode, *dev);
 }
-
-compat_symbol (libc, __xmknodat, __xmknodat, GLIBC_2_4);
 #endif
-- 
2.25.1



More information about the Libc-alpha mailing list