Fix build issues for external users

.gitmodules

@@ -0,0 +1,21 @@
+#[submodule "riscv-binutils"]
+#        path = riscv-gnu-toolchain/riscv-binutils
+#        url = git://github.com/riscv/riscv-binutils-gdb.git
+[submodule "riscv-gcc"]
+        path = riscv-gnu-toolchain/riscv-gcc
+        url = git://github.com/riscv/riscv-gcc.git
+[submodule "riscv-glibc"]
+        path = riscv-gnu-toolchain/riscv-glibc
+        url = git://github.com/riscv/riscv-glibc.git
+[submodule "riscv-dejagnu"]
+        path = riscv-gnu-toolchain/riscv-dejagnu
+        url = git://github.com/riscv/riscv-dejagnu.git
+[submodule "riscv-newlib"]
+        path = riscv-gnu-toolchain/riscv-newlib
+        url = git://github.com/riscv/riscv-newlib.git
+[submodule "riscv-qemu"]
+        path = riscv-gnu-toolchain/riscv-qemu
+        url = git://github.com/riscv/riscv-qemu.git
+[submodule "riscv-gdb"]
+        path = riscv-gnu-toolchain/riscv-gdb
+        url = git://github.com/riscv/riscv-binutils-gdb.git

Makefile

@@ -3,6 +3,8 @@ default: build-all
 
 include msg.mk
 
+JOBS = 4
+
 RVTOOLS = riscv-gnu-toolchain riscv-opcodes
 
 SS_SCHED = ss-scheduler
@@ -20,7 +22,7 @@ build-all: $(MODULES)
 clean-all: $(CLEAN_MODULES)
 
 $(GEM5): ss-scheduler
-	cd $@; scons build/RISCV/gem5.opt -j7
+	cd $@; scons build/RISCV/gem5.opt -j$(JOBS)
 
 .PHONY: $(SS_SCHED)
 $(SS_SCHED):
@@ -38,7 +40,7 @@ clean-ss: clean-$(SS_SCHED)
 riscv-gnu-toolchain: riscv-opcodes
 	mkdir -p $@/build
 	cd $@ && autoreconf -fiv && cd build && ../configure --prefix=$(SS_TOOLS)/
-	$(MAKE) -C $@/build -j9
+	$(MAKE) -C $@/build -j$(JOBS)
 
 riscv-opcodes:
 	make -C $@ install-ss

README.md

@@ -27,7 +27,7 @@ If you are on Ubuntu, try this:
 sudo apt-get install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev \
   libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc \
   qt4-dev-tools libqt4-dev python-dev scons libboost-regex-dev \
-  libboost-serialization-dev libgoogle-perftools-dev
+  libboost-serialization-dev libgoogle-perftools-dev libbison-dev parallel
 ````
 
 ___
@@ -48,7 +48,11 @@ source setup.sh
 ````
 make build-all
 ````
-NOTE: DO NOT use `-j`, which may cause dependence problem!
+NOTE: DO NOT use `-j`, which may cause dependence problem!  
+You can set JOBS=n to attribute parallelizable build commands.
+````
+JOBS=4 make build-all
+````
 
 ___
 

gem5/SConstruct

@@ -364,10 +364,10 @@ if main['GCC'] or main['CLANG']:
 
     # Treat warnings as errors but white list some warnings that we
     # want to allow (e.g., deprecation warnings).
-    main.Append(CCFLAGS=['-Werror',
-                         '-Wno-error=deprecated-declarations',
-                         '-Wno-error=deprecated',
-                        ])
+    #main.Append(CCFLAGS=['-Werror',
+    #                     '-Wno-error=deprecated-declarations',
+    #                     '-Wno-error=deprecated',
+    #                    ])
 else:
     print(termcap.Yellow + termcap.Bold + 'Error' + termcap.Normal, end=' ')
     print("Don't know what compiler options to use for your compiler.")
@@ -425,10 +425,8 @@ if main['GCC']:
     # to avoid performance penalties on certain AMD chips. Older
     # assemblers detect this as an error, "Error: expecting string
     # instruction after `rep'"
-    as_version_raw = readCommand([main['AS'], '-v', '/dev/null',
-                                  '-o', '/dev/null'],
+    as_version_raw = readCommand([main['AS'], '-v', '/dev/null'],
                                  exception=False).split()
-
     # version strings may contain extra distro-specific
     # qualifiers, so play it safe and keep only what comes before
     # the first hyphen

gem5/src/base/bitunion.hh

@@ -435,15 +435,15 @@ namespace BitfieldBackend
     inline std::ostream &
     bitfieldBackendPrinter(std::ostream &os, const char &t)
     {
-        os << (const int)t;
+        os << (int)t;
         return os;
     }
 
     template <>
     inline std::ostream &
     bitfieldBackendPrinter(std::ostream &os, const unsigned char &t)
     {
-        os << (const unsigned int)t;
+        os << (unsigned int)t;
         return os;
     }
 }

riscv-opcodes/.gitignore

@@ -2,4 +2,3 @@
 inst.chisel
 instr-table.tex
 priv-instr-table.tex
-ss_*.h

riscv-opcodes/parse-opcodes

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 import math
 import sys