Mercurial > hg > graal-jvmci-8
diff src/share/vm/prims/jvmtiEnter.xsl @ 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 | 3c9db54c2660 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiEnter.xsl Fri Oct 05 13:37:08 2012 -0700 +++ b/src/share/vm/prims/jvmtiEnter.xsl Wed Oct 10 14:35:58 2012 -0400 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. This code is free software; you can redistribute it and/or modify it @@ -37,6 +37,8 @@ <xsl:call-template name="sourceHeader"/> <xsl:text> # include "precompiled.hpp" +# include "utilities/macros.hpp" +#if INCLUDE_JVMTI # include "prims/jvmtiEnter.hpp" # include "prims/jvmtiRawMonitor.hpp" # include "prims/jvmtiUtil.hpp" @@ -247,6 +249,7 @@ <xsl:text> }; +#endif // INCLUDE_JVMTI </xsl:text> </xsl:template> @@ -469,7 +472,7 @@ </xsl:text> <xsl:if test="not(contains(@jkernel,'yes'))"> - <xsl:text>
#ifdef JVMTI_KERNEL 
</xsl:text> + <xsl:text>
#if !INCLUDE_JVMTI 
</xsl:text> <xsl:text> return JVMTI_ERROR_NOT_AVAILABLE; 
</xsl:text> <xsl:text>#else 
</xsl:text> </xsl:if> @@ -596,7 +599,7 @@ </xsl:text> <xsl:if test="not(contains(@jkernel,'yes'))"> - <xsl:text>#endif // JVMTI_KERNEL
</xsl:text> + <xsl:text>#endif // INCLUDE_JVMTI
</xsl:text> </xsl:if> <xsl:text>}
</xsl:text>