From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=emagii.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=emagii.com 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emagii.com; s=default; t=1678831303; bh=lIi3d+HugyEZvBN83959Bu+z65Hcr6WPd6cQ284I8q8=; h=From:To:Subject; b=EtHgpw6AH7CqhYk4bkWaJ11j7XTwdrdvsz7KKt/rwttFuQzeXJuVBSKkcexu2mGtW rIX3lzzBPmexaKw/xrlMaHasovhkHfN5PzSdDUCKFmiS7omJkxMW9dUW6s7+iJG8V0 lkmssqStyhmEqBLEwFdFmFj75x+haHhwaPFurCKU= Authentication-Results: emagii.beebytevps.io; spf=pass (sender IP is 84.55.68.216) smtp.mailfrom=binutils@emagii.com smtp.helo=valinor.ownit.se Received-SPF: pass (emagii.beebytevps.io: connection is authenticated) From: binutils@emagii.com 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 Content-Transfer-Encoding: 8bit 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 List-Id: 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 -- 2.34.1