Mercurial > hg > graal-compiler
diff src/share/vm/prims/jvmtiEnter.xsl @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sat, 17 Dec 2011 21:40:27 +0100 |
parents | a6eef545f1a2 |
children | da91efe96a93 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiEnter.xsl Sat Dec 17 20:50:09 2011 +0100 +++ b/src/share/vm/prims/jvmtiEnter.xsl Sat Dec 17 21:40:27 2011 +0100 @@ -426,7 +426,7 @@ <xsl:value-of select="$space"/> <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text> <xsl:value-of select="$space"/> - <xsl:text>__ENTRY(jvmtiError, </xsl:text> + <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text> <xsl:apply-templates select="." mode="functionid"/> <xsl:text> , current_thread)</xsl:text> <xsl:value-of select="$space"/>