From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id 0C8303858401; Wed, 3 Apr 2024 14:56:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0C8303858401 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1712156213; bh=t/vduVdWaurjSfQgG2wrlWrx1Y8Ouqyb29KvqzLH6Ac=; h=From:To:Subject:Date:From; b=fZWA4aTtsSFacLcg8JmXHZS+ym/Iu23HkpzA1igTCScjH5lLV6DU2whocWjSqL0KD nYrU5RcamwZmmyqt92DSSBQd1ZYv2MArCQsEp9RdQmstjRyTPA2CT3u+RBae6ZLUIv hTazA9EsrXprCZFJGejMXYHR349HgN5xPy/FKNbs= 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 r13-8576] 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-13 X-Git-Oldrev: 6bcc8fd92c69a66d4a8531665225a75d81a9d146 X-Git-Newrev: 5975807ae77896e6e67656f38304149a643816b9 Message-Id: <20240403145653.0C8303858401@sourceware.org> Date: Wed, 3 Apr 2024 14:56:53 +0000 (GMT) List-Id: https://gcc.gnu.org/g:5975807ae77896e6e67656f38304149a643816b9 commit r13-8576-g5975807ae77896e6e67656f38304149a643816b9 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 f7d5b05d6ed..427a251e789 100644 --- a/libstdc++-v3/testsuite/lib/dg-options.exp +++ b/libstdc++-v3/testsuite/lib/dg-options.exp @@ -314,7 +314,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 {