From 1cafe6d08278ce409be072cd734135172603c5b8 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Mon, 12 Dec 2016 22:56:06 -0800 Subject: Delete obsolete references to JOBS variable --- .travis.yml | 2 -- README.md | 7 ------- build-rv32ima.sh | 4 ++-- riscv-fesvr | 2 +- riscv-gnu-toolchain | 2 +- riscv-isa-sim | 2 +- riscv-opcodes | 2 +- riscv-pk | 2 +- riscv-tests | 2 +- 9 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8286cdb..dd5c935 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,6 @@ before_install: - cd .. # actually use new gcc - export CXX=g++-4.8 CC=gcc-4.8 - # only have 2 cores on the travis machine - - sed -i.bak 's/JOBS=16/JOBS=8/' build.common # extra time duing long builds install: travis_wait diff --git a/README.md b/README.md index 2ac8e19..94b62c9 100644 --- a/README.md +++ b/README.md @@ -409,13 +409,6 @@ environment variable now: $ export PATH=$PATH:$RISCV/bin -One more thing: If your machine doesn't have the capacity to -handle 16 make jobs (or conversely, it can handle more), edit -`build.common` to change the number specified by -`JOBS`. - - O$ sed -i 's/JOBS=16/JOBS=[number]/' build.common - Since we only need to build a few tools, we will use a modified build script, listed in its entirety below. Remember that we'll build `riscv64-unknown-linux-gnu-gcc` shortly afterwards. If you want to build the full diff --git a/build-rv32ima.sh b/build-rv32ima.sh index 8f75705..65e93ae 100755 --- a/build-rv32ima.sh +++ b/build-rv32ima.sh @@ -8,8 +8,8 @@ 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 +build_project riscv-isa-sim --prefix=$RISCV --with-fesvr=$RISCV --with-isa=rv32ima +build_project riscv-gnu-toolchain --prefix=$RISCV --with-arch=rv32ima --with-abi=ilp32 CC= CXX= build_project riscv-pk --prefix=$RISCV --host=riscv32-unknown-elf echo -e "\\nRISC-V Toolchain installation completed!" diff --git a/riscv-fesvr b/riscv-fesvr index 72f893b..0b85715 160000 --- a/riscv-fesvr +++ b/riscv-fesvr @@ -1 +1 @@ -Subproject commit 72f893b927f152d1bab283081f30ebb83ae8534b +Subproject commit 0b85715f43196e858cc965559914efba7561f453 diff --git a/riscv-gnu-toolchain b/riscv-gnu-toolchain index 55f8308..337a76d 160000 --- a/riscv-gnu-toolchain +++ b/riscv-gnu-toolchain @@ -1 +1 @@ -Subproject commit 55f83087a711a24b8704309b0dd32e6071fcafad +Subproject commit 337a76dc0f92e204495a63a7d871ec31f5547e65 diff --git a/riscv-isa-sim b/riscv-isa-sim index 679d5f5..f38dcde 160000 --- a/riscv-isa-sim +++ b/riscv-isa-sim @@ -1 +1 @@ -Subproject commit 679d5f5e927a0a59bbaaab33955ded79e860cded +Subproject commit f38dcde0d80d2f4818b8f20067b8de5267c8ade6 diff --git a/riscv-opcodes b/riscv-opcodes index c86d2ee..7650b39 160000 --- a/riscv-opcodes +++ b/riscv-opcodes @@ -1 +1 @@ -Subproject commit c86d2ee8dca8fb1186f036f64b7e3a49bdfc6266 +Subproject commit 7650b391d47dd0b73d541d39c48041aa53517973 diff --git a/riscv-pk b/riscv-pk index f892b43..f6b2274 160000 --- a/riscv-pk +++ b/riscv-pk @@ -1 +1 @@ -Subproject commit f892b43a2bb1c2405b9941aaefdb25e3b4efe1f1 +Subproject commit f6b2274af4a91763ecdb94600d7d54d5f7f262b5 diff --git a/riscv-tests b/riscv-tests index b68b390..6a1a38d 160000 --- a/riscv-tests +++ b/riscv-tests @@ -1 +1 @@ -Subproject commit b68b39031a730ecc155ed87fba2ed5f111d0ab07 +Subproject commit 6a1a38d421fd3e24bdc179d58d33572636b903b2 -- cgit v1.1