changeset in /hg/icedtea: Shark merge.

[Andrew John Hughes]

changeset dc69eba97b21 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dc69eba97b21
description:
	Shark merge.

	2009-04-29  Matthias Klose  <doko at ubuntu.com>
		    Xerxes R?nby  <xerxes at 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.

diffstat:

3 files changed, 39 insertions(+)
ChangeLog                                               |    9 ++++++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp |   21 +++++++++++++++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |    9 ++++++

diffs (67 lines):

diff -r 7ecb9ff6ed05 -r dc69eba97b21 ChangeLog
--- a/ChangeLog	Tue May 05 13:30:07 2009 +0200
+++ b/ChangeLog	Tue May 19 16:23:38 2009 +0100
@@ -8,6 +8,15 @@ 2009-05-05 Xerxes RÃ¥nby <xerxes at zafena.
 
 	* configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from
 	SHARK_LLVM_VERSION.
+
+2009-04-29  Matthias Klose  <doko at ubuntu.com>
+	    Xerxes RÃ¥nby  <xerxes at 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 at redhat.com>
 
diff -r 7ecb9ff6ed05 -r dc69eba97b21 ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
--- 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 @@ void SharkMemoryManager::deallocateMemFo
 {
   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
diff -r 7ecb9ff6ed05 -r dc69eba97b21 ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
--- 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 @@ class SharkMemoryManager : public llvm::
                          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
 };