From c42ed5fca27571c25cd266f7cef25e13494f440e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 28 Jun 2021 21:29:41 -0400 Subject: [PATCH] sim: cris: remove cgen-ops.h include hack This has been upstreamed into cgen itself. --- sim/cris/ChangeLog | 5 +++++ sim/cris/Makefile.in | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 8c36ffeae32..bb67da67cea 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,8 @@ +2021-06-29 Mike Frysinger + + * Makefile.in (stamp-v10fcpu): Do not insert cgen-ops.h include. + (stamp-v32fcpu): Likewise. + 2021-06-29 Mike Frysinger * arch.c (sim_machs): Mark const. diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in index dfc6d6c5ac4..5bf07693007 100644 --- a/sim/cris/Makefile.in +++ b/sim/cris/Makefile.in @@ -120,8 +120,6 @@ stamp-v10fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/cr archfile=$(CPU_DIR)/cris.cpu \ cpu=crisv10f mach=crisv10 SUFFIX=v10 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)" $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv10-switch.c $(srcdir)/semcrisv10f-switch.c - sed -ne 'p; s/^\(#include "sim-assert.h"\)$$/#include "cgen-ops.h"/p' < $(srcdir)/decodev10.c > decodev10.c.tmp - mv decodev10.c.tmp $(srcdir)/decodev10.c touch stamp-v10fcpu cpuv10.h cpuv10.c semcrisv10f-switch.c modelv10.c decodev10.c decodev10.h: $(CGEN_MAINT) stamp-v10fcpu @@ -130,7 +128,5 @@ stamp-v32fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/cr archfile=$(CPU_DIR)/cris.cpu \ cpu=crisv32f mach=crisv32 SUFFIX=v32 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)" $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv32-switch.c $(srcdir)/semcrisv32f-switch.c - sed -ne 'p; s/^\(#include "sim-assert.h"\)$$/#include "cgen-ops.h"/p' < $(srcdir)/decodev32.c > decodev32.c.tmp - mv decodev32.c.tmp $(srcdir)/decodev32.c touch stamp-v32fcpu cpuv32.h cpuv32.c semcrisv32f-switch.c modelv32.c decodev32.c decodev32.h: $(CGEN_MAINT) stamp-v32fcpu -- 2.30.2