From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id C7476388A413; Mon, 2 Aug 2021 15:58:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C7476388A413 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r9-9657] libstdc++: Re-enable workaround for _wstat64 bug, again [PR 88881] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: 1a96bfe35fec4c425d6f5fbb9c539386e39ff3e4 X-Git-Newrev: 4178e8c049e4ef366335b661197e53b3efbed877 Message-Id: <20210802155842.C7476388A413@sourceware.org> Date: Mon, 2 Aug 2021 15:58:42 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2021 15:58:42 -0000 https://gcc.gnu.org/g:4178e8c049e4ef366335b661197e53b3efbed877 commit r9-9657-g4178e8c049e4ef366335b661197e53b3efbed877 Author: Jonathan Wakely Date: Wed Feb 10 16:51:34 2021 +0000 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) Diff: --- libstdc++-v3/src/c++17/fs_ops.cc | 2 -- 1 file changed, 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()) @@ -1466,7 +1465,6 @@ fs::symlink_status(const fs::path& p, std::error_code& ec) noexcept } str = p2.c_str(); } -#endif #endif stat_type st;