aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSagar Karandikar <sagark@eecs.berkeley.edu>2016-02-01 16:06:40 -0800
committerSagar Karandikar <sagark@eecs.berkeley.edu>2016-02-01 16:06:40 -0800
commitf1f0ae46ebc08c54079530fa1bb071ab03f55734 (patch)
treef8578341e391c11475870295a7544b4f22e8f1b8
parent2065218d0a8c25ea721f8036d9098eb91a31920c (diff)
downloadriscv-tools-f1f0ae46ebc08c54079530fa1bb071ab03f55734.zip
riscv-tools-f1f0ae46ebc08c54079530fa1bb071ab03f55734.tar.gz
riscv-tools-f1f0ae46ebc08c54079530fa1bb071ab03f55734.tar.bz2
add qemu back to riscv-tools
-rw-r--r--.gitmodules3
-rwxr-xr-xbuild.sh2
m---------riscv-qemu0
3 files changed, 5 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 2c44816..61effb9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
[submodule "riscv-gnu-toolchain"]
path = riscv-gnu-toolchain
url = https://github.com/riscv/riscv-gnu-toolchain.git
+[submodule "riscv-qemu"]
+ path = riscv-qemu
+ url = https://github.com/riscv/riscv-qemu
diff --git a/build.sh b/build.sh
index 022a4fc..844e98c 100755
--- a/build.sh
+++ b/build.sh
@@ -11,6 +11,8 @@ build_project riscv-fesvr --prefix=$RISCV
build_project riscv-isa-sim --prefix=$RISCV --with-fesvr=$RISCV
build_project riscv-gnu-toolchain --prefix=$RISCV
CC= CXX= build_project riscv-pk --prefix=$RISCV/riscv64-unknown-elf --host=riscv64-unknown-elf
+cd riscv-qemu; git update-index --assume-unchanged po/*; cd ..
+build_project riscv-qemu --prefix=$RISCV --target-list=riscv-softmmu
build_tests
echo -e "\\nRISC-V Toolchain installation completed!"
diff --git a/riscv-qemu b/riscv-qemu
new file mode 160000
+Subproject ce46c3922ab83702d1f64d87daeb5dd7094bd89