From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2152) id D13923857C73; Thu, 29 Jul 2021 23:27:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D13923857C73 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Hans-Peter Nilsson To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-2604] fix breakage from "libstdc++: Remove unnecessary uses of " X-Act-Checkin: gcc X-Git-Author: Hans-Peter Nilsson X-Git-Refname: refs/heads/master X-Git-Oldrev: ef22e9c725cc94b68c27b09503bfc4b4064d8dbf X-Git-Newrev: 4186cb9cc017a0d4b3f45ef6b2f959ef10f17fc5 Message-Id: <20210729232758.D13923857C73@sourceware.org> Date: Thu, 29 Jul 2021 23:27:58 +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: Thu, 29 Jul 2021 23:27:58 -0000 https://gcc.gnu.org/g:4186cb9cc017a0d4b3f45ef6b2f959ef10f17fc5 commit r12-2604-g4186cb9cc017a0d4b3f45ef6b2f959ef10f17fc5 Author: Hans-Peter Nilsson Date: Thu Jul 29 18:02:47 2021 +0200 fix breakage from "libstdc++: Remove unnecessary uses of " Commit r12-2534 was incomplete and (by inspection derived from an MMIX build) failing for targets without an insn for compare_and_swap for pointer-size objects, IOW for targets for which "ATOMIC_POINTER_LOCK_FREE != 2" is true: x/gcc/libstdc++-v3/src/c++17/memory_resource.cc: In member function 'std::pmr::memory_resource* std::pmr::{anonymous}::atomic_mem_res::exchange(std::pmr::memory_resource*)': x/gcc/libstdc++-v3/src/c++17/memory_resource.cc:140:21: error: 'exchange' is not a member of 'std' 140 | return std::exchange(val, r); | ^~~~~~~~ make[5]: *** [Makefile:577: memory_resource.lo] Error 1 make[5]: Leaving directory '/home/hp/tmp/newmmix-r12-2579-p3/gccobj/mmix/libstdc++-v3/src/c++17' This fix was derived from edits elsewhere in that patch. Tested mmix-knuth-mmixware, restoring build (together with target-reviving patches as MMIX is currently and at that commit broken for target-specific reasons). libstdc++-v3/: * src/c++17/memory_resource.cc: Use __exchange instead of std::exchange. Diff: --- libstdc++-v3/src/c++17/memory_resource.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/src/c++17/memory_resource.cc b/libstdc++-v3/src/c++17/memory_resource.cc index 5dfc29fc0ec..1ba79903f87 100644 --- a/libstdc++-v3/src/c++17/memory_resource.cc +++ b/libstdc++-v3/src/c++17/memory_resource.cc @@ -29,7 +29,7 @@ #include #if ATOMIC_POINTER_LOCK_FREE != 2 # include // std::mutex, std::lock_guard -# include // std::exchange +# include // std::__exchange #endif namespace std _GLIBCXX_VISIBILITY(default) @@ -117,7 +117,7 @@ namespace pmr memory_resource* exchange(memory_resource* r) { lock_guard lock(mx); - return std::exchange(val, r); + return std::__exchange(val, r); } }; #else @@ -137,7 +137,7 @@ namespace pmr memory_resource* exchange(memory_resource* r) { - return std::exchange(val, r); + return std::__exchange(val, r); } }; #endif // ATOMIC_POINTER_LOCK_FREE == 2