Merge branch 'priv-1.9'merge-priv-1.9

Conflicts:
	.travis.yml
	build.sh

9 files changed, 24 insertions, 14 deletions

diff --git a/.travis.yml b/.travis.yml
index aadc439..8286cdb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,11 +22,13 @@ addons:
       - bison
       - flex
       - texinfo
+      - python-pexpect
 
 env:
   global:
     - RISCV="/home/travis/riscv_install"
     - MAKEFLAGS="-j3"
+    - PATH="/home/travis/riscv_install/bin:$PATH"
 
 before_install:
   # make install destination
@@ -43,4 +45,7 @@ before_install:
 # extra time duing long builds
 install: travis_wait
 
-script: ./build.sh
+script:
+  - ./build.sh
+  - cd riscv-tests/build
+  - make debug-check
diff --git a/build-rv32ima.sh b/build-rv32ima.sh
new file mode 100755
index 0000000..8f75705
--- /dev/null
+++ b/build-rv32ima.sh
@@ -0,0 +1,15 @@
+#! /bin/bash
+#
+# Script to build RISC-V ISA simulator, proxy kernel, and GNU toolchain.
+# Tools will be installed to $RISCV.
+
+. build.common
+
+echo "Starting RISC-V Toolchain build process"
+
+build_project riscv-fesvr --prefix=$RISCV
+build_project riscv-isa-sim --prefix=$RISCV --with-fesvr=$RISCV --with-isa=RV32IMA
+build_project riscv-gnu-toolchain --prefix=$RISCV --with-arch=RV32IMA
+CC= CXX= build_project riscv-pk --prefix=$RISCV --host=riscv32-unknown-elf
+
+echo -e "\\nRISC-V Toolchain installation completed!"
diff --git a/build.sh b/build.sh
index 9a67525..ec5f003 100755
--- a/build.sh
+++ b/build.sh
@@ -3,24 +3,14 @@
 # Script to build RISC-V ISA simulator, proxy kernel, and GNU toolchain.
 # Tools will be installed to $RISCV.
 
-with_xlen=64
-while [[ "$1" != "" ]]
-do
-   case "$1" in
-   --with-xlen=*) with_xlen="$(echo "$1" | cut -d= -f2-)" ;;
-   *) echo "Unknown argument $1" >2; exit 1;;
-   esac
-   shift
-done
-
 . build.common
 
 echo "Starting RISC-V Toolchain build process"
 
 build_project riscv-fesvr --prefix=$RISCV
 build_project riscv-isa-sim --prefix=$RISCV --with-fesvr=$RISCV
-build_project riscv-gnu-toolchain --prefix=$RISCV --with-xlen="$with_xlen"
-CC= CXX= build_project riscv-pk --prefix=$RISCV/riscv"$with_xlen"-unknown-elf --host=riscv"$with_xlen"-unknown-elf
-build_project riscv-tests --prefix=$RISCV/riscv"$with_xlen"-unknown-elf
+build_project riscv-gnu-toolchain --prefix=$RISCV
+CC= CXX= build_project riscv-pk --prefix=$RISCV --host=riscv64-unknown-elf
+build_project riscv-tests --prefix=$RISCV/riscv64-unknown-elf
 
 echo -e "\\nRISC-V Toolchain installation completed!"
diff --git a/riscv-fesvr b/riscv-fesvr
-Subproject 0f34d7ad311f78455a674224225f5b3056efba1
+Subproject 72f893b927f152d1bab283081f30ebb83ae8534
diff --git a/riscv-gnu-toolchain b/riscv-gnu-toolchain
-Subproject 728afcddcb0526a0f6560c4032da82805f054d5
+Subproject 55f83087a711a24b8704309b0dd32e6071fcafa
diff --git a/riscv-isa-sim b/riscv-isa-sim
-Subproject 3bfc00ef2a1b1f0b0472a39a866261b00f67027
+Subproject 679d5f5e927a0a59bbaaab33955ded79e860cde
diff --git a/riscv-opcodes b/riscv-opcodes
-Subproject b29f84fdaacad213e8d71a61d5ba9ba54d87f0f
+Subproject c86d2ee8dca8fb1186f036f64b7e3a49bdfc626
diff --git a/riscv-pk b/riscv-pk
-Subproject 85ae17aa149b9ea114bdd70cc30ea7e73813fb4
+Subproject f892b43a2bb1c2405b9941aaefdb25e3b4efe1f
diff --git a/riscv-tests b/riscv-tests
-Subproject c9022d2f63f50388b2ab1192966f30dbe7819a5
+Subproject e135e91b72ea79df1d023262d772cbc4759a473