diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2015-11-16 05:10:45 -0600 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2015-11-16 05:10:45 -0600 |
| commit | 90d430d5b3e0e322c07270bb168653eb4f5b2713 (patch) | |
| tree | 25acec3de65d7ab1de6ffa1e8276abf3f60151fa | |
| parent | de489e1997ee6c37aaf6e876e32622f6c648fe95 (diff) | |
| parent | fe9cf5100acc5605216bce53ae35625b9871e7db (diff) | |
| download | gem5-90d430d5b3e0e322c07270bb168653eb4f5b2713.tar.xz | |
Merged changesets: 47e2adf7fb1a and b65d4e878ed2
--HG--
extra : amend_source : c51de9ae5387aba6fae8403677054678beceb2ab
| -rwxr-xr-x | SConstruct | 9 | ||||
| -rw-r--r-- | src/mem/cache/cache.hh | 2 |
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 || |