# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1297649865 0
# Node ID 66db0252562cd8d35bc1e7db6a7f0abec5941a7f
# Parent  acbddaabc2e3441fcab69f98d804f52fc6904343
G344659: Fix issue when building on SPARC

2011-02-13  Andrew John Hughes  <ahughes@redhat.com>

	G344659: Fix issue when building on SPARC
	* Makefile.am: Add new patch.
	* NEWS: Updated.
	* patches/g344659-sparc_fix.patch:
	Add fix for SPARC builds on Gentoo.

diff -r acbddaabc2e3 -r 66db0252562c ChangeLog
--- a/ChangeLog	Mon Feb 14 01:00:50 2011 +0000
+++ b/ChangeLog	Mon Feb 14 02:17:45 2011 +0000
@@ -1,3 +1,11 @@
+2011-02-13  Andrew John Hughes  <ahughes@redhat.com>
+
+	G344659: Fix issue when building on SPARC
+	* Makefile.am: Add new patch.
+	* NEWS: Updated.
+	* patches/g344659-sparc_fix.patch:
+	Add fix for SPARC builds on Gentoo.
+
 2011-02-13  Andrew John Hughes  <ahughes@redhat.com>
 
 	* configure.ac: Bump to 1.9.7.
diff -r acbddaabc2e3 -r 66db0252562c Makefile.am
--- a/Makefile.am	Mon Feb 14 01:00:50 2011 +0000
+++ b/Makefile.am	Mon Feb 14 02:17:45 2011 +0000
@@ -335,7 +335,8 @@
 	patches/openjdk/6687968-pngimagereader_mem_leak.patch \
 	patches/openjdk/6541476-png-iTXt-chunk.patch \
 	patches/openjdk/6782079-png_metadata_oom.patch \
-	patches/rh676659-gcc-export-dynamic.patch
+	patches/rh676659-gcc-export-dynamic.patch \
+	patches/g344659-sparc_fix.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r acbddaabc2e3 -r 66db0252562c NEWS
--- a/NEWS	Mon Feb 14 01:00:50 2011 +0000
+++ b/NEWS	Mon Feb 14 02:17:45 2011 +0000
@@ -21,6 +21,7 @@
   - Vulnerability in permissions assigned to applets with multiple JARs
 * Bug fixes
   - RH676659: Pass -export-dynamic flag to linker using -Wl, as option in gcc 4.6+ is broken
+  - G344659: Fix issue when building on SPARC
 
 New in release 1.9.6 (2011-02-09):
 
diff -r acbddaabc2e3 -r 66db0252562c patches/g344659-sparc_fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/g344659-sparc_fix.patch	Mon Feb 14 02:17:45 2011 +0000
@@ -0,0 +1,12 @@
+diff -uNr openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/v_version_linux_sparc.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp	2010-06-21 22:12:15.000000000 +0100
++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp	2010-11-29 20:15:36.179541001 +0000
+@@ -35,7 +35,7 @@
+   }
+ 
+   while (!feof(fp)) {
+-    if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) {
++    if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu[0]) == 1) {
+       if (strstr(cpu, "Niagara") != NULL) {
+         rv = true;
+       }