From 2a6fe970922ca174a872dd00be9c3371f646de10 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Sun, 15 Nov 2015 21:28:00 +0000 Subject: arm: Add missing explicit overrides for classic caches Make clang when compiling on OSX. --- src/mem/cache/cache.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mem/cache/cache.hh b/src/mem/cache/cache.hh index eb40ddb18..5ea72831b 100644 --- a/src/mem/cache/cache.hh +++ b/src/mem/cache/cache.hh @@ -304,7 +304,7 @@ class Cache : public BaseCache * @param cmd Command of the incoming requesting packet * @return Whether we should allocate on the fill */ - inline bool allocOnFill(MemCmd cmd) const + inline bool allocOnFill(MemCmd cmd) const override { return clusivity == Enums::mostly_incl || cmd == MemCmd::WriteLineReq || -- cgit v1.2.3 From fe9cf5100acc5605216bce53ae35625b9871e7db Mon Sep 17 00:00:00 2001 From: Joe Gross Date: Sun, 15 Nov 2015 17:56:43 -0500 Subject: sim: support for distcc pump server settings --- SConstruct | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index a8ffb208c..45cfb0b89 100755 --- a/SConstruct +++ b/SConstruct @@ -209,10 +209,11 @@ use_vars = set([ 'AS', 'AR', 'CC', 'CXX', 'HOME', 'LD_LIBRARY_PATH', 'PYTHONPATH', 'RANLIB', 'SWIG', 'TERM' ]) use_prefixes = [ - "M5", # M5 configuration (e.g., path to kernels) - "DISTCC_", # distcc (distributed compiler wrapper) configuration - "CCACHE_", # ccache (caching compiler wrapper) configuration - "CCC_", # clang static analyzer configuration + "CCACHE_", # ccache (caching compiler wrapper) configuration + "CCC_", # clang static analyzer configuration + "DISTCC_", # distcc (distributed compiler wrapper) configuration + "INCLUDE_SERVER_", # distcc pump server settings + "M5", # M5 configuration (e.g., path to kernels) ] use_env = {} -- cgit v1.2.3