Mercurial > hg > release > icedtea6-1.2
changeset 734:1db86829b983 cacao
2008-03-04 Gary Benson <gbenson@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.
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Tue, 04 Mar 2008 07:41:17 -0500 |
| parents | c165c63fcb0e |
| children | 577355a656ac |
| files | ChangeLog Makefile.am patches/icedtea-hotspot7-ports.patch patches/icedtea-ports.patch |
| diffstat | 4 files changed, 31 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- 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 Gary Benson <gbenson@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@redhat.com> * patches/icedtea-use-system-tzdata.patch: Add missing hunk.
--- a/Makefile.am Tue Mar 04 07:25:31 2008 -0500 +++ b/Makefile.am Tue Mar 04 07:41:17 2008 -0500 @@ -210,6 +210,7 @@ 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
--- /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 ;
--- 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 @@ 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