From: Dimitar Dimitrov <dimitar@dinux.eu>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Cc: Jonathan Wakely <jwakely@redhat.com>,
Dimitar Dimitrov <dimitar@dinux.eu>
Subject: [PATCH] libstdc++: Decouple HAVE_FCNTL_H from HAVE_DIRENT_H check
Date: Mon, 7 Feb 2022 22:10:58 +0200 [thread overview]
Message-ID: <20220207201058.250114-1-dimitar@dinux.eu> (raw)
On PRU target with newlib, we have the following combination in config.h:
/* #undef HAVE_DIRENT_H */
#define HAVE_FCNTL_H 1
#define HAVE_UNLINKAT 1
In newlib, targets which do not define dirent.h, get a build error when
including <dirent.h>:
https://sourceware.org/git/?p=newlib-cygwin.git;a=blob;f=newlib/libc/include/sys/dirent.h;hb=HEAD
While fs_dir.cc correctly checks for HAVE_FCNTL_H, dir-common.h doesn't,
and instead uses HAVE_DIRENT_H. This results in unlinkat() function call
in fs_dir.cc without the needed <fcntl.h> include in dir-common.h. Thus
a build failure:
.../gcc/libstdc++-v3/src/c++17/fs_dir.cc:151:11: error: ‘::unlinkat’ has not been declared; did you mean ‘unlink’?
Fix by encapsulating <fcntl.h> include with the correct check.
Regtested x86_64-pc-linux-gnu and no new failures detected.
Fixes commit r12-7062-gebf61754647689 (libstdc++: Fix filesystem::remove_all races).
libstdc++-v3/ChangeLog:
* src/filesystem/dir-common.h (_GLIBCXX_HAVE_FCNTL_H): Move the
check outside the HAVE_DIRENT_H check.
Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu>
---
libstdc++-v3/src/filesystem/dir-common.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/src/filesystem/dir-common.h b/libstdc++-v3/src/filesystem/dir-common.h
index 0b7665a3f70..cfce4fae9a4 100644
--- a/libstdc++-v3/src/filesystem/dir-common.h
+++ b/libstdc++-v3/src/filesystem/dir-common.h
@@ -35,10 +35,11 @@
# include <sys/types.h>
# endif
# include <dirent.h> // opendir, readdir, fdopendir, dirfd
-# ifdef _GLIBCXX_HAVE_FCNTL_H
-# include <fcntl.h> // open, openat, fcntl, AT_FDCWD, O_NOFOLLOW etc.
-# include <unistd.h> // close, unlinkat
-# endif
+#endif
+
+#ifdef _GLIBCXX_HAVE_FCNTL_H
+# include <fcntl.h> // open, openat, fcntl, AT_FDCWD, O_NOFOLLOW etc.
+# include <unistd.h> // close, unlinkat
#endif
namespace std _GLIBCXX_VISIBILITY(default)
--
2.34.1
next reply other threads:[~2022-02-07 20:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-07 20:10 Dimitar Dimitrov [this message]
2022-02-07 21:01 ` Jonathan Wakely
2022-02-07 21:05 ` Jonathan Wakely
2022-02-08 21:02 ` Dimitar Dimitrov
2022-02-08 21:18 ` Jonathan Wakely
2022-02-10 13:03 ` [committed] " Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220207201058.250114-1-dimitar@dinux.eu \
--to=dimitar@dinux.eu \
--cc=gcc-patches@gcc.gnu.org \
--cc=jwakely@redhat.com \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).