diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-04-30 20:45:27 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-04-30 20:45:27 -0700 |
| commit | 22742246287feda0be2666ba14ca6f4a6bc73bb2 (patch) | |
| tree | a15d7df63f796e13e6c28a2ec82a36f68af5c3a5 /isa/Makefile | |
| parent | 8dda7b2034197109a2387ac3dd03c7ad1e8c0b65 (diff) | |
| download | riscv-tests-22742246287feda0be2666ba14ca6f4a6bc73bb2.zip riscv-tests-22742246287feda0be2666ba14ca6f4a6bc73bb2.tar.gz riscv-tests-22742246287feda0be2666ba14ca6f4a6bc73bb2.tar.bz2 | |
ERET -> xRET; new memory map
For now, we no longer build hex files, because the programs don't
start at address 0. This decision will likely be revisited.
Diffstat (limited to 'isa/Makefile')
| -rw-r--r-- | isa/Makefile | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/isa/Makefile b/isa/Makefile index 4ff1bd3..636cbbe 100644 --- a/isa/Makefile +++ b/isa/Makefile @@ -31,9 +31,6 @@ vpath %.S $(src_dir) #------------------------------------------------------------ # Build assembly tests -%.hex: % - (elf2hex 16 8192 $< 2> /dev/null || elf2hex 16 16384 $<) > $@ - %.dump: % $(RISCV_OBJDUMP) $< > $@ @@ -49,22 +46,13 @@ $$($(1)_p_tests): $(1)-p-%: $(1)/%.S $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -I$(src_dir)/../env/p -I$(src_dir)/macros/scalar -T$(src_dir)/../env/p/link.ld $$< -o $$@ $(1)_tests += $$($(1)_p_tests) -$$($(1)_pt_tests): $(1)-pt-%: $(1)/%.S - $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -I$(src_dir)/../env/pt -I$(src_dir)/macros/scalar -T$(src_dir)/../env/pt/link.ld $$< -o $$@ -$(1)_tests += $$($(1)_pt_tests) - -$$($(1)_pm_tests): $(1)-pm-%: $(1)/%.S - $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -I$(src_dir)/../env/pm -I$(src_dir)/macros/scalar -T$(src_dir)/../env/pm/link.ld $$< -o $$@ -$(1)_tests += $$($(1)_pm_tests) - $$($(1)_v_tests): $(1)-v-%: $(1)/%.S $$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) -std=gnu99 -O2 -I$(src_dir)/../env/v -I$(src_dir)/macros/scalar -T$(src_dir)/../env/v/link.ld $(src_dir)/../env/v/entry.S $(src_dir)/../env/v/*.c $$< -lc -o $$@ $(1)_tests += $$($(1)_v_tests) $(1)_tests_dump = $$(addsuffix .dump, $$($(1)_tests)) -$(1)_tests_hex = $$(addsuffix .hex, $$($(1)_tests)) -$(1): $$($(1)_tests_dump) $$($(1)_tests_hex) +$(1): $$($(1)_tests_dump) .PHONY: $(1) @@ -96,7 +84,7 @@ junk += $(tests) $(tests_dump) $(tests_hex) $(tests_out) $(tests32_out) #------------------------------------------------------------ # Default -all: $(tests_dump) $(tests_hex) +all: $(tests_dump) #------------------------------------------------------------ # Clean up |