public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Michael Frysinger <vapier@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] sim: erc32: link sis to run program
Date: Thu,  3 Nov 2022 18:37:12 +0000 (GMT)	[thread overview]
Message-ID: <20221103183712.8D14F385841E@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fa71c76d475f40cc583fb496d262c7bfa5a040fe

commit fa71c76d475f40cc583fb496d262c7bfa5a040fe
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Fri Nov 4 00:25:32 2022 +0700

    sim: erc32: link sis to run program
    
    The erc32 sim does a lot itself, including handling of the CLI.  It
    used to provide a run-compatible interface in the pre-nrun days, but
    it was dropped when the old run interface was punted.  Since the old
    commit 465fb143c87076b6416a8d0d5dd79bb016060fe3 ("sim: make nrun the
    default run program"), the erc32 run & sis programs have been the
    same, and erc32 hasn't provide a real run-compatible interface.
    
    Simplify this by linking the two programs via ln/cp instead of running
    the linking phase twice to produce the same result.  If/when we fix up
    the erc32 port to have a proper run interface, it should be easy to
    split these back apart into real programs.
    
    Note: the interf.o reference in here is a bit of a misdirect.  Since
    that object is placed into libsim.a, it's never been linked into the
    programs since the linker ignores objects that aren't referenced, and
    only gdb uses those symbols.

Diff:
---
 sim/erc32/Makefile.in | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in
index 41830aab726..013b604be49 100644
--- a/sim/erc32/Makefile.in
+++ b/sim/erc32/Makefile.in
@@ -34,13 +34,10 @@ SIM_EXTRA_CFLAGS += -DFAST_UART -I$(srcroot)
 
 ## COMMON_POST_CONFIG_FRAG
 
-# `sis' doesn't need interf.o.
-SIS_OFILES = exec.o erc32.o func.o help.o float.o
-
 all: sis$(EXEEXT)
-sis$(EXEEXT): sis.o $(SIS_OFILES) libsim.a $(LIBDEPS)
-	$(ECHO_CCLD) $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \
-	  sis.o $(SIS_OFILES) libsim.a $(EXTRA_LIBS)
+sis$(EXEEXT): run$(EXEEXT)
+	$(SILENCE) rm -f $@
+	$(ECHO_GEN) ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@
 
 # Copy the files into directories where they will be run.
 install-sis: installdirs

                 reply	other threads:[~2022-11-03 18:37 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221103183712.8D14F385841E@sourceware.org \
    --to=vapier@sourceware.org \
    --cc=gdb-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).