aboutsummaryrefslogtreecommitdiff
path: root/dirent
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2018-03-01 17:09:42 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2018-04-23 17:35:16 -0300
commitaf7e376b00194ab84c222f25de12bd460a910345 (patch)
tree3b2a4c4aaa523735407adabf209ebda2be814c41 /dirent
parentda5e0361d981674fd7cd18dbeba2c0e718e90a16 (diff)
downloadglibc-af7e376b00194ab84c222f25de12bd460a910345.tar
glibc-af7e376b00194ab84c222f25de12bd460a910345.tar.gz
glibc-af7e376b00194ab84c222f25de12bd460a910345.tar.bz2
glibc-af7e376b00194ab84c222f25de12bd460a910345.zip
Consolidate alphasort{64} and versionsort{64} implementation
This patch consolidates both alphasort{64} and versionsort{64} implementation on just the default dirent/alphasort{64}c and dirent/versionsort{64} respectively. It changes the logic to follow the conventions used on other code consolidation: * the non-LFS variant is only built for _DIRENT_MATCHES_DIRENT64 being 0. * the LFS variant is always built and aliased to getdents for ABIs that define _DIRENT_MATCHES_DIRENT64 to 1. Also on Linux the compat symbol for old non-LFS dirent64 definition requires a platform-specific scandir64.c. For powerpc32 and sparcv9 it requires to add specific arch-implementation to override the generic Linux one because neither ABI exports an compat symbol for non-LFS alphasort64 and versionsort64 variant. It is most likely a bug and it is also not one that can be fixed (in that there would be existing binaries expecting both meanings of that symbol at its single existing version, with binaries expecting the new meaning probably much more common than those expecting the original meaning of that symbol at that version). Checked on aarch64-linux-gnu, x86_64-linux-gnu, i686-linux-gnu, sparcv9-linux-gnu, sparc64-linux-gnu, powerpc-linux-gnu, and powerpc64le-linux-gnu. * dirent/alphasort.c (alphasort): Build iff _DIRENT_MATCHES_DIRENT64 is defined. * dirent/versionsort.c (versionsort): Likewise. * dirent/alphasort64.c (alphasort64): Build regardless and alias to alphasort if _DIRENT_MATCHES_DIRENT64 is defined. * dirent/versionsort64.c (versionsort64): Likewise. * sysdeps/unix/sysv/linux/i386/alphasort64.c: Remove file. * sysdeps/unix/sysv/linux/arm/alphasort64.c: Likewise. * sysdeps/unix/sysv/linux/arm/versionsort64.c: Likewise. * sysdeps/unix/sysv/linux/m68k/alphasort64.c: Likewise. * sysdeps/unix/sysv/linux/m68k/versionsort64.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/alphasort64.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/versionsort64.c: Likewise. * sysdeps/unix/sysv/linux/i386/versionsort64.c: Likewise. * sysdeps/unix/sysv/linux/alphasort64.c: New file. * sysdeps/unix/sysv/linux/versionsort64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/alphasort64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/versionsort64.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/alphasort64.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/versionsort64.c: Likewise.
Diffstat (limited to 'dirent')
-rw-r--r--dirent/alphasort.c13
-rw-r--r--dirent/alphasort64.c7
-rw-r--r--dirent/versionsort.c12
-rw-r--r--dirent/versionsort64.c7
4 files changed, 12 insertions, 27 deletions
diff --git a/dirent/alphasort.c b/dirent/alphasort.c
index a6cd151bd1..6b2a70770d 100644
--- a/dirent/alphasort.c
+++ b/dirent/alphasort.c
@@ -15,23 +15,14 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-/* We need to avoid the header declaration of alphasort64, because
- the types don't match alphasort and then the compiler will
- complain about the mismatch when we do the alias below. */
-#define alphasort64 __renamed_alphasort64
-
#include <dirent.h>
-#undef alphasort64
-
-#include <string.h>
+#if !_DIRENT_MATCHES_DIRENT64
+# include <string.h>
int
alphasort (const struct dirent **a, const struct dirent **b)
{
return strcoll ((*a)->d_name, (*b)->d_name);
}
-
-#if _DIRENT_MATCHES_DIRENT64
-weak_alias (alphasort, alphasort64)
#endif
diff --git a/dirent/alphasort64.c b/dirent/alphasort64.c
index 3a47a97bb5..b822333fca 100644
--- a/dirent/alphasort64.c
+++ b/dirent/alphasort64.c
@@ -15,16 +15,17 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#define alphasort __no_alphasort_decl
#include <dirent.h>
+#undef alphasort
#include <string.h>
-/* alphasort.c defines alphasort64 as an alias if _DIRENT_MATCHES_DIRENT64. */
-#if !_DIRENT_MATCHES_DIRENT64
-
int
alphasort64 (const struct dirent64 **a, const struct dirent64 **b)
{
return strcoll ((*a)->d_name, (*b)->d_name);
}
+#if _DIRENT_MATCHES_DIRENT64
+weak_alias (alphasort64, alphasort)
#endif
diff --git a/dirent/versionsort.c b/dirent/versionsort.c
index 5ec15e83e9..ca38c2dc03 100644
--- a/dirent/versionsort.c
+++ b/dirent/versionsort.c
@@ -15,16 +15,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-/* We need to avoid the header declaration of versionsort64, because
- the types don't match versionsort and then the compiler will
- complain about the mismatch when we do the alias below. */
-#define versionsort64 __renamed_versionsort64
-
#include <dirent.h>
-#undef versionsort64
-
-#include <string.h>
+#if !_DIRENT_MATCHES_DIRENT64
+# include <string.h>
int
versionsort (const struct dirent **a, const struct dirent **b)
@@ -32,6 +26,4 @@ versionsort (const struct dirent **a, const struct dirent **b)
return __strverscmp ((*a)->d_name, (*b)->d_name);
}
-#if _DIRENT_MATCHES_DIRENT64
-weak_alias (versionsort, versionsort64)
#endif
diff --git a/dirent/versionsort64.c b/dirent/versionsort64.c
index 7689c268a5..8f47e609d0 100644
--- a/dirent/versionsort64.c
+++ b/dirent/versionsort64.c
@@ -15,16 +15,17 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#define versionsort __no_versionsort_decl
#include <dirent.h>
+#undef versionsort
#include <string.h>
-/* versionsort.c defines a versionsort64 alias if _DIRENT_MATCHES_DIRENT64. */
-#if !_DIRENT_MATCHES_DIRENT64
-
int
versionsort64 (const struct dirent64 **a, const struct dirent64 **b)
{
return __strverscmp ((*a)->d_name, (*b)->d_name);
}
+#if !_DIRENT_MATCHES_DIRENT64
+weak_alias (versionsort64, versionsort)
#endif