From patchwork Sun Jan 28 15:03:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 84840 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 39A6F385843B for ; Sun, 28 Jan 2024 15:04:44 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id 3C859385842C for ; Sun, 28 Jan 2024 15:03:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3C859385842C 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 3C859385842C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::332 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706454235; cv=none; b=gebfD1zbEsoQIMgSqP1iZnzmrQca2EL2iUyZ/yRLNUPM9c/yq+Z4dHxexNIWq0qrMe0cLYgohZnufyBl5V5vdaP4H8UWVwL5OoRqdRL4YR5Zy/ee9aa7kANryhLnfUZfnahQ8PAGbdigyjF56PETg9OwHJ4vHoxPX5xAhnTSTj8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706454235; c=relaxed/simple; bh=N+4KWuLIbaICOjK2OKqRYxcnhBmVGyJr95YO0BbbHlw=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=UCuDuar2n5ZfIn3UjyHmq+7murk7n5HTg9u3ASSVGk7rNPnRdwm+e0grEhQpBl6Z0e7BUI4gv5eVjiPB3N5/3mrfJQryq6q9YNQdbRQgOX0vBiWK+7IMpHY4TAsWJBRBg4f+Nti0C/9C9xR+HzmvcQukS9AOulbu36lMg4Begww= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40ef6442d60so1895245e9.1 for ; Sun, 28 Jan 2024 07:03:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706454233; x=1707059033; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=XBLasXUuE4RVHhDvYs1HcQVMvqkw1UvvErLWoU9PTW4=; b=OtAn/k8sRV9JB6GsT46OGVxXm+I9zTmmei7nUX0sMbd5xQ+5QVFHFQh7wKXkBeFqgQ 6dKL7yPquIFUgmscMcuOnaOnNzX3LB9sRjzPh1lGxXtoDGTQubbgJiGKmoPYEq/0lYJk jpYXjEDFAR3Il6Qn1OBGdVJa07maMndG/yWAOQ7rW3jIwH+nt7nR32jEYIw9yI02/0Pf Tw705couOcDXg6FdpHKobiR3V7SqVpnPKJ2wHmvRmE+teci55O1wRx5stjCGcuwqbCqa Ldjp8L21fuGbqhzIu5tCGcJw2oQr6hY/Ipjw/Y6WW0nOUugaKxf2IEbwG/XMhckFkvg5 kT4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706454233; x=1707059033; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=XBLasXUuE4RVHhDvYs1HcQVMvqkw1UvvErLWoU9PTW4=; b=rqzvpw9zVpss670OXI/MYSg8oyRCwF18XtEayF3Gqqdex+y1CSKytU4fV4eF/AAeFi Fuh/u21NpRtB34wqTZSNYqHryAR6kqVQCkbOf+VC1EZi5622mooxyAYRhZAhdHdasYzj 5q5d9ZRxSEJOR887qNoZN03e2wZvYX+9/NARO+9xltmg7u4M+/ggi6pUXEyPRLzJ44Qd heAhkdqWhkYbyQWozqUTMwDFB/pAnQkj/MyDZwhIklld6RBJSK5hz63f0H4xPvg4I/ML q12UAgg8BLRUptFNDM+1XlFmnKRtcxX1IoKn17cvrpHNky242A9EJT19pywTwhPKzzRS g+wA== X-Gm-Message-State: AOJu0YxHC3cNRLnATnJpcQ1vuVplB1kMj0WIddj34NbBI+lTPRzLZycW 1nKFSf/GAJ24jSq6WTNuVDzxFdHpJWPuCpABnqG8WtsFddHWLPCQ5GMi3jHM X-Google-Smtp-Source: AGHT+IGU6dTbZQh3Qg9kUJ2zmiKsVl4RaPlS2wo7b4esVr6Fdrffxc54mQqtq15o0KsSFjz+Invv+Q== X-Received: by 2002:a05:600c:4711:b0:40e:f67d:d5f9 with SMTP id v17-20020a05600c471100b0040ef67dd5f9mr604376wmo.4.1706454233002; Sun, 28 Jan 2024 07:03:53 -0800 (PST) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id w18-20020a05600c475200b0040e9f7308f4sm7533491wmo.10.2024.01.28.07.03.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 28 Jan 2024 07:03:52 -0800 (PST) From: Iain Sandoe X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Cc: ro@CeBiTec.Uni-Bielefeld.DE Subject: [PATCH] testsuite, libphobos: Update link flags [PR112864]. Date: Sun, 28 Jan 2024 15:03:51 +0000 Message-Id: <20240128150351.21265-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 X-Spam-Status: No, score=-8.5 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: iain@sandoe.co.uk Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Tested on i686, x86_64, aarch64 Darwin, x86_64, aarch64 Linux, OK for trunk? thanks, Iain --- 8< --- The regressions here are primarily from duplicated '-B' additions. We remove the duplicate on the link line. We also make sure that platforms with extensions other than .so for shared libs will have the correct paths. PR target/112864 libphobos/ChangeLog: * testsuite/lib/libphobos.exp: Use ${shlib_ext} instead of hard-wiring '.so'. * testsuite/testsuite_flags.in: Remove duplicate -B option for spec file path. --- libphobos/testsuite/lib/libphobos.exp | 2 +- libphobos/testsuite/testsuite_flags.in | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libphobos/testsuite/lib/libphobos.exp b/libphobos/testsuite/lib/libphobos.exp index 191cafa534d..d4aa433ddc1 100644 --- a/libphobos/testsuite/lib/libphobos.exp +++ b/libphobos/testsuite/lib/libphobos.exp @@ -234,7 +234,7 @@ proc libphobos_init { args } { if { "$mldir" == "." } { continue } - if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } { + if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.${shlib_ext}*]] >= 1 } { append ld_library_path ":${gccdir}/${mldir}" } } diff --git a/libphobos/testsuite/testsuite_flags.in b/libphobos/testsuite/testsuite_flags.in index 528cff4bf13..8a412d2f1fa 100755 --- a/libphobos/testsuite/testsuite_flags.in +++ b/libphobos/testsuite/testsuite_flags.in @@ -46,10 +46,8 @@ case ${query} in echo ${GDCPATHS_default} ${GDCPATHS_config} ;; --gdcldflags) - GDCLDFLAGS="-B${BUILD_DIR}/src - -B${BUILD_DIR}/libdruntime/gcc - -B${BUILD_DIR}/src/.libs - -L${BUILD_DIR}/src/.libs" + GDCLDFLAGS="-B${BUILD_DIR}/libdruntime/gcc + -B${BUILD_DIR}/src/.libs" echo ${GDCLDFLAGS} ;; *)