From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 1B8213858C00; Thu, 19 Jan 2023 00:36:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B8213858C00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674088599; bh=uTOj2mYK4vt52unYq2SKNuLpUk0W4d3HvHxeVPbf1rE=; h=From:To:Subject:Date:From; b=A0ypnqrKzL4G3SK4RJaTy7UX4acUAPS3k/o3H5Z/fGiXcl3drOylMpTcWh01qbqQE DOycoyjM8WmIUwPGJjCRvYXGx9unzhWRiil/Qouyy2QRbR1MKLkiO7icTrXUAoGvoW HCt0beKR3+MW+4Gr9I72sbSzeusmJfasParucXHk= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: unify sim-signal.o building X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: c743e42e2213abe73a63c847409fbf0ca3c8cd46 X-Git-Newrev: 7fd14d6f580eeed46ef4d6f04f6b5f2f1318c0f9 Message-Id: <20230119003639.1B8213858C00@sourceware.org> Date: Thu, 19 Jan 2023 00:36:39 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D7fd14d6f580e= eed46ef4d6f04f6b5f2f1318c0f9 commit 7fd14d6f580eeed46ef4d6f04f6b5f2f1318c0f9 Author: Mike Frysinger Date: Wed Jan 18 19:26:58 2023 -0500 sim: unify sim-signal.o building =20 Now that sim-main.h has been reduced significantly, we can remove it from sim-signal.c and unify it across all boards since it compiles to the same code. Diff: --- sim/Makefile.in | 17 +++++++++++------ sim/common/local.mk | 2 +- sim/common/sim-signal.c | 3 ++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index a2e7f98a78b..e46f3e8de05 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -380,8 +380,8 @@ aarch64_libsim_a_AR =3D $(AR) $(ARFLAGS) @SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/simulator.o am__dirstamp =3D $(am__leading_dot)dirstamp am__objects_1 =3D common/callback.$(OBJEXT) common/portability.$(OBJEXT) \ - common/sim-load.$(OBJEXT) common/syscall.$(OBJEXT) \ - common/target-newlib-errno.$(OBJEXT) \ + common/sim-load.$(OBJEXT) common/sim-signal.$(OBJEXT) \ + common/syscall.$(OBJEXT) common/target-newlib-errno.$(OBJEXT) \ common/target-newlib-open.$(OBJEXT) \ common/target-newlib-signal.$(OBJEXT) \ common/target-newlib-syscall.$(OBJEXT) \ @@ -458,7 +458,8 @@ common_libcommon_a_AR =3D $(AR) $(ARFLAGS) common_libcommon_a_LIBADD =3D am_common_libcommon_a_OBJECTS =3D common/callback.$(OBJEXT) \ common/portability.$(OBJEXT) common/sim-load.$(OBJEXT) \ - common/syscall.$(OBJEXT) common/target-newlib-errno.$(OBJEXT) \ + common/sim-signal.$(OBJEXT) common/syscall.$(OBJEXT) \ + common/target-newlib-errno.$(OBJEXT) \ common/target-newlib-open.$(OBJEXT) \ common/target-newlib-signal.$(OBJEXT) \ common/target-newlib-syscall.$(OBJEXT) \ @@ -1837,6 +1838,7 @@ common_libcommon_a_SOURCES =3D \ common/callback.c \ common/portability.c \ common/sim-load.c \ + common/sim-signal.c \ common/syscall.c \ common/target-newlib-errno.c \ common/target-newlib-open.c \ @@ -1860,9 +1862,9 @@ SIM_NEW_COMMON_OBJS =3D sim-arange.o sim-bits.o sim-c= lose.o \ sim-command.o sim-config.o sim-core.o sim-cpu.o sim-endian.o \ sim-engine.o sim-events.o sim-fpu.o sim-hload.o sim-hrw.o \ sim-io.o sim-info.o sim-memopt.o sim-model.o sim-module.o \ - sim-options.o sim-profile.o sim-reason.o sim-reg.o \ - sim-signal.o sim-stop.o sim-syscall.o sim-trace.o sim-utils.o \ - sim-watch.o $(am__append_2) + sim-options.o sim-profile.o sim-reason.o sim-reg.o sim-stop.o \ + sim-syscall.o sim-trace.o sim-utils.o sim-watch.o \ + $(am__append_2) SIM_HW_DEVICES =3D cfi core pal glue am_arch_d =3D $(subst -,_,$(@D)) GEN_MODULES_C_SRCS =3D \ @@ -3194,6 +3196,8 @@ common/portability.$(OBJEXT): common/$(am__dirstamp) \ common/$(DEPDIR)/$(am__dirstamp) common/sim-load.$(OBJEXT): common/$(am__dirstamp) \ common/$(DEPDIR)/$(am__dirstamp) +common/sim-signal.$(OBJEXT): common/$(am__dirstamp) \ + common/$(DEPDIR)/$(am__dirstamp) common/syscall.$(OBJEXT): common/$(am__dirstamp) \ common/$(DEPDIR)/$(am__dirstamp) common/target-newlib-errno.$(OBJEXT): common/$(am__dirstamp) \ @@ -3936,6 +3940,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/callback.Po@am__quot= e@ @AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/portability.Po@am__q= uote@ @AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/sim-load.Po@am__quot= e@ +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/sim-signal.Po@am__qu= ote@ @AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/syscall.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/target-newlib-errno.= Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/target-newlib-open.P= o@am__quote@ diff --git a/sim/common/local.mk b/sim/common/local.mk index 89843ead03b..5d0992fbd9e 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -31,6 +31,7 @@ noinst_LIBRARIES +=3D %D%/libcommon.a %D%/callback.c \ %D%/portability.c \ %D%/sim-load.c \ + %D%/sim-signal.c \ %D%/syscall.c \ %D%/target-newlib-errno.c \ %D%/target-newlib-open.c \ @@ -95,7 +96,6 @@ SIM_NEW_COMMON_OBJS =3D \ sim-profile.o \ sim-reason.o \ sim-reg.o \ - sim-signal.o \ sim-stop.o \ sim-syscall.o \ sim-trace.o \ diff --git a/sim/common/sim-signal.c b/sim/common/sim-signal.c index 9c4e261fa21..36ebbdfe969 100644 --- a/sim/common/sim-signal.c +++ b/sim/common/sim-signal.c @@ -22,7 +22,8 @@ along with this program. If not, see . */ =20 #include =20 -#include "sim-main.h" +#include "sim/sim.h" +#include "sim-io.h" #include "sim-signal.h" =20 /* Convert SIM_SIGFOO to SIGFOO.