diff options
Diffstat (limited to 'emulators/gem5/files')
| -rw-r--r-- | emulators/gem5/files/patch-SConstruct | 39 | ||||
| -rw-r--r-- | emulators/gem5/files/patch-src_SConscript | 11 | ||||
| -rw-r--r-- | emulators/gem5/files/patch-src_mem_physical.cc | 14 | ||||
| -rw-r--r-- | emulators/gem5/files/patch-util_term_Makefile | 11 |
4 files changed, 75 insertions, 0 deletions
diff --git a/emulators/gem5/files/patch-SConstruct b/emulators/gem5/files/patch-SConstruct new file mode 100644 index 000000000000..7fe253ebda09 --- /dev/null +++ b/emulators/gem5/files/patch-SConstruct @@ -0,0 +1,39 @@ +--- SConstruct.orig 2015-04-21 11:32:43.000000000 -0400 ++++ SConstruct 2018-03-11 21:17:31.106873000 -0400 +@@ -534,6 +534,9 @@ + main['LTO_CCFLAGS'] = [] + main['LTO_LDFLAGS'] = [] + ++# Add pthread ++main.Append(LIBS=['pthread']) ++ + # According to the readme, tcmalloc works best if the compiler doesn't + # assume that we're using the builtin malloc and friends. These flags + # are compiler-specific, so we need to set them after we detect which +@@ -785,13 +788,8 @@ + swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS') + main.Append(SWIGFLAGS=swig_flags) + +-# Check for 'timeout' from GNU coreutils. If present, regressions will +-# be run with a time limit. We require version 8.13 since we rely on +-# support for the '--foreground' option. +-timeout_lines = readCommand(['timeout', '--version'], +- exception='').splitlines() +-# Get the first line and tokenize it +-timeout_version = timeout_lines[0].split() if timeout_lines else [] ++# It expects GNU timeout, FreeBSD one (on 11.x+) is not compatible ++timeout_version = [] + main['TIMEOUT'] = timeout_version and \ + compareVersions(timeout_version[-1], '8.13') >= 0 + +@@ -922,8 +920,8 @@ + # version of python, see above for instructions on how to invoke + # scons with the appropriate PATH set. + # +- # First we check if python2-config exists, else we use python-config +- python_config = readCommand(['which', 'python2-config'], ++ # First we check if python2.7-config exists, else we use python-config ++ python_config = readCommand(['which', 'python2.7-config'], + exception='').strip() + if not os.path.exists(python_config): + python_config = readCommand(['which', 'python-config'], diff --git a/emulators/gem5/files/patch-src_SConscript b/emulators/gem5/files/patch-src_SConscript new file mode 100644 index 000000000000..50bc9affc724 --- /dev/null +++ b/emulators/gem5/files/patch-src_SConscript @@ -0,0 +1,11 @@ +--- src/SConscript.orig 2015-04-21 15:32:43 UTC ++++ src/SConscript +@@ -165,7 +165,7 @@ class Source(SourceFile): + '''specify the source file, and any guards''' + super(Source, self).__init__(source, **guards) + +- self.Werror = Werror ++ self.Werror = False + self.swig = swig + + class PySource(SourceFile): diff --git a/emulators/gem5/files/patch-src_mem_physical.cc b/emulators/gem5/files/patch-src_mem_physical.cc new file mode 100644 index 000000000000..a2b568bcb7a0 --- /dev/null +++ b/emulators/gem5/files/patch-src_mem_physical.cc @@ -0,0 +1,14 @@ +--- src/mem/physical.cc.orig 2015-04-21 15:32:43 UTC ++++ src/mem/physical.cc +@@ -62,11 +62,9 @@ + * host. On OSX the MAP_NORESERVE flag does not exist, so simply make + * it 0. + */ +-#if defined(__APPLE__) + #ifndef MAP_NORESERVE + #define MAP_NORESERVE 0 + #endif +-#endif + + using namespace std; + diff --git a/emulators/gem5/files/patch-util_term_Makefile b/emulators/gem5/files/patch-util_term_Makefile new file mode 100644 index 000000000000..ac67742092fb --- /dev/null +++ b/emulators/gem5/files/patch-util_term_Makefile @@ -0,0 +1,11 @@ +--- util/term/Makefile.orig 2015-04-22 17:24:04 UTC ++++ util/term/Makefile +@@ -26,7 +26,7 @@ + # + # Authors: Nathan Binkert + +-CC= gcc ++CC= cc + CCFLAGS= -g -O0 + + default: m5term |