changeset in /hg/icedtea6: Fix warnings that cause build failure...

[Andrew John Hughes]

changeset ab71ebb1e8b6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ab71ebb1e8b6
description:
	Fix warnings that cause build failure on gcc 4.3.3.

	2009-02-04  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		Add new patch.
		* patches/hotspot/14.0b08/icedtea-format.patch,
		Fix warnings that cause the build to fail with
		GCC 4.3.3.

diffstat:

3 files changed, 58 insertions(+), 1 deletion(-)
ChangeLog                                    |    8 ++++
Makefile.am                                  |    3 +
patches/hotspot/14.0b08/icedtea-format.patch |   48 ++++++++++++++++++++++++++

diffs (80 lines):

diff -r 6b1b34af152d -r ab71ebb1e8b6 ChangeLog
--- a/ChangeLog	Tue Feb 03 20:23:22 2009 +0000
+++ b/ChangeLog	Wed Feb 04 11:51:13 2009 +0000
@@ -1,3 +1,11 @@ 2009-02-03  Andrew John Hughes  <ahughes
+2009-02-04  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Add new patch.
+	* patches/hotspot/14.0b08/icedtea-format.patch,
+	Fix warnings that cause the build to fail with
+	GCC 4.3.3.
+	
 2009-02-03  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-nio2.patch:
diff -r 6b1b34af152d -r ab71ebb1e8b6 Makefile.am
--- a/Makefile.am	Tue Feb 03 20:23:22 2009 +0000
+++ b/Makefile.am	Wed Feb 04 11:51:13 2009 +0000
@@ -616,7 +616,8 @@ ICEDTEA_PATCHES += \
 	$(DISTRIBUTION_PATCHES) \
 	patches/icedtea-demo-swingapplet.patch \
 	patches/icedtea-awt-window-size.patch \
-	patches/icedtea-java2d-dasher.patch
+	patches/icedtea-java2d-dasher.patch \
+	patches/hotspot/$(HSBUILD)/icedtea-format.patch
 
 stamps/extract.stamp: stamps/download.stamp
 if OPENJDK_SRC_DIR_FOUND
diff -r 6b1b34af152d -r ab71ebb1e8b6 patches/hotspot/14.0b08/icedtea-format.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/14.0b08/icedtea-format.patch	Wed Feb 04 11:51:13 2009 +0000
@@ -0,0 +1,48 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp	2009-02-03 18:08:09.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp	2009-02-03 18:32:59.000000000 +0000
+@@ -1361,7 +1361,7 @@
+ 
+     // Feed the cache size setting into the JDK
+     char buffer[1024];
+-    sprintf(buffer, "java.lang.Integer.IntegerCache.high=%d", AutoBoxCacheMax);
++    sprintf(buffer, "java.lang.Integer.IntegerCache.high=" INTX_FORMAT, AutoBoxCacheMax);
+     add_property(buffer);
+   }
+   if (AggressiveOpts && FLAG_IS_DEFAULT(DoEscapeAnalysis)) {
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/safepoint.cpp openjdk/hotspot/src/share/vm/runtime/safepoint.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/safepoint.cpp	2009-01-29 15:03:07.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp	2009-02-03 18:30:55.000000000 +0000
+@@ -730,7 +730,7 @@
+   if (DieOnSafepointTimeout) {
+     char msg[1024];
+     VM_Operation *op = VMThread::vm_operation();
+-    sprintf(msg, "Safepoint sync time longer than %d ms detected when executing %s.",
++    sprintf(msg, "Safepoint sync time longer than " INTX_FORMAT " ms detected when executing %s.",
+             SafepointTimeoutDelay,
+             op != NULL ? op->name() : "no vm operation");
+     fatal(msg);
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/synchronizer.cpp openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/synchronizer.cpp	2009-01-29 15:03:07.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/synchronizer.cpp	2009-02-03 19:32:30.000000000 +0000
+@@ -424,7 +424,7 @@
+ // asserts is that error message -- often something about negative array
+ // indices -- is opaque.
+ 
+-#define CTASSERT(x) { int tag[1-(2*!(x))]; printf ("Tag @%X\n", tag); }
++#define CTASSERT(x) { int tag[1-(2*!(x))]; printf ("Tag @%p\n", tag); }
+ 
+ void ObjectMonitor::ctAsserts() {
+   CTASSERT(offset_of (ObjectMonitor, _header) == 0);
+diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp openjdk/hotspot/src/share/vm/utilities/vmError.cpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp	2009-02-03 19:10:58.000000000 +0000
++++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp	2009-02-03 19:29:15.000000000 +0000
+@@ -307,7 +307,7 @@
+ 
+          strncpy(buf, file, buflen);
+          if (len + 10 < buflen) {
+-           sprintf(buf + len, ":" SIZE_FORMAT, _lineno);
++           sprintf(buf + len, ":%d", _lineno);
+          }
+          st->print(" (%s)", buf);
+        } else {