From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id 453403858288; Mon, 29 Apr 2024 14:18:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 453403858288 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1714400322; bh=3BlRvpcPrBAuy2tssUMxpYWaz2PIl9QuA2SNB/myamY=; h=From:To:Subject:Date:From; b=rB0H0ymVzc2QXiM/sbssRjjeCPtLVyaohLA7hAmtleShOjBhi4kxmT/LTSRJgbIBx lQotNnXnZILdV2h/ecuoy5jV6JQtWy1kE1GXIPqG5JZ1ueOuCAqY92NLtQgfvORijG x4+s8fGoxG4elT/U47HdWvsSkKQq3TvyxnVOrazE= 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 r11-11401] 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-11 X-Git-Oldrev: 3b01cc3b088b4781743fcef64f4ab27c73d54009 X-Git-Newrev: 1efe5c06d85c982ffe489bbb7a6b95dc10f7bfde Message-Id: <20240429141842.453403858288@sourceware.org> Date: Mon, 29 Apr 2024 14:18:42 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1efe5c06d85c982ffe489bbb7a6b95dc10f7bfde commit r11-11401-g1efe5c06d85c982ffe489bbb7a6b95dc10f7bfde 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 872768f2620..6e27bd04be7 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 {