changeset in /hg/icedtea: 2008-06-20 Gary Benson <gbenson at redh...

[Gary Benson]

changeset 4999cbdbc405 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4999cbdbc405
description:
	2008-06-20  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-zero-build.patch: Correctly set CPU.

diffstat:

2 files changed, 22 insertions(+)
ChangeLog                        |    4 ++++
patches/icedtea-zero-build.patch |   18 ++++++++++++++++++

diffs (36 lines):

diff -r d201ff92afab -r 4999cbdbc405 ChangeLog
--- a/ChangeLog	Fri Jun 20 11:06:52 2008 -0400
+++ b/ChangeLog	Fri Jun 20 11:08:28 2008 -0400
@@ -1,3 +1,7 @@ 2008-06-20  Gary Benson  <gbenson at redhat
+2008-06-20  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-zero-build.patch: Correctly set CPU.
+
 2008-06-20  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-core-build.patch: Defuzz.
diff -r d201ff92afab -r 4999cbdbc405 patches/icedtea-zero-build.patch
--- a/patches/icedtea-zero-build.patch	Fri Jun 20 11:06:52 2008 -0400
+++ b/patches/icedtea-zero-build.patch	Fri Jun 20 11:08:28 2008 -0400
@@ -296,3 +296,21 @@ diff -r c9fa8e3d5aa2 openjdk/corba/make/
    ifeq ($(ARCH), sparc)
      # Linux sparc build can be either 32-bit or 64-bit.
      #   Default to 32, but allow explicit setting to 32 or 64.
+diff -r b5e5d2ef906a openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	Thu Jun 19 17:05:23 2008 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	Fri Jun 20 10:29:14 2008 +0100
+@@ -143,10 +143,14 @@ const char* Abstract_VM_Version::vm_rele
+                  WINDOWS_ONLY("windows")         \
+                  SOLARIS_ONLY("solaris")
+ 
++#ifdef ZERO_LIBARCH
++#define CPU      ZERO_LIBARCH
++#else
+ #define CPU      IA32_ONLY("x86")                \
+                  IA64_ONLY("ia64")               \
+                  AMD64_ONLY("amd64")             \
+                  SPARC_ONLY("sparc")
++#endif // ZERO_LIBARCH
+ 
+ const char *Abstract_VM_Version::vm_platform_string() {
+   return OS "-" CPU;