diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2013-04-19 23:33:40 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2013-04-19 23:33:40 -0700 |
| commit | 6c19a775f909f517681645ddbe8cab52fe37af1e (patch) | |
| tree | 3e7efcbffbb802873fe720e2464a9d0063dea769 /riscv | |
| parent | 24cf9ccbb53781721c66d7a531f229ad5ca9f324 (diff) | |
| download | riscv-isa-sim-6c19a775f909f517681645ddbe8cab52fe37af1e.zip riscv-isa-sim-6c19a775f909f517681645ddbe8cab52fe37af1e.tar.gz riscv-isa-sim-6c19a775f909f517681645ddbe8cab52fe37af1e.tar.bz2 | |
remove circular dependence in Makefile
Thanks, Sebastien!
Diffstat (limited to 'riscv')
| -rw-r--r-- | riscv/riscv.mk.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in index b3f8598..5405ba1 100644 --- a/riscv/riscv.mk.in +++ b/riscv/riscv.mk.in @@ -2,7 +2,7 @@ riscv_subproject_deps = \ softfloat_riscv \ softfloat \ -riscv_hdrs = \ +repo_hdrs := \ htif.h \ common.h \ decode.h \ @@ -12,10 +12,14 @@ riscv_hdrs = \ trap.h \ opcodes.h \ insn_header.h \ - dispatch.h \ cachesim.h \ memtracer.h \ +riscv_hdrs := \ + $(repo_hdrs) \ + dispatch.h + + NDISPATCH := 10 DISPATCH_SRCS := \ dispatch0.cc \ @@ -30,10 +34,10 @@ DISPATCH_SRCS := \ dispatch9.cc \ dispatch10.cc \ -$(DISPATCH_SRCS): %.cc: dispatch $(wildcard insns/*.h) $(riscv_hdrs) +$(DISPATCH_SRCS): %.cc: dispatch $(wildcard insns/*.h) $(riscv_hdrs) $< $(subst dispatch,,$(subst .cc,,$@)) $(NDISPATCH) 1024 < $(src_dir)/riscv/opcodes.h > $@ -dispatch.h: %.h: dispatch $(riscv_hdrs) +dispatch.h: %.h: dispatch $(repo_hdrs) $< $(NDISPATCH) 1024 < $(src_dir)/riscv/opcodes.h > $@ riscv_srcs = \ |