diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-09-04 18:07:03 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-09-08 16:34:02 +0200 |
| commit | 116f1c64d8d84ecbf269ac70a35657aa057f26c3 (patch) | |
| tree | ad005b4e5147ae579495d8ec2e0b07358710b1e9 /sysdeps/wordsize-64 | |
| parent | ffca890177bbf0980b66bc3a6d4d25c481957348 (diff) | |
| download | glibc-116f1c64d8d84ecbf269ac70a35657aa057f26c3.tar.gz glibc-116f1c64d8d84ecbf269ac70a35657aa057f26c3.tar.xz glibc-116f1c64d8d84ecbf269ac70a35657aa057f26c3.zip | |
posix: Consolidate Linux glob implementation
This patch consolidates the glob implementation. The main changes are:
* On Linux all implementation now uses the default one at
sysdeps/unix/sysv/linux/glob{free}{64}.c with the exception
of alpha (which requires specific versioning) and s390-32 (which
different than other 32 bits ports it does not add a compat one
symbol for 2.1 version).
* The default implementation uses XSTAT_IS_XSTAT64 to define whether
both glob{free} and glob{free}64 should be different implementations.
For archictures that define XSTAT_IS_XSTAT64, glob{free} is an alias
to glob{free}64.
* Move i386 olddirent.h header to Linux default directory, since it is
the only header with this name and it is shared among different
architectures (and used on compat glob symbol as well).
Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
for all major architectures.
* sysdeps/unix/sysv/linux/arm/glob64.c: Remove file.
* sysdeps/unix/sysv/linux/i386/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/globfree64.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/globfree64.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/x32/glob.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/x32/globfree.c: Likewise.
* sysdeps/wordsize-64/glob.c: Likewise.
* sysdeps/wordsize-64/glob64.c: Likewise.
* sysdeps/wordsize-64/globfree64.c: Likewise.
* sysdeps/unix/sysv/linux/glob.c: New file.
* sysdeps/unix/sysv/linux/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/globfree.c: Likewise.
* sysdeps/unix/sysv/linux/globfree64.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/glob64.c: Likewise.
* sysdeps/unix/sysv/linux/oldglob.c [SHLIB_COMPAT]: Also
adds !GLOB_NO_OLD_VERSION as an extra condition.
* sysdeps/unix/sysv/linux/i386/alphasort64.c: Include olddirent.h
using relative path instead of absolute one.
* sysdeps/unix/sysv/linux/i386/getdents64.c: Likewise.
* sysdeps/unix/sysv/linux/i386/readdir64.c: Likewise.
* sysdeps/unix/sysv/linux/i386/readdir64_r.c: Likewise.
* sysdeps/unix/sysv/linux/i386/versionsort64.c: Likewise.
* sysdeps/unix/sysv/linux/i386/olddirent.h: Move to ...
* sysdeps/unix/sysv/linux//olddirent.h: ... here.
Diffstat (limited to 'sysdeps/wordsize-64')
| -rw-r--r-- | sysdeps/wordsize-64/glob.c | 6 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/glob64.c | 1 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/globfree.c | 5 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/globfree64.c | 1 |
4 files changed, 0 insertions, 13 deletions
diff --git a/sysdeps/wordsize-64/glob.c b/sysdeps/wordsize-64/glob.c deleted file mode 100644 index 954e8d37e2..0000000000 --- a/sysdeps/wordsize-64/glob.c +++ /dev/null @@ -1,6 +0,0 @@ -#define glob64 __no_glob64_decl -#define globfree64 __no_globfree64_decl -#include <posix/glob.c> -#undef glob64 -#undef globfree64 -weak_alias (glob, glob64) diff --git a/sysdeps/wordsize-64/glob64.c b/sysdeps/wordsize-64/glob64.c deleted file mode 100644 index 33918ea6a5..0000000000 --- a/sysdeps/wordsize-64/glob64.c +++ /dev/null @@ -1 +0,0 @@ -/* glob64 is in glob.c */ diff --git a/sysdeps/wordsize-64/globfree.c b/sysdeps/wordsize-64/globfree.c deleted file mode 100644 index ec8c35b489..0000000000 --- a/sysdeps/wordsize-64/globfree.c +++ /dev/null @@ -1,5 +0,0 @@ -#define globfree64 __no_globfree64_decl -#include <posix/globfree.c> -#undef globfree64 -weak_alias (globfree, globfree64) -libc_hidden_ver (globfree, globfree64) diff --git a/sysdeps/wordsize-64/globfree64.c b/sysdeps/wordsize-64/globfree64.c deleted file mode 100644 index a0f57ff4b3..0000000000 --- a/sysdeps/wordsize-64/globfree64.c +++ /dev/null @@ -1 +0,0 @@ -/* globfree64 is in globfree.c */ |