From patchwork Sat Jan 7 10:53:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 40362 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1246964wrt; Sat, 7 Jan 2023 02:54:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXsuHxr6xpHnj9b5r2OrRxu7SGG3oWkoeOBKipaF0yUuDHRiaY2/fBuNV9CNCl8WWL7RyEjY X-Received: by 2002:a17:906:6a05:b0:7c1:28a7:f7a0 with SMTP id qw5-20020a1709066a0500b007c128a7f7a0mr72893127ejc.31.1673088877354; Sat, 07 Jan 2023 02:54:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673088877; cv=none; d=google.com; s=arc-20160816; b=h07PBNQvt3yYdTuoDUcv/Vs/tLfHIJNpCbtLTJeOJ2dX92lhBADylZZgJlmA5P4gQy HswFASdA4FsUlKaFxA9pdDq7S1ofse9q7skL1JcssC0EpzQaFIfkk2wk44DIg/E4Uz2G VdjCdah1uaenm0Tfc9rLxGlDhL/5TbZmUUbGsWSzKUVwhNrdTXL6rmv/+VIAuMg7jPsV XcNhdkEHDODlNDXvVDPloQUWJBwy2VGrZrYIS0EybxQjFJkM+E7w5QBkvCGyxAR9GD8d y469NTIV92T6/mgwxGt2P57kLOPTs3Q0lRSETe+J0FJ6V8k9oWtKxWdwmxnqrSxbidq1 TYQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=J8BTyZ8zrruwgA19Vx7fK1hs6Tybxn5NCwcgPpEqBCs=; b=xKIvTwF/yuLcDS3VC/yjMhzwSiLh89bCJaqGhxm1n8MJ4k3eXHgo+I90MUC0KX71mD ChahSmGImpJ6cqdQ3786Lh+8j5Z1xncLdx8TTHeQi3LjzobVLWhS/j/DCw4TA+Bl2pjW m8lHzGTkZGj5GwgqDb5u9co22KzFuWGn/2AaqxkFj9Yd9t1JZGDo8qTS/klTPRRbWZx0 KPC/l/oZtwPqb1RBVSoTvqWmvu8rJ66S+wlJQy8RHNpBG0yXFEr7t448AfR4C/rGIQCH ea9l0MbePNrtdfls46GW7zcKTOfcCmHejOV7Y8XkR3nQudqIDcMMX5Q6gUIb6dxbhAt8 ZDPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=dDpf5vD1; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id xg3-20020a170907320300b007c158707538si3723976ejb.981.2023.01.07.02.54.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 02:54:37 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=dDpf5vD1; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5F11C3858404 for ; Sat, 7 Jan 2023 10:54:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5F11C3858404 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673088876; bh=J8BTyZ8zrruwgA19Vx7fK1hs6Tybxn5NCwcgPpEqBCs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=dDpf5vD1BfIi0lPpqzGr5+Xg/bz5CFmhOFDpKHW4EZbXQqBSpQawnbvOw+bNn/JP0 B3Ccp304A7c9ZNapiBPYUAHdZt4Kzp1WD965hWVDPxkKBFTs13MrUPaJ+7bvQDUnVh /3l2Y3ffP06+jArim835wNCYUaKR4Y12xBT33AyE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id 7E4CE3858D33 for ; Sat, 7 Jan 2023 10:53:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7E4CE3858D33 Received: by mail-wr1-x430.google.com with SMTP id w1so3420547wrt.8 for ; Sat, 07 Jan 2023 02:53:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=J8BTyZ8zrruwgA19Vx7fK1hs6Tybxn5NCwcgPpEqBCs=; b=GSS67h2WAaFfhr6VuBQiVOT2vqsCFZ8SdB189O8YmmDEgApusTvqLOdBPDNLu2f1tZ Ks0cMbdMbfLPDaxVM5GoY7E8iYhR1gaw6J9E33cT8HhaqdSizQQ7jFG4bBb2hx43JgW6 iZ2qco6pDTpHJdEUa7pISUUCybtU2/V8tR9sys16cheprAnyHjsl5u8luZ5MLbhXYhDu z3/FAKCPGGi5WISRu0rV2QwscCsuIAyUgIHeLrKtIKZPfuKxjNevyRNe8WRmPDF/Xkps 5QqRg15SFp846pPIxzwNoAjoU6mnZD5fGKx4TsIeIt/3Kzcu34Qnd4kTULPxOJyTQbth 95/w== X-Gm-Message-State: AFqh2koZAxH85Ngh3m9Cb+nl1oZQlEIMpNdNAGEOMzVSR9AFd3zhTqL/ oYDzYZ4OvP+P6CFvmp94pq99FBGuFQ4= X-Received: by 2002:a5d:44c9:0:b0:2bb:dc8e:3d5f with SMTP id z9-20020a5d44c9000000b002bbdc8e3d5fmr118771wrr.67.1673088831080; Sat, 07 Jan 2023 02:53:51 -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 m7-20020adffe47000000b002b880b6ef19sm3484055wrs.66.2023.01.07.02.53.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Jan 2023 02:53:50 -0800 (PST) X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Subject: [PATCH] modula-2, driver: Do not add extra '-L' options that shadow $libdir. Date: Sat, 7 Jan 2023 10:53:49 +0000 Message-Id: <20230107105349.92210-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) MIME-Version: 1.0 X-Spam-Status: No, score=-8.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 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Sandoe via Gcc-patches From: Iain Sandoe Reply-To: iain@sandoe.co.uk Cc: Iain Sandoe , gaiusmod2@gmail.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754360842539383599?= X-GMAIL-MSGID: =?utf-8?q?1754360842539383599?= tested on x86_64-linux-gnu, i686, powerpc, x86_64 darwin, note that this patch does expose PR108261 (but that is a separate issue). OK for trunk? thanks Iain --- 8< --- The driver is adding one '-L' option for each path to libm2xxx.a which is shadowing $libpath where the shared libraries are installed. This prevents the shared libraries from being found (there are also convenience libs in $libdir, so the additional -L options are not needed). gcc/m2/ChangeLog: * gm2spec.cc (add_default_combination): Do not add extra library paths for the libm2xxx.a libraries. --- gcc/m2/gm2spec.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/gcc/m2/gm2spec.cc b/gcc/m2/gm2spec.cc index dbfd1cacccc..f6d216269c1 100644 --- a/gcc/m2/gm2spec.cc +++ b/gcc/m2/gm2spec.cc @@ -289,7 +289,6 @@ add_default_combination (const char *libpath, const char *library) { if (library != NULL) { - append_option (OPT_L, build_archive_path (libpath, library), 1); append_option (OPT_l, safe_strdup (library), 1); return true; }