2018-04-06 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+ * sysdeps/posix/readdir.c (__READDIR, __GETDENTS, DIRENTY_TYPE,
+ __READDIR_ALIAS): Undefine after usage.
+ * sysdeps/posix/readdir_r.c (__READDIR_R, __GETDENTS, DIRENT_TYPE,
+ __READDIR_R_ALIAS): Likewise.
+ * sysdeps/unix/sysv/linux/arm/readdir64.c: Remove file.
+ * sysdeps/unix/sysv/linux/arm/readdir64_r.c: Likewise.
+ * sysdeps/unix/sysv/linux/m68k/readdir64.c: Likewise.
+ * sysdeps/unix/sysv/linux/m68k/readdir64_r.c: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/readdir64.c: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/readdir64_r.c: Likewise.
+ * sysdeps/unix/sysv/linux/i386/readdir64.c: Likewise.
+ * sysdeps/unix/sysv/linux/i386/readdir64_r.c: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-32/readdir64.c: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-32/readdir64_r.c: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sparc32/readdir64.c: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sparc32/readdir64_r.c: Likewise.
+ * sysdeps/unix/sysv/linux/wordsize-64/readdir.c: Likewise.
+ * sysdeps/unix/sysv/linux/wordsize-64/readdir64.c: Likewise.
+ * sysdeps/unix/sysv/linux/wordsize-64/readdir64_r.c: Likewise.
+ * sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c: Likewise.
+ * sysdeps/unix/sysv/linux/readdir.c: New file.
+ * sysdeps/unix/sysv/linux/readdir_r.c: Likewise.
+ * sysdeps/unix/sysv/linux/readdir64.c: Add compat symbol if required.
+ * sysdeps/unix/sysv/linux/readdir64_r.c: Likewise.
+
* sysdeps/i386/i686/fpu/multiarch/libm-test-ulps: Update.
2018-04-06 Andreas Schwab <schwab@linux-m68k.org>
#ifdef __READDIR_ALIAS
weak_alias (__readdir, readdir)
#endif
+
+#undef __READDIR
+#undef __GETDENTS
+#undef DIRENT_TYPE
+#undef __READDIR_ALIAS
#ifdef __READDIR_R_ALIAS
weak_alias (__readdir_r, readdir_r)
#endif
+
+#undef __READDIR_R
+#undef __GETDENTS
+#undef DIRENT_TYPE
+#undef __READDIR_R_ALIAS
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/readdir64.c>
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/readdir64_r.c>
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/readdir64.c>
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/readdir64_r.c>
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/readdir64.c>
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/readdir64_r.c>
-/* Copyright (C) 2000-2018 Free Software Foundation, Inc.
+/* Read a directory. Linux no-LFS version.
+ Copyright (C) 2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define __READDIR_R __readdir64_r
-#define __GETDENTS __getdents64
-#define DIRENT_TYPE struct dirent64
+#include <dirent.h>
-#include <sysdeps/posix/readdir_r.c>
-
-#undef __READDIR_R
-#undef __GETDENTS
-#undef DIRENT_TYPE
-
-#include <shlib-compat.h>
-
-versioned_symbol (libc, __readdir64_r, readdir64_r, GLIBC_2_2);
-
-#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
-
-#include <olddirent.h>
-
-#define __READDIR_R attribute_compat_text_section __old_readdir64_r
-#define __GETDENTS __old_getdents64
-#define DIRENT_TYPE struct __old_dirent64
-
-#include <sysdeps/posix/readdir_r.c>
-
-compat_symbol (libc, __old_readdir64_r, readdir64_r, GLIBC_2_1);
+#if !_DIRENT_MATCHES_DIRENT64
+# include <sysdeps/posix/readdir.c>
#endif
-#define __READDIR __readdir64
-#define __GETDENTS __getdents64
+/* Read a directory. Linux LFS version.
+ Copyright (C) 1997-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+/* When _DIRENT_MATCHES_DIRENT64 is defined we can alias 'readdir64' to
+ 'readdir'. However the function signatures are not equal due
+ different return types, so we need to suppress {__}readdir so weak
+ and strong alias do not throw conflicting types errors. */
+#define readdir __no_readdir_decl
+#define __readdir __no___readdir_decl
+#include <dirent.h>
+
+#define __READDIR __readdir64
+#define __GETDENTS __getdents64
#define DIRENT_TYPE struct dirent64
#include <sysdeps/posix/readdir.c>
+#undef __readdir
+#undef readdir
+
libc_hidden_def (__readdir64)
+#if _DIRENT_MATCHES_DIRENT64
+strong_alias (__readdir64, __readdir)
weak_alias (__readdir64, readdir64)
+weak_alias (__readdir64, readdir)
+#else
+/* The compat code expects the 'struct direct' with d_ino being a __ino_t
+ instead of __ino64_t. */
+# include <shlib-compat.h>
+versioned_symbol (libc, __readdir64, readdir64, GLIBC_2_2);
+# if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
+# include <olddirent.h>
+# define __READDIR attribute_compat_text_section __old_readdir64
+# define __GETDENTS __old_getdents64
+# define DIRENT_TYPE struct __old_dirent64
+# include <sysdeps/posix/readdir.c>
+libc_hidden_def (__old_readdir64)
+compat_symbol (libc, __old_readdir64, readdir64, GLIBC_2_1);
+# endif /* SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) */
+#endif /* _DIRENT_MATCHES_DIRENT64 */
+/* Read a directory in reentrant mode. Linux LFS version.
+ Copyright (C) 1997-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+/* When _DIRENT_MATCHES_DIRENT64 is defined we can alias 'readdir64' to
+ 'readdir'. However the function signatures are not equal due
+ different return types, so we need to suppress {__}readdir so weak
+ and strong alias do not throw conflicting types errors. */
+#define readdir_r __no_readdir_r_decl
+#define __readdir_r __no___readdir_r_decl
+#include <dirent.h>
+
#define __READDIR_R __readdir64_r
-#define __GETDENTS __getdents64
+#define __GETDENTS __getdents64
#define DIRENT_TYPE struct dirent64
#include <sysdeps/posix/readdir_r.c>
+#undef __readdir_r
+#undef readdir_r
+
+#if _DIRENT_MATCHES_DIRENT64
+strong_alias (__readdir64_r, __readdir_r)
+weak_alias (__readdir64_r, readdir_r)
weak_alias (__readdir64_r, readdir64_r)
+#else
+/* The compat code expects the 'struct direct' with d_ino being a __ino_t
+ instead of __ino64_t. */
+# include <shlib-compat.h>
+versioned_symbol (libc, __readdir64_r, readdir64_r, GLIBC_2_2);
+# if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
+# include <olddirent.h>
+# define __READDIR_R attribute_compat_text_section __old_readdir64_r
+# define __GETDENTS __old_getdents64
+# define DIRENT_TYPE struct __old_dirent64
+# include <sysdeps/posix/readdir_r.c>
+compat_symbol (libc, __old_readdir64_r, readdir64_r, GLIBC_2_1);
+# endif /* SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) */
+#endif /* _DIRENT_MATCHES_DIRENT64 */
-/* Copyright (C) 2000-2018 Free Software Foundation, Inc.
+/* Read a directory in reentrant mode. Linux no-LFS version.
+ Copyright (C) 2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define __READDIR __readdir64
-#define __GETDENTS __getdents64
-#define DIRENT_TYPE struct dirent64
+#include <dirent.h>
-#include <sysdeps/posix/readdir.c>
-
-#include <shlib-compat.h>
-
-#undef __READDIR
-#undef __GETDENTS
-#undef DIRENT_TYPE
-
-libc_hidden_def (__readdir64)
-versioned_symbol (libc, __readdir64, readdir64, GLIBC_2_2);
-
-#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
-
-#include <olddirent.h>
-
-#define __READDIR attribute_compat_text_section __old_readdir64
-#define __GETDENTS __old_getdents64
-#define DIRENT_TYPE struct __old_dirent64
-
-#include <sysdeps/posix/readdir.c>
-
-libc_hidden_def (__old_readdir64)
-
-compat_symbol (libc, __old_readdir64, readdir64, GLIBC_2_1);
+#if !_DIRENT_MATCHES_DIRENT64
+# include <sysdeps/posix/readdir_r.c>
#endif
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/readdir64.c>
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/readdir64_r.c>
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/readdir64.c>
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/readdir64_r.c>
+++ /dev/null
-#define readdir64 __no_readdir64_decl
-#define __readdir64 __no___readdir64_decl
-#include <sysdeps/posix/readdir.c>
-#undef __readdir64
-strong_alias (__readdir, __readdir64)
-strong_alias (__readdir, __GI___readdir64)
-#undef readdir64
-weak_alias (__readdir, readdir64)
+++ /dev/null
-/* readdir64 is in readdir.c */
+++ /dev/null
-/* readdir64_r is in readdir_r.c */
+++ /dev/null
-#define readdir64_r __no_readdir64_r_decl
-#include <sysdeps/posix/readdir_r.c>
-#undef readdir64_r
-weak_alias (__readdir_r, readdir64_r)
projects / thirdparty / glibc.git / commitdiff
