From patchwork Tue Mar 14 22:01:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Samuelsson X-Patchwork-Id: 69844 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2004380wrd; Tue, 14 Mar 2023 15:02:02 -0700 (PDT) X-Google-Smtp-Source: AK7set/X6reOYF7Va066vK+1n3Ao3iLY9WkbF8KSo4hNpbGS7HBN2DBa9ARIASSEodVEoqpKS7Sg X-Received: by 2002:a17:907:994c:b0:8b1:7b10:61d5 with SMTP id kl12-20020a170907994c00b008b17b1061d5mr4117351ejc.33.1678831322366; Tue, 14 Mar 2023 15:02:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678831322; cv=none; d=google.com; s=arc-20160816; b=mbthbDWZbb1jjxS1mPd4hU4+lzmNQDOICMOI2ONumV4LdYX90+3W0K9FkRoAZxqPgN HX8Fcw1wHgJMfFdS+Jur2ccwQC8V7fH7+FWtlHY+hE0rK0a5fe01jlim6TlqwRbHY1Xc 7D8engkUucw/XCGJkfJhaKA2XGFtylDq81tqIyp3Tqoys/ZkWC0ZQI3QfRZWstTwAg78 GEk2zlLKnNOZ7KMpokSY6tT+czWJfX/KJPwqV0ApTm56JmDf/Oaj1cLDuoVdYr1Lba+i ZW93DJQhxRo9nXxAoaRXtaJOoheiZdCC8dXKaZF6Q81tTQew+ue1Fh0uc/a1jQ6g9TkY tkDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=lIi3d+HugyEZvBN83959Bu+z65Hcr6WPd6cQ284I8q8=; b=b99nWwgalJ7SaOjoZqn+Ug9Lrg7UjssxqwxDdNl10N9JyB7Bws/5fN1e4DLNPDT3mB E61kShqVCxuKPti88rWDhCASuu4RWgyyWQ07kcaY6mP5zQn92bSxmF536mod3K7Fkigy Ql/E+vrYcQ77DffU5TuAhVMYxjyBQrFpSYVqdid4qwTMI3foN6JFKBm+aBaISQ3BvaKS vPB1V80jsfOQANkIct2qCa6UqyrJ1RqXMWlQjkJ0GwFvsKlxxsbbCk+ypTEFcqt8QDjr xq0ghE7aSwD8eQG1uBbRbL2DJK5VGz6p7Uv2/a45sd9lSX6kESWzItnKOvdTcrEfpcoS +O6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=QuxoFIUH; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id w10-20020a1709062f8a00b009249e43714fsi4208910eji.277.2023.03.14.15.02.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 15:02:02 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=QuxoFIUH; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8DFC63858C2D for ; Tue, 14 Mar 2023 22:01:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8DFC63858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678831312; bh=lIi3d+HugyEZvBN83959Bu+z65Hcr6WPd6cQ284I8q8=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=QuxoFIUHP0XuBj7obCmoVUvgk6yajaXJpV1pVBrDH8LfzHv6SPIZsv5rXku5IjoIY NrYS1sCsjJIjnauyLysv3x986NfSTYjTwxvDKNqen3kcSutwS0LC+buI68WZf8azY8 QAUZGTEU7L1A07vYtmdvbhLHCaj3I1EKWtXsxgHk= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from emagii.se (www.emagii.com [185.133.207.17]) by sourceware.org (Postfix) with ESMTPS id EC02C3858298 for ; Tue, 14 Mar 2023 22:01:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EC02C3858298 Received: from valinor.ownit.se (84-55-68-216.customers.ownit.se [84.55.68.216]) by emagii.se (Postfix) with ESMTPSA id 86EAA12026A; Tue, 14 Mar 2023 23:01:38 +0100 (CET) Received-SPF: pass (emagii.beebytevps.io: connection is authenticated) To: binutils@sourceware.org Cc: nickc@redhat.com, Ulf Samuelsson Subject: [PATCH v1 3/3] CHIP: language additions Date: Tue, 14 Mar 2023 23:01:14 +0100 Message-Id: <20230314220114.1117782-4-binutils@emagii.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230314220114.1117782-1-binutils@emagii.com> References: <20230314220114.1117782-1-binutils@emagii.com> MIME-Version: 1.0 X-PPP-Message-ID: <167883130274.896851.3597193436445578356@localhost.localdomain> X-PPP-Vhost: emagii.com X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_FAIL, 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ulf Samuelsson via Binutils From: Ulf Samuelsson Reply-To: binutils@emagii.com Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760382232845782149?= X-GMAIL-MSGID: =?utf-8?q?1760382232845782149?= From: Ulf Samuelsson Signed-off-by: Ulf Samuelsson --- ld/ldfile.c | 29 ++++++++++++++++++++++++++++- ld/ldfile.h | 2 ++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ld/ldfile.c b/ld/ldfile.c index b8fd4e5d8e0..9e9099dafae 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -710,7 +710,6 @@ ldfile_open_command_file_1 (const char *name, enum script_open_style open_how) einfo (_("%F%P: cannot open linker script file %s: %E\n"), name); return; } - track_dependency_files (name); lex_push_file (ldlex_input_stack, name, sysrooted); @@ -729,6 +728,34 @@ ldfile_open_command_file (const char *name) ldfile_open_command_file_1 (name, script_nonT); } +void +ldfile_open_chip_file (const char *name) +{ + char *fullname; + char *proj = getenv("PROJ_DIR"); + if (proj != NULL) + { + ldfile_add_library_path(proj, false); + } + char *user = getenv("LD_USER_DIR"); + if (user != NULL) + { + fullname = concat(user, slash, name , (const char *) NULL); + ldfile_add_library_path(fullname, false); + free(fullname); + } + char *vendor = getenv("LD_VENDOR_DIR"); + if (vendor != NULL) + { + fullname = concat(vendor, slash, name , (const char *) NULL); + ldfile_add_library_path(fullname, false); + free(fullname); + } + fullname = concat(name, ".inc", (const char *) NULL); + ldfile_open_command_file_1 (fullname, script_nonT); + free(fullname); +} + void ldfile_open_script_file (const char *name) { diff --git a/ld/ldfile.h b/ld/ldfile.h index defb550f76b..3b43e549928 100644 --- a/ld/ldfile.h +++ b/ld/ldfile.h @@ -46,6 +46,8 @@ extern void ldfile_add_library_path (const char *, bool cmdline); extern void ldfile_open_command_file (const char *name); +extern void ldfile_open_chip_file + (const char *name); extern void ldfile_open_script_file (const char *name); extern void ldfile_open_default_command_file