/hg/icedtea: Fix patches/icedtea-systemtap.patch so --enable-sys...

[vanaltj at icedtea.classpath.org]

changeset 3b4234249c40 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3b4234249c40
author: Jon VanAlten <jon.vanalten at redhat.com>
date: Thu Mar 11 15:14:36 2010 -0500

	Fix patches/icedtea-systemtap.patch so --enable-systemtap isn't
	broken.

	 * patches/icedtea-systemtap.patch: fix line numbers
	and context for the
	openjdk/hotspot/src/share/vm/runtime/arguments.cpp hunk


diffstat:

2 files changed, 9 insertions(+), 3 deletions(-)
ChangeLog                       |    6 ++++++
patches/icedtea-systemtap.patch |    6 +++---

diffs (34 lines):

diff -r c9ad770e663e -r 3b4234249c40 ChangeLog
--- a/ChangeLog	Wed Mar 03 12:42:29 2010 +0000
+++ b/ChangeLog	Thu Mar 11 15:14:36 2010 -0500
@@ -1,3 +1,9 @@ 2010-03-03 Andrew John Hughes  <ahughes@
+2010-03-11 Jon VanAlten  <jon.vanalten at redhat.com>
+
+	* patches/icedtea-systemtap.patch:
+	fix line numbers and context for the
+	openjdk/hotspot/src/share/vm/runtime/arguments.cpp hunk
+
 2010-03-03 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r c9ad770e663e -r 3b4234249c40 patches/icedtea-systemtap.patch
--- a/patches/icedtea-systemtap.patch	Wed Mar 03 12:42:29 2010 +0000
+++ b/patches/icedtea-systemtap.patch	Thu Mar 11 15:14:36 2010 -0500
@@ -121,7 +121,7 @@ diff -r 945bf7540697 src/share/vm/utilit
 +#endif
 --- openjdk/hotspot/src/share/vm/runtime/arguments.cpp	2009-03-04 14:39:43.000000000 +0100
 +++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp	2009-03-04 22:11:37.000000000 +0100
-@@ -2272,16 +2272,16 @@
+@@ -2375,16 +2375,16 @@
        FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false);
        FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true);
      } else if (match_option(option, "-XX:+ExtendedDTraceProbes", &tail)) {
@@ -139,6 +139,6 @@ diff -r 945bf7540697 src/share/vm/utilit
        return JNI_EINVAL;
 -#endif // ndef SOLARIS
 +#endif // ndef DTRACE_ENABLED
-     } else
  #ifdef ASSERT
-     if (match_option(option, "-XX:+FullGCALot", &tail)) {
+     } else if (match_option(option, "-XX:+FullGCALot", &tail)) {
+       FLAG_SET_CMDLINE(bool, FullGCALot, true);