From: H.J. Lu Date: Sun, 20 Aug 2017 17:45:58 +0000 (-0700) Subject: i386: Hide __old_readdir64 [BZ #18822] X-Git-Tag: glibc-2.27~1119 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8dfa99c984e4bdc7b5363e23ff0d1e8b26da6e5;p=thirdparty%2Fglibc.git i386: Hide __old_readdir64 [BZ #18822] Hide internal __old_readdir64 function to allow direct access within libc.so and libc.a without using GOT nor PLT. [BZ #18822] * sysdeps/unix/sysv/linux/i386/olddirent.h (__old_readdir64): Add libc_hidden_proto. * sysdeps/unix/sysv/linux/i386/readdir64.c (__old_readdir64): Add libc_hidden_def. --- diff --git a/ChangeLog b/ChangeLog index 2596c39f3e0..5d16204f5c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2017-08-20 H.J. Lu + + [BZ #18822] + * sysdeps/unix/sysv/linux/i386/olddirent.h (__old_readdir64): + Add libc_hidden_proto. + * sysdeps/unix/sysv/linux/i386/readdir64.c (__old_readdir64): + Add libc_hidden_def. + 2017-08-20 H.J. Lu [BZ #21974] diff --git a/sysdeps/unix/sysv/linux/i386/olddirent.h b/sysdeps/unix/sysv/linux/i386/olddirent.h index 413f78d1088..8f2fcb7a9c0 100644 --- a/sysdeps/unix/sysv/linux/i386/olddirent.h +++ b/sysdeps/unix/sysv/linux/i386/olddirent.h @@ -31,6 +31,7 @@ struct __old_dirent64 /* Now define the internal interfaces. */ extern struct __old_dirent64 *__old_readdir64 (DIR *__dirp); +libc_hidden_proto (__old_readdir64); extern int __old_readdir64_r (DIR *__dirp, struct __old_dirent64 *__entry, struct __old_dirent64 **__result); extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes) diff --git a/sysdeps/unix/sysv/linux/i386/readdir64.c b/sysdeps/unix/sysv/linux/i386/readdir64.c index f80b6a7ba28..de8669feff9 100644 --- a/sysdeps/unix/sysv/linux/i386/readdir64.c +++ b/sysdeps/unix/sysv/linux/i386/readdir64.c @@ -39,5 +39,7 @@ versioned_symbol (libc, __readdir64, readdir64, GLIBC_2_2); #include +libc_hidden_def (__old_readdir64) + compat_symbol (libc, __old_readdir64, readdir64, GLIBC_2_1); #endif