Revert __dirfd PLT avoidance for now

* io/fts.c (fts_build): Call dirfd instead of __dirfd.

diff --git a/ChangeLog b/ChangeLog
index e63f987..cbc9836 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -317,7 +317,6 @@
        (_hurd_siginfo_handler): Call _IO_puts instead of puts.
        * hurd/xattr.c (_hurd_xattr_get, _hurd_xattr_set): Call __munmap instead of
        munmap.
-       * io/fts.c (fts_build): Call __dirfd instead of dirfd.
        * mach/devstream.c: Include <libioP.h>.
        (dealloc_ref): Call __mach_port_deallocate instead of
        mach_port_deallocate.

diff --git a/io/fts.c b/io/fts.c
index a30491c..ad9d333 100644 (file)
--- a/io/fts.c
+++ b/io/fts.c
@@ -680,7 +680,7 @@ fts_build (FTSOBJ *sp, int type)
         */
        cderrno = 0;
        if (nlinks || type == BREAD) {
-               if (fts_safe_changedir(sp, cur, __dirfd(dirp), NULL)) {
+               if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
                        if (nlinks && type == BREAD)
                                cur->fts_errno = errno;
                        cur->fts_flags |= FTS_DONTCHDIR;