diff options
author | Prashanth Mundkur <prashanth.mundkur@gmail.com> | 2018-02-26 15:37:01 -0800 |
---|---|---|
committer | Andrew Waterman <aswaterman@gmail.com> | 2018-03-06 11:46:53 -0600 |
commit | 58aa702359ec56f0b26a3f10a2617a58c9818451 (patch) | |
tree | e4ed5d0b67a4521d312ceefbd55c8a20ba31a26a | |
parent | 1fb7753da0bae7dd0499a3151e717b2b6fd2cf9d (diff) | |
download | spike-58aa702359ec56f0b26a3f10a2617a58c9818451.zip spike-58aa702359ec56f0b26a3f10a2617a58c9818451.tar.gz spike-58aa702359ec56f0b26a3f10a2617a58c9818451.tar.bz2 |
Fix install of a missed header from debug_rom.
The installed header files from the riscv subproject were incomplete, since
processor.h includes debug_rom_defines.h, and the latter was not installed.
Fix by moving it into riscv/, add it to the riscv subproject header list, which
ensures it will get installed. While here, also add a missed dependency of debug_rom
on riscv/encoding.h to debug_rom/Makefile.
-rw-r--r-- | debug_rom/Makefile | 2 | ||||
-rwxr-xr-x | debug_rom/debug_rom.S | 4 | ||||
-rw-r--r-- | riscv/debug_module.cc | 2 | ||||
-rw-r--r-- | riscv/processor.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/debug_rom/Makefile b/debug_rom/Makefile index 0a67ba1..c5f2205 100644 --- a/debug_rom/Makefile +++ b/debug_rom/Makefile @@ -7,7 +7,7 @@ OBJCOPY = $(RISCV)/bin/riscv64-unknown-elf-objcopy COMPILE = $(CC) -nostdlib -nostartfiles -I.. -Tlink.ld ELFS = debug_rom -DEPS = debug_rom.S link.ld debug_rom_defines.h +DEPS = debug_rom.S link.ld ../riscv/debug_rom_defines.h ../riscv/encoding.h all: $(patsubst %,%.h,$(ELFS)) diff --git a/debug_rom/debug_rom.S b/debug_rom/debug_rom.S index 1342ee0..28c7076 100755 --- a/debug_rom/debug_rom.S +++ b/debug_rom/debug_rom.S @@ -1,8 +1,8 @@ // See LICENSE.SiFive for license details. #include "riscv/encoding.h" -#include "debug_rom_defines.h" - +#include "riscv/debug_rom_defines.h" + .option norvc .global entry .global exception diff --git a/riscv/debug_module.cc b/riscv/debug_module.cc index 39e1ae0..de54a83 100644 --- a/riscv/debug_module.cc +++ b/riscv/debug_module.cc @@ -6,7 +6,7 @@ #include "mmu.h" #include "debug_rom/debug_rom.h" -#include "debug_rom/debug_rom_defines.h" +#include "debug_rom_defines.h" #if 0 # define D(x) x diff --git a/riscv/processor.h b/riscv/processor.h index 070fccf..3998ce5 100644 --- a/riscv/processor.h +++ b/riscv/processor.h @@ -9,7 +9,7 @@ #include <string> #include <vector> #include <map> -#include "debug_rom/debug_rom_defines.h" +#include "debug_rom_defines.h" class processor_t; class mmu_t; |