summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2021-02-10 16:51:34 +0000
committerJonathan Wakely <jwakely@redhat.com>2021-08-02 16:37:57 +0100
commit4178e8c049e4ef366335b661197e53b3efbed877 (patch)
treee6eb2449abb4c2a5f8f21f097a27d0f76be74ded /libstdc++-v3
parent1a96bfe35fec4c425d6f5fbb9c539386e39ff3e4 (diff)
downloadgcc-4178e8c049e4ef366335b661197e53b3efbed877.tar.gz
libstdc++: Re-enable workaround for _wstat64 bug, again [PR 88881]
I forgot that the workaround is present in both filesystem::status and filesystem::symlink_status. This restores it in the latter. libstdc++-v3/ChangeLog: PR libstdc++/88881 * src/c++17/fs_ops.cc (fs::symlink_status): Re-enable workaround. (cherry picked from commit b7210405ed8eb5fd723b2c99960dcc5f0aec89b4)
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/src/c++17/fs_ops.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc
index 7fea05fbf50..c641e2a53f7 100644
--- a/libstdc++-v3/src/c++17/fs_ops.cc
+++ b/libstdc++-v3/src/c++17/fs_ops.cc
@@ -1449,7 +1449,6 @@ fs::symlink_status(const fs::path& p, std::error_code& ec) noexcept
auto str = p.c_str();
#if _GLIBCXX_FILESYSTEM_IS_WINDOWS
-#if ! defined __MINGW64_VERSION_MAJOR || __MINGW64_VERSION_MAJOR < 6
// stat() fails if there's a trailing slash (PR 88881)
path p2;
if (p.has_relative_path() && !p.has_filename())
@@ -1467,7 +1466,6 @@ fs::symlink_status(const fs::path& p, std::error_code& ec) noexcept
str = p2.c_str();
}
#endif
-#endif
stat_type st;
if (posix::lstat(str, &st))