From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id 341EE3858D28; Sun, 21 Apr 2024 13:03:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 341EE3858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1713704616; bh=EbuKvPW+JqzLo+JGBvakWFfb3rQ6A4QleyiWOnimpuc=; h=From:To:Subject:Date:From; b=LO/LMvXfqirIph/MuXJUU6YjxzK/kdYpVf28E86kKDPovfzbRu64S3piE2PLrdeWD HtfrKtK39zimGA91YEVMnWk6bRrPkMgDp9rQWwinf+DSbU26XxF+I9N0CmGX7m7rZ/ RUmZinC7hmDXlwIQx/px5xj8CaKYeKjnZbjBVPsE= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain D Sandoe To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-10374] libstdc++: Sync the atomic_link_flags implementation with GCC. X-Act-Checkin: gcc X-Git-Author: Iain Sandoe X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 678f6bc1655d9bf4ecec06e733122823a512ee4d X-Git-Newrev: 63842c1dd7f48ed8b8284455c05ea5dfccfcd42b Message-Id: <20240421130336.341EE3858D28@sourceware.org> Date: Sun, 21 Apr 2024 13:03:36 +0000 (GMT) List-Id: https://gcc.gnu.org/g:63842c1dd7f48ed8b8284455c05ea5dfccfcd42b commit r12-10374-g63842c1dd7f48ed8b8284455c05ea5dfccfcd42b Author: Iain Sandoe Date: Mon Mar 18 09:57:33 2024 +0000 libstdc++: Sync the atomic_link_flags implementation with GCC. For Darwin, in order to allow uninstalled testing, we need to provide a '-B' option pointing to each path containing an uninstalled library that we are using (these get appended to the embedded runpaths). This updates the version of the atomic_link_flags proc in the libstdc++ testsuite to do the same as the one in the GCC testsuite. libstdc++-v3/ChangeLog: * testsuite/lib/dg-options.exp (atomic_link_flags): Emit a -B option for the path to the uninstalled libatomic. Signed-off-by: Iain Sandoe (cherry picked from commit 71a44faa8a4f76d68356c66c6054e6c242df820f) Diff: --- libstdc++-v3/testsuite/lib/dg-options.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp index 203bb0dfed5..7269b6a4efc 100644 --- a/libstdc++-v3/testsuite/lib/dg-options.exp +++ b/libstdc++-v3/testsuite/lib/dg-options.exp @@ -274,7 +274,7 @@ proc atomic_link_flags { paths } { if { [file exists "${gccpath}/libatomic/.libs/libatomic.a"] || [file exists "${gccpath}/libatomic/.libs/libatomic.${shlib_ext}"] } { append flags " -B${gccpath}/libatomic/ " - append flags " -L${gccpath}/libatomic/.libs" + append flags " -B${gccpath}/libatomic/.libs" append ld_library_path ":${gccpath}/libatomic/.libs" } } else {