/hg/icedtea6: 2 new changesets

[xranby]

changeset 89f162ea4ec7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=89f162ea4ec7
author: Xerxes R?nby <xerxes@...>
date: Thu Nov 12 16:36:32 2009 +0100

        Added NOT_X86 macro to fix Shark + LLVM 2.7 builds.

        2009-11-12 Xerxes R?nby <xerxes@...>

         * patches/icedtea-shark.patch
        (hotspot/src/share/vm/utilities/macros.hpp): Added NOT_X86
        macro.


changeset 86479d159627 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=86479d159627
author: Xerxes R?nby <xerxes@...>
date: Thu Nov 12 16:39:22 2009 +0100

        Adjust sharkMemoryManager to support LLVM 2.7svn rev 86606.

        2009-11-12 Xerxes R?nby <xerxes@...>

         * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
        (SharkMemoryManager::getDlsymTable): Made dependent on the LLVM
        version to be buildable with LLVM 2.7svn r86606 and later.
        (SharkMemoryManager::SetDlsymTable): Likewise.
                * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
        (SharkMemoryManager::getDlsymTable): Likewise.
        (SharkMemoryManager::SetDlsymTable): Likewise.


diffstat:

4 files changed, 40 insertions(+)
ChangeLog                                               |   16 ++++++++++++
patches/icedtea-shark.patch                             |   20 +++++++++++++++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp |    2 +
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |    2 +

diffs (83 lines):

diff -r b412bab45028 -r 86479d159627 ChangeLog
--- a/ChangeLog Wed Nov 11 16:08:49 2009 +0000
+++ b/ChangeLog Thu Nov 12 16:39:22 2009 +0100
@@ -1,3 +1,19 @@ 2009-11-11  Gary Benson  <gbenson@redhat
[phone]  Xerxes RÃ¥nby  <xerxes@...>
+
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
+ (SharkMemoryManager::getDlsymTable): Made dependent on the LLVM version
+ to be buildable with LLVM 2.7svn r86606 and later.
+ (SharkMemoryManager::SetDlsymTable): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
+ (SharkMemoryManager::getDlsymTable): Likewise.
+ (SharkMemoryManager::SetDlsymTable): Likewise.
+
[phone]  Xerxes RÃ¥nby  <xerxes@...>
+
+ * patches/icedtea-shark.patch
+ (hotspot/src/share/vm/utilities/macros.hpp):
+ Added NOT_X86 macro.
+
 2009-11-11  Gary Benson  <gbenson@...>
 
  * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
diff -r b412bab45028 -r 86479d159627 patches/icedtea-shark.patch
--- a/patches/icedtea-shark.patch Wed Nov 11 16:08:49 2009 +0000
+++ b/patches/icedtea-shark.patch Thu Nov 12 16:39:22 2009 +0100
@@ -388,3 +388,23 @@ diff -r 0d80af392e67 openjdk/hotspot/src
    ((CodeBlob*)(this))->flush();
 
    CodeCache::free(this);
+Index: openjdk/hotspot/src/share/vm/utilities/macros.hpp
+===================================================================
+--- openjdk.orig/ports/hotspot/src/share/vm/utilities/macros.hpp 2009-11-12 15:17:14.458064088 +0100
++++ openjdk/hotspot/src/share/vm/utilities/macros.hpp 2009-11-12 15:19:18.097063844 +0100
+@@ -146,12 +146,14 @@
+ #define NOT_WINDOWS(code) code
+ #endif
+
+-#if defined(IA32) || defined(AMD64)
++#if defined(IA32) || defined(IA64) || defined(AMD64)
+ #define X86
+ #define X86_ONLY(code) code
++#define NOT_X86(code)
+ #else
+ #undef X86
+ #define X86_ONLY(code)
++#define NOT_X86(code) code
+ #endif
+
+ #ifdef IA32
diff -r b412bab45028 -r 86479d159627 ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp Wed Nov 11 16:08:49 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp Thu Nov 12 16:39:22 2009 +0100
@@ -109,6 +109,7 @@ uint8_t* SharkMemoryManager::allocateGlo
   return mm()->allocateGlobal(Size, Alignment);
 }
 
+#if SHARK_LLVM_VERSION < 27
 void* SharkMemoryManager::getDlsymTable() const
 {
   return mm()->getDlsymTable();
@@ -118,6 +119,7 @@ void SharkMemoryManager::SetDlsymTable(v
 {
   mm()->SetDlsymTable(ptr);
 }
+#endif
 
 void SharkMemoryManager::setPoisonMemory(bool poison)
 {
diff -r b412bab45028 -r 86479d159627 ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp Wed Nov 11 16:08:49 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp Thu Nov 12 16:39:22 2009 +0100
@@ -71,8 +71,10 @@ class SharkMemoryManager : public llvm::
                          unsigned char* TableStart,
                          unsigned char* TableEnd,
                          unsigned char* FrameRegister);
+#if SHARK_LLVM_VERSION < 27
   void* getDlsymTable() const;
   void SetDlsymTable(void *ptr);
+#endif
   void setPoisonMemory(bool);
   uint8_t* allocateGlobal(uintptr_t, unsigned int);
   void setMemoryWritable();