From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oo1-xc2e.google.com (mail-oo1-xc2e.google.com [IPv6:2607:f8b0:4864:20::c2e]) by sourceware.org (Postfix) with ESMTPS id E15F43858D1E; Tue, 19 Mar 2024 12:57:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E15F43858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E15F43858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::c2e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710853034; cv=none; b=Fo/9NRM0G3MNSqnBC6bCRNv7E2bLsYZHgec+9tKmNJ27RfXYHfq9ZI97jUKb99rw9D5Xs02v96SjxCLr3yjFp94cLxVv0+QkN9wB8H3+fv51LNhdjVMTKVKGhFzTpwQf0nFiCxZLVVxTWL339m0bUar9uSRM4Gc8FehltQC1P1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710853034; c=relaxed/simple; bh=9ucGmVS03Kmdg40J5MaEYvOu3t86IGWKb8nSaaqbNcg=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=q5AHeZPh6m65fnT7L75Nt9cXN4KBxQAXUyXK8gIo+Hv/QQZwn2o+r5Lg/Q+IWAOnMN0VEgQYIm6tVwMZ0+vrnFhsLMxxfHatNPyHUUl/Q1CALpIJbueBOcczHQ7DcrG3SYcVoyGfVYiVftV2iCyrQ/U28QShpnmXa0N4wSRA0ng= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oo1-xc2e.google.com with SMTP id 006d021491bc7-5a477c48fdeso2676720eaf.2; Tue, 19 Mar 2024 05:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710853031; x=1711457831; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=naIhE1+gD4PBFAD2Oknvcql9gp4KKC77/e5ywvPwRHM=; b=OkvxU4A+VXJMB7V4wCQvxGd0MAXAzu1z5gOfUId+WRqeTadRRk4EcPl75L/0w2lQxm 9j+6Rlp+xksHBjwsZwydt6gCBEPJtzqxtrvqad0gzSNdye0iuowShDfvOxqH9TimyvXV hRgSVGP627bhE/v3Y4JgacNZ5tMSIRJDE5UUOafTbHGoDLi/SSOFn9NshiiLRJ0LjKaW lPJaxqlRIVTLXufcgOHlB67U/34LDKWAl3CEz415uXj+Z948IH5IKyhXcRuN1/cvvffT ad0krsNF+aeB6oPjZ6d8suaPqYghQz+Am+nCWSgN+FA0GyeI05XbrP2AmKIsiZ8+m8c2 /Evg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710853031; x=1711457831; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=naIhE1+gD4PBFAD2Oknvcql9gp4KKC77/e5ywvPwRHM=; b=GMbv+aUD5qGeQtEqSSxzP2t7xcaRGZPzCrLEsrHhplFwMevp/pxM7mX5peX0kDr+wq imXavJO36VlD5G31ztCAM5mNu9YdUsaIwGOPmllH5vOLtsF8E4GzAgTqXJ3dldxMTIxk /g3j00uQdzfmL/0cA5VGmEEpdnI+uLHIx/imx/IU6U6czaG11WQNIXIX8tjMEZAoV+jn bgOYjrsfpQHrPqDYlFpTjiRyOtsuFTuNaTOvJJMkr1kWNrUVQXdXCTVQxRR/HbV4AqZD vNHvyf/ZYkJASJHOeEakv/T7D4+erVBxysLnpd1Cpo7+tmlAhcADWoQ3qhgwiIz2aB+q WDTw== X-Forwarded-Encrypted: i=1; AJvYcCWVTE4tyCZTn0YJyZ7Vq5IEzW+g+LP7hITt8UCFE3kfGCrZt94Pyv0KBVa2YDMdx8nrHo/mLiP78QwEcKjrKf8Vh1rpVqwjOw== X-Gm-Message-State: AOJu0YzzHy5hqSR0zY3q8Ob/bPjVGsmkP92VW8EjGDPmu1uTEGHJp41P milNg+gtRz2BU095XJt5A3WTSTO9V6r9UTVRv2v04jInt3c1glIrkpHKLjsf X-Google-Smtp-Source: AGHT+IEjKbktlUUH96QgHgbP4Vmo7DKBlNA5RPzAn4z0dqpSdvSPq8I+C1z7IHjdT9mNRY/+NQpmaQ== X-Received: by 2002:a05:6358:6f9b:b0:17b:85ff:8fe6 with SMTP id s27-20020a0563586f9b00b0017b85ff8fe6mr17284120rwn.25.1710853030914; Tue, 19 Mar 2024 05:57:10 -0700 (PDT) Received: from localhost.localdomain ([103.55.98.161]) by smtp.gmail.com with ESMTPSA id g26-20020aa7875a000000b006e6750de82asm9741576pfo.1.2024.03.19.05.57.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 Mar 2024 05:57:10 -0700 (PDT) From: Iain Sandoe X-Google-Original-From: Iain Sandoe To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [pushed] libstdc++: Sync the atomic_link_flags implementation with GCC. Date: Tue, 19 Mar 2024 12:56:57 +0000 Message-Id: <20240319125657.22854-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.39.2 (Apple Git-143) Reply-To: iain@sandoe.co.uk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This was pre-approved on irc by Jonathan, tested on x86_64-linux,Darwin, pushed to trunk, thanks, Iain --- 8< --- 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 --- 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 bc387d17ed7..00ca678a53a 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 { -- 2.39.2 (Apple Git-143)