Mercurial > hg > truffle
diff src/share/vm/memory/allocation.hpp @ 6854:fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
Summary: Change makefiles so that targets and parameters can be overridden by alternate makefiles.
Reviewed-by: dholmes, coleenp
author | jprovino |
---|---|
date | Wed, 10 Oct 2012 14:35:58 -0400 |
parents | da91efe96a93 |
children | 7b5885dadbdc |
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.hpp Fri Oct 05 13:37:08 2012 -0700 +++ b/src/share/vm/memory/allocation.hpp Wed Oct 10 14:35:58 2012 -0400 @@ -27,6 +27,7 @@ #include "runtime/globals.hpp" #include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" #ifdef COMPILER1 #include "c1/c1_globals.hpp" #endif @@ -157,8 +158,16 @@ typedef unsigned short MEMFLAGS; +#if INCLUDE_NMT + extern bool NMT_track_callsite; +#else + +const bool NMT_track_callsite = false; + +#endif // INCLUDE_NMT + // debug build does not inline #if defined(_DEBUG_) #define CURRENT_PC (NMT_track_callsite ? os::get_caller_pc(1) : 0)