Consolidate scandir{at}{64} implementation
commitc0123b3b1118419210879e935620eb2ad987c2f1
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Thu, 1 Mar 2018 12:04:41 +0000 (1 09:04 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Fri, 20 Apr 2018 16:57:12 +0000 (20 13:57 -0300)
treedd8d6ead4be0d0f492b5e8e10996595097463bf9
parent458b94f63e6fc5af1582a98007a1e4769f785fb7
Consolidate scandir{at}{64} implementation

This patch consolidates scandir{at}{64} implementation on just
the default dirent/scandir{at}{64}{_r}.c ones.  It changes the logic
to follow the conventions used on other code consolidation:

  * scandir{at} is only built for _DIRENT_MATCHES_DIRENT64 being 0.

  * scandir{at}{64} 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.

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/scandir-tail-common.c: New file.
* dirent/scandir-tail.c: Use scandir-tail-common.c.
(__scandir_tail): Build iff _DIRENT_MATCHES_DIRENT64 is not defined.
* dirent/scandir.c: Use scandir-tail-common.c.
* dirent/scandirat.c: Likewise.
* dirent/scandir64-tail.c: Use scandir-tail-common.c.
* dirent/scandir64.c (scandir64): Always build and alias to scandir
if _DIRENT_MATCHES_DIRENT64 is defined.
* dirent/scandirat64.c (scandirat64): Likewise.
* include/dirent.h (__scandir_tail): Only define iff
_DIRENT_MATCHES_DIRENT64 is not defined.
(__scandir64_tail): Define regardless.
(__scandirat, scandirat64): Remove libc_hidden_proto.
* sysdeps/unix/sysv/linux/arm/scandir64.c: Remove file.
* sysdeps/unix/sysv/linux/m68k/scandir64.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/scandir64.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/scandir64.c: Likewise.
* sysdeps/unix/sysv/linux/i386/scandir64.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/scandir64.c: Likewise.
* sysdeps/unix/sysv/linux/scandir64.c: New file.
15 files changed:
ChangeLog
dirent/scandir-tail-common.c [moved from dirent/scandir-tail.c with 91% similarity]
dirent/scandir-tail.c [copied from dirent/scandir64-tail.c with 76% similarity]
dirent/scandir.c [copied from dirent/scandir64.c with 73% similarity]
dirent/scandir64-tail.c
dirent/scandir64.c
dirent/scandirat.c [copied from dirent/scandir64.c with 69% similarity]
dirent/scandirat64.c
include/dirent.h
sysdeps/unix/sysv/linux/arm/scandir64.c [deleted file]
sysdeps/unix/sysv/linux/m68k/scandir64.c [deleted file]
sysdeps/unix/sysv/linux/powerpc/powerpc32/scandir64.c [deleted file]
sysdeps/unix/sysv/linux/s390/s390-32/scandir64.c [deleted file]
sysdeps/unix/sysv/linux/scandir64.c [moved from sysdeps/unix/sysv/linux/i386/scandir64.c with 81% similarity]
sysdeps/unix/sysv/linux/sparc/sparc32/scandir64.c [deleted file]