summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xSConstruct9
-rw-r--r--src/mem/cache/cache.hh2
2 files changed, 6 insertions, 5 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 = {}
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 ||