--- a/ChangeLog	Tue May 05 13:30:07 2009 +0200
+++ b/ChangeLog	Tue May 19 16:23:38 2009 +0100
@@ -9,6 +9,15 @@
 	* configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from
 	SHARK_LLVM_VERSION.
 
+2009-04-29  Matthias Klose  <doko@ubuntu.com>
+	    Xerxes Rånby  <xerxes@zafena.se>
+
+	* configure.am (LLVM_CFLAGS): Add SHARK_LLVM_VERSION.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+	ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: New
+	methods getDlsymTable, SetDlsymTable, allocateSpace, dependent
+	on the llvm version.
+
 2009-05-01  Gary Benson  <gbenson@redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp: New file.

--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Tue May 05 13:30:07 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Tue May 19 16:23:38 2009 +0100
@@ -90,3 +90,24 @@
 {
   return mm()->deallocateMemForFunction(F);
 }
+
+#if SHARK_LLVM_VERSION >= 26
+void* SharkMemoryManager::getDlsymTable() const
+{
+  return mm()->getDlsymTable();
+}
+
+void SharkMemoryManager::SetDlsymTable(void *ptr)
+{
+  mm()->SetDlsymTable(ptr);
+}
+
+#endif
+
+#if SHARK_LLVM_VERSION >= 25
+unsigned char *SharkMemoryManager::allocateSpace(intptr_t Size,
+                                                 unsigned int Alignment)
+{
+  return mm()->allocateSpace(Size, Alignment);
+}
+#endif

--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Tue May 05 13:30:07 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Tue May 19 16:23:38 2009 +0100
@@ -71,7 +71,16 @@
                          unsigned char* TableStart,
                          unsigned char* TableEnd,
                          unsigned char* FrameRegister);
+#if SHARK_LLVM_VERSION >= 26
+  void* getDlsymTable() const;
+  void SetDlsymTable(void *ptr);
+#endif
   void setMemoryWritable();
   void setMemoryExecutable();
   void deallocateMemForFunction(const llvm::Function* F);
+
+#if SHARK_LLVM_VERSION >= 25
+  unsigned char *allocateSpace(intptr_t Size,
+			       unsigned int Alignment);
+#endif
 };