From: Lancelot SIX <lancelot.six@amd.com>
To: <gdb-patches@sourceware.org>, <tdevries@suse.de>
Cc: Lancelot SIX <lancelot.six@amd.com>
Subject: [PATCH] Revert "gdb/compile: Use std::filesystem::remove_all in cleanup"
Date: Wed, 3 Apr 2024 15:44:46 +0100 [thread overview]
Message-ID: <20240403144446.39094-1-lancelot.six@amd.com> (raw)
This reverts commit 7bba0ad08576309763e3f41193eaa93025e10b8b.
Tom de Vries reported that 7bba0ad0857 (gdb/compile: Use
std::filesystem::remove_all in cleanup) broke builds with gcc-7.5.0
which mostly supports c++17, but not std::filesystem[1]. As this change
is not critical, revert it to maintain compatibility.
[1] https://inbox.sourceware.org/gdb-patches/a06e6483-aa2e-4b8a-854f-e369a1e961ea@suse.de/
Change-Id: I58150bd27600c95052bdf1bbbd6b44718a5a0bbf
---
gdb/compile/compile.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c
index bff69a5092d..2d97a1b2005 100644
--- a/gdb/compile/compile.c
+++ b/gdb/compile/compile.c
@@ -39,9 +39,7 @@
#include "osabi.h"
#include "gdbsupport/gdb_wait.h"
#include "valprint.h"
-#include <filesystem>
#include <optional>
-#include <system_error>
#include "gdbsupport/gdb_unlinker.h"
#include "gdbsupport/pathstuff.h"
#include "gdbsupport/scoped_ignore_signal.h"
@@ -451,11 +449,15 @@ get_compile_file_tempdir (void)
tempdir_name = xstrdup (tempdir_name);
add_final_cleanup ([] ()
{
- std::error_code error;
- if (std::filesystem::remove_all (tempdir_name, error)
- == static_cast<std::uintmax_t> (-1))
- warning (_("Could not remove temporary directory %s (%s)"),
- tempdir_name, error.message ().c_str ());
+ char *zap;
+ int wstat;
+
+ gdb_assert (startswith (tempdir_name, TMP_PREFIX));
+ zap = concat ("rm -rf ", tempdir_name, (char *) NULL);
+ wstat = system (zap);
+ if (wstat == -1 || !WIFEXITED (wstat) || WEXITSTATUS (wstat) != 0)
+ warning (_("Could not remove temporary directory %s"), tempdir_name);
+ XDELETEVEC (zap);
});
return tempdir_name;
}
base-commit: 7bba0ad08576309763e3f41193eaa93025e10b8b
--
2.34.1
next reply other threads:[~2024-04-03 14:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 14:44 Lancelot SIX [this message]
2024-04-03 14:59 ` Tom Tromey
2024-04-03 15:35 ` Lancelot SIX
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=20240403144446.39094-1-lancelot.six@amd.com \
--to=lancelot.six@amd.com \
--cc=gdb-patches@sourceware.org \
--cc=tdevries@suse.de \
/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).