changeset in /hg/icedtea: 2008-03-04 Gary Benson <gbenson at redh...

[Gary Benson]

changeset 949c532c77b8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=949c532c77b8
description:
	2008-03-04  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-ports.patch: Moved HotSpot 7 specific hunk to...
		* patches/icedtea-hotspot7-ports.patch: New file.
		* Makefile.am: Added the above.
		* Makefile.in: Regenerated.

diffstat:

5 files changed, 32 insertions(+), 23 deletions(-)
ChangeLog                            |    7 +++++++
Makefile.am                          |    1 +
Makefile.in                          |    1 +
patches/icedtea-hotspot7-ports.patch |   23 +++++++++++++++++++++++
patches/icedtea-ports.patch          |   23 -----------------------

diffs (96 lines):

diff -r d9b2c16cb3a8 -r 949c532c77b8 ChangeLog
--- a/ChangeLog	Tue Mar 04 07:25:31 2008 -0500
+++ b/ChangeLog	Tue Mar 04 07:41:17 2008 -0500
@@ -1,3 +1,10 @@ 2008-03-04  Joshua Sumali  <jsumali at redh
+2008-03-04  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-ports.patch: Moved HotSpot 7 specific hunk to...
+	* patches/icedtea-hotspot7-ports.patch: New file.
+	* Makefile.am: Added the above.
+	* Makefile.in: Regenerated.
+
 2008-03-04  Joshua Sumali  <jsumali at redhat.com>
 
 	* patches/icedtea-use-system-tzdata.patch: Add missing hunk.
diff -r d9b2c16cb3a8 -r 949c532c77b8 Makefile.am
--- a/Makefile.am	Tue Mar 04 07:25:31 2008 -0500
+++ b/Makefile.am	Tue Mar 04 07:41:17 2008 -0500
@@ -200,6 +200,7 @@ if CORE_BUILD
   HOTSPOT_7_PATCHES = \
 	patches/icedtea-hotspot-6b06-7b24.patch \
 	patches/icedtea-hotspot7-build-fixes.patch \
+	patches/icedtea-hotspot7-ports.patch \
 	patches/icedtea-bytecodeInterpreter.patch \
 	patches/icedtea-bytecodeInterpreterWithChecks.patch
 else
diff -r d9b2c16cb3a8 -r 949c532c77b8 Makefile.in
--- a/Makefile.in	Tue Mar 04 07:25:31 2008 -0500
+++ b/Makefile.in	Tue Mar 04 07:41:17 2008 -0500
@@ -331,6 +331,7 @@ OPENJDK_URL = http://download.java.net/o
 @CORE_BUILD_TRUE at HOTSPOT_7_PATCHES = \
 @CORE_BUILD_TRUE@	patches/icedtea-hotspot-6b06-7b24.patch \
 @CORE_BUILD_TRUE@	patches/icedtea-hotspot7-build-fixes.patch \
+ at CORE_BUILD_TRUE@	patches/icedtea-hotspot7-ports.patch \
 @CORE_BUILD_TRUE@	patches/icedtea-bytecodeInterpreter.patch \
 @CORE_BUILD_TRUE@	patches/icedtea-bytecodeInterpreterWithChecks.patch
 
diff -r d9b2c16cb3a8 -r 949c532c77b8 patches/icedtea-hotspot7-ports.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-hotspot7-ports.patch	Tue Mar 04 07:41:17 2008 -0500
@@ -0,0 +1,23 @@
+diff -ru openjdk.orig/hotspot/src/share/vm/runtime/mutex.hpp openjdk/hotspot/src/share/vm/runtime/mutex.hpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/mutex.hpp	2007-11-08 11:34:54.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/mutex.hpp	2007-11-08 11:36:15.000000000 +0000
+@@ -61,18 +61,10 @@ union SplitWord {   // full-word with se
+ } ;
+ 
+ // Endian-ness ... index of least-significant byte in SplitWord.Bytes[]
+-#ifdef AMD64        // little
++#ifdef VM_LITTLE_ENDIAN
+  #define _LSBINDEX 0
+ #else
+-#if IA32            // little
+- #define _LSBINDEX 0
+-#else
+-#ifdef SPARC        // big
+  #define _LSBINDEX (sizeof(intptr_t)-1)
+-#else
+- #error "unknown architecture"
+-#endif
+-#endif
+ #endif
+ 
+ class ParkEvent ;
diff -r d9b2c16cb3a8 -r 949c532c77b8 patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch	Tue Mar 04 07:25:31 2008 -0500
+++ b/patches/icedtea-ports.patch	Tue Mar 04 07:41:17 2008 -0500
@@ -189,29 +189,6 @@ diff -ru openjdk.orig/hotspot/src/os/lin
  
      FILE *fp = fopen("/proc/meminfo", "r");
      if (fp) {
-diff -ru openjdk.orig/hotspot/src/share/vm/runtime/mutex.hpp openjdk/hotspot/src/share/vm/runtime/mutex.hpp
---- openjdk.orig/hotspot/src/share/vm/runtime/mutex.hpp	2007-11-08 11:34:54.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/mutex.hpp	2007-11-08 11:36:15.000000000 +0000
-@@ -61,18 +61,10 @@ union SplitWord {   // full-word with se
- } ;
- 
- // Endian-ness ... index of least-significant byte in SplitWord.Bytes[]
--#ifdef AMD64        // little
-+#ifdef VM_LITTLE_ENDIAN
-  #define _LSBINDEX 0
- #else
--#if IA32            // little
-- #define _LSBINDEX 0
--#else
--#ifdef SPARC        // big
-  #define _LSBINDEX (sizeof(intptr_t)-1)
--#else
-- #error "unknown architecture"
--#endif
--#endif
- #endif
- 
- class ParkEvent ;
 diff -ru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
 --- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2007-11-08 11:34:54.000000000 +0000
 +++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2007-11-08 11:36:15.000000000 +0000