Skip to content

Commit 23ebf37

Browse files
T-J-TeruT-J-Teru
committed
sim/cris: Fix references to cgen cpu directory
Don't assume that cgen is located within the binutils-gdb tree. We already have CGEN_CPU_DIR and CPU_DIR defined, these are the cpu/ directory within cgen, and the cpu/ directory within binutils-cpu. The cris target tries to find CPU_DIR relative to the cgen source tree, which can be wrong when building with an out of tree cgen. sim/cris/ChangeLog: * Makefile.in: Replace uses of CGEN_CPU_DIR with CPU_DIR, and remove the definition of CGEN_CPU_DIR.
1 parent 7fb45a6 commit 23ebf37

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

‎sim/cris/ChangeLog‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2018-12-06 Andrew Burgess <andrew.burgess@embecosm.com>
2+
3+
* Makefile.in: Replace uses of CGEN_CPU_DIR with CPU_DIR, and
4+
remove the definition of CGEN_CPU_DIR.
5+
16
2017-09-06 John Baldwin <jhb@FreeBSD.org>
27

38
* configure: Regenerate.

‎sim/cris/Makefile.in‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ NL_TARGET = -DNL_TARGET_cris
4545

4646
## COMMON_POST_CONFIG_FRAG
4747

48-
CGEN_CPU_DIR = $(CGENDIR)/../cpu
49-
5048
arch = cris
5149

5250
sim-if.o: sim-if.c $(SIM_MAIN_DEPS) $(sim-core_h) $(sim-options_h)
@@ -140,37 +138,37 @@ CGEN_MAINT = ; @true
140138
# Useful when making CGEN-generated files manually, without --enable-cgen-maint.
141139
stamps: stamp-v10fmloop stamp-v32fmloop stamp-arch stamp-v10fcpu stamp-v32fcpu stamp-desc
142140

143-
stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile
141+
stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CPU_DIR)/cris.cpu Makefile
144142
$(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=crisv10,crisv32 \
145-
archfile=$(CGEN_CPU_DIR)/cris.cpu \
143+
archfile=$(CPU_DIR)/cris.cpu \
146144
FLAGS="with-scache with-profile=fn"
147145
touch stamp-arch
148146
arch.h arch.c cpuall.h: $(CGEN_MAINT) stamp-arch
149147

150148
# The sed-hack is supposed to be temporary, until we get CGEN to emit it.
151-
stamp-v10fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile
149+
stamp-v10fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/cris.cpu Makefile
152150
$(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
153-
archfile=$(CGEN_CPU_DIR)/cris.cpu \
151+
archfile=$(CPU_DIR)/cris.cpu \
154152
cpu=crisv10f mach=crisv10 SUFFIX=v10 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)"
155153
$(SHELL) $(srcroot)/move-if-change $(srcdir)/semv10-switch.c $(srcdir)/semcrisv10f-switch.c
156154
sed -ne 'p; s/^\(#include "sim-assert.h"\)$$/#include "cgen-ops.h"/p' < $(srcdir)/decodev10.c > decodev10.c.tmp
157155
mv decodev10.c.tmp $(srcdir)/decodev10.c
158156
touch stamp-v10fcpu
159157
cpuv10.h cpuv10.c semcrisv10f-switch.c modelv10.c decodev10.c decodev10.h: $(CGEN_MAINT) stamp-v10fcpu
160158

161-
stamp-v32fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile
159+
stamp-v32fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/cris.cpu Makefile
162160
$(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
163-
archfile=$(CGEN_CPU_DIR)/cris.cpu \
161+
archfile=$(CPU_DIR)/cris.cpu \
164162
cpu=crisv32f mach=crisv32 SUFFIX=v32 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)"
165163
$(SHELL) $(srcroot)/move-if-change $(srcdir)/semv32-switch.c $(srcdir)/semcrisv32f-switch.c
166164
sed -ne 'p; s/^\(#include "sim-assert.h"\)$$/#include "cgen-ops.h"/p' < $(srcdir)/decodev32.c > decodev32.c.tmp
167165
mv decodev32.c.tmp $(srcdir)/decodev32.c
168166
touch stamp-v32fcpu
169167
cpuv32.h cpuv32.c semcrisv32f-switch.c modelv32.c decodev32.c decodev32.h: $(CGEN_MAINT) stamp-v32fcpu
170168

171-
stamp-desc: $(CGEN_READ_SCM) $(CGEN_DESC_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile
169+
stamp-desc: $(CGEN_READ_SCM) $(CGEN_DESC_SCM) $(CPU_DIR)/cris.cpu Makefile
172170
$(MAKE) cgen-desc $(CGEN_FLAGS_TO_PASS) \
173-
archfile=$(CGEN_CPU_DIR)/cris.cpu \
171+
archfile=$(CPU_DIR)/cris.cpu \
174172
cpu=cris mach=all
175173
touch stamp-desc
176174
cris-desc.c cris-desc.h cris-opc.h: $(CGEN_MAINT) stamp-desc

0 commit comments

Comments
 (0)