From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 632473850418; Mon, 29 Mar 2021 20:02:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 632473850418 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 r10-9582] libstdc++: Re-enable workaround for _wstat64 bug [PR 88881] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: d11150e7a499e011fe583336f88a857af0a8a32d X-Git-Newrev: 8455158044503a25ebb044428be2ddc83d2b0473 Message-Id: <20210329200224.632473850418@sourceware.org> Date: Mon, 29 Mar 2021 20:02:24 +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, 29 Mar 2021 20:02:24 -0000 https://gcc.gnu.org/g:8455158044503a25ebb044428be2ddc83d2b0473 commit r10-9582-g8455158044503a25ebb044428be2ddc83d2b0473 Author: Jonathan Wakely Date: Wed Feb 10 16:51:34 2021 +0000 libstdc++: Re-enable workaround for _wstat64 bug [PR 88881] This wasn't fixed upstream for mingw-w64 so we still need the workaround. libstdc++-v3/ChangeLog: PR libstdc++/88881 * src/c++17/fs_ops.cc (fs::status): Re-enable workaround. (cherry picked from commit 3df5b249b3c81e95cdcb293a388155ae5b168f9e) 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 b4c81763020..639939a5ea1 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -1462,7 +1462,6 @@ fs::status(const fs::path& p, 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()) @@ -1479,7 +1478,6 @@ fs::status(const fs::path& p, error_code& ec) noexcept } str = p2.c_str(); } -#endif #endif stat_type st;