/hg/icedtea6: G344659: Fix issue when building on SPARC

[andrew at icedtea.classpath.org]

changeset 080e6564d096 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=080e6564d096
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 14 11:24:24 2011 +0000

	G344659: Fix issue when building on SPARC

	2011-02-13 Andrew John Hughes <ahughes at 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.


diffstat:

4 files changed, 23 insertions(+), 1 deletion(-)
ChangeLog                       |    8 ++++++++
Makefile.am                     |    3 ++-
NEWS                            |    1 +
patches/g344659-sparc_fix.patch |   12 ++++++++++++

diffs (55 lines):

diff -r fc0df075ea54 -r 080e6564d096 ChangeLog
--- a/ChangeLog	Sun Feb 13 17:33:58 2011 +0000
+++ b/ChangeLog	Mon Feb 14 11:24:24 2011 +0000
@@ -1,3 +1,11 @@ 2011-02-13  Andrew John Hughes  <ahughes
+2011-02-13  Andrew John Hughes  <ahughes at 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 at redhat.com>
 
 	* NEWS: Updated.
diff -r fc0df075ea54 -r 080e6564d096 Makefile.am
--- a/Makefile.am	Sun Feb 13 17:33:58 2011 +0000
+++ b/Makefile.am	Mon Feb 14 11:24:24 2011 +0000
@@ -292,7 +292,8 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/4493128-CubicCurve2D.patch \
 	patches/openjdk/4645692-CubicCurve2D.solveCubic.patch \
 	patches/no-static-linking.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 fc0df075ea54 -r 080e6564d096 NEWS
--- a/NEWS	Sun Feb 13 17:33:58 2011 +0000
+++ b/NEWS	Mon Feb 14 11:24:24 2011 +0000
@@ -420,6 +420,7 @@ New in release 1.10 (2011-XX-XX):
   - RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
   - PR616, PR99: Don't statically link libstdc++ or libgcc
   - RH676659: Pass -export-dynamic flag to linker using -Wl as option is broken in gcc 4.6+
+  - G344659: Fix issue when building on SPARC
 
 New in release 1.9.5 (2011-02-01):
 
diff -r fc0df075ea54 -r 080e6564d096 patches/g344659-sparc_fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/g344659-sparc_fix.patch	Mon Feb 14 11:24:24 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;
+       }