diff options
| author |   Andrew Burgess <andrew.burgess@embecosm.com> | 2018-10-16 10:49:15 +0100 |
|---|---|---|
| committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2018-12-06 12:21:11 +0000 |
| commit | 23ebf37881dda7fcf9dd86125705a30b6e2084ce (patch) | |
| tree | f3113adf7aa62a6b4228c87ab2c29274f4c350ff /sim | |
| parent | sim/opcodes: Allow use of out of tree cgen source directory (diff) | |
| download | binutils-gdb-23ebf37881dda7fcf9dd86125705a30b6e2084ce.tar.gz binutils-gdb-23ebf37881dda7fcf9dd86125705a30b6e2084ce.tar.bz2 binutils-gdb-23ebf37881dda7fcf9dd86125705a30b6e2084ce.zip | |
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.
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/cris/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/cris/Makefile.in | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 659a5e15e0a..5e26f3ddf8b 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,8 @@ +2018-12-06 Andrew Burgess <andrew.burgess@embecosm.com> + + * Makefile.in: Replace uses of CGEN_CPU_DIR with CPU_DIR, and + remove the definition of CGEN_CPU_DIR. + 2017-09-06 John Baldwin <jhb@FreeBSD.org> * configure: Regenerate. diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in index 2c901fdcabc..f5880eaf299 100644 --- a/sim/cris/Makefile.in +++ b/sim/cris/Makefile.in @@ -45,8 +45,6 @@ NL_TARGET = -DNL_TARGET_cris ## COMMON_POST_CONFIG_FRAG -CGEN_CPU_DIR = $(CGENDIR)/../cpu - arch = cris sim-if.o: sim-if.c $(SIM_MAIN_DEPS) $(sim-core_h) $(sim-options_h) @@ -140,17 +138,17 @@ CGEN_MAINT = ; @true # Useful when making CGEN-generated files manually, without --enable-cgen-maint. stamps: stamp-v10fmloop stamp-v32fmloop stamp-arch stamp-v10fcpu stamp-v32fcpu stamp-desc -stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile +stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CPU_DIR)/cris.cpu Makefile $(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=crisv10,crisv32 \ - archfile=$(CGEN_CPU_DIR)/cris.cpu \ + archfile=$(CPU_DIR)/cris.cpu \ FLAGS="with-scache with-profile=fn" touch stamp-arch arch.h arch.c cpuall.h: $(CGEN_MAINT) stamp-arch # The sed-hack is supposed to be temporary, until we get CGEN to emit it. -stamp-v10fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile +stamp-v10fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/cris.cpu Makefile $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ - archfile=$(CGEN_CPU_DIR)/cris.cpu \ + 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 @@ -158,9 +156,9 @@ stamp-v10fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DI touch stamp-v10fcpu cpuv10.h cpuv10.c semcrisv10f-switch.c modelv10.c decodev10.c decodev10.h: $(CGEN_MAINT) stamp-v10fcpu -stamp-v32fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile +stamp-v32fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/cris.cpu Makefile $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ - archfile=$(CGEN_CPU_DIR)/cris.cpu \ + 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 @@ -168,9 +166,9 @@ stamp-v32fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DI touch stamp-v32fcpu cpuv32.h cpuv32.c semcrisv32f-switch.c modelv32.c decodev32.c decodev32.h: $(CGEN_MAINT) stamp-v32fcpu -stamp-desc: $(CGEN_READ_SCM) $(CGEN_DESC_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile +stamp-desc: $(CGEN_READ_SCM) $(CGEN_DESC_SCM) $(CPU_DIR)/cris.cpu Makefile $(MAKE) cgen-desc $(CGEN_FLAGS_TO_PASS) \ - archfile=$(CGEN_CPU_DIR)/cris.cpu \ + archfile=$(CPU_DIR)/cris.cpu \ cpu=cris mach=all touch stamp-desc cris-desc.c cris-desc.h cris-opc.h: $(CGEN_MAINT) stamp-desc |