[patch] rfc: shark llvm2.7 r86606 sharkMemoryManager fix

[Xerxes Rånby]

The  dlsym stubs got removed from JITMemoryManager in llvm 2.7svn r86606
and the attached patch updates sharkMemoryManager accordingly.
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp?r1=84859&r2=86606

Cheers
Xerxes

Index: icedtea6-shark/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
===================================================================
--- icedtea6-shark.orig/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp 2009-11-12 15:25:51.505063566 +0100
+++ icedtea6-shark/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp 2009-11-12 15:26:19.321089617 +0100
@@ -109,6 +109,7 @@
   return mm()->allocateGlobal(Size, Alignment);
 }
 
+#if SHARK_LLVM_VERSION < 27
 void* SharkMemoryManager::getDlsymTable() const
 {
   return mm()->getDlsymTable();
@@ -118,6 +119,7 @@
 {
   mm()->SetDlsymTable(ptr);
 }
+#endif
 
 void SharkMemoryManager::setPoisonMemory(bool poison)
 {
Index: icedtea6-shark/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
===================================================================
--- icedtea6-shark.orig/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp 2009-11-12 15:24:48.541078621 +0100
+++ icedtea6-shark/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp 2009-11-12 15:25:47.264589978 +0100
@@ -71,8 +71,10 @@
                          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();

[Gary Benson]

Xerxes Rånby wrote:
> The dlsym stubs got removed from JITMemoryManager in llvm 2.7svn
> r86606 and the attached patch updates sharkMemoryManager
> accordingly.
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp?r1=84859&r2=86606

Please push this too.

Cheers,
Gary

--
http://gbenson.net/