changeset in /hg/icedtea6: 2009-04-29 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset c7860ca7b19e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c7860ca7b19e
description:
	2009-04-29  Matthias Klose  <doko at ubuntu.com>
	            Xerxes R<C3><A5>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:

4 files changed, 40 insertions(+)
ChangeLog                                               |    9 ++++++
configure.ac                                            |    1 
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp |   21 +++++++++++++++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |    9 ++++++

diffs (75 lines):

diff -r 9d89e1ada1c8 -r c7860ca7b19e ChangeLog
--- a/ChangeLog	Wed Apr 29 16:01:07 2009 +0200
+++ b/ChangeLog	Wed Apr 29 16:11:25 2009 +0200
@@ -1,3 +1,12 @@ 2009-04-29  Mark Wielaard  <mjw at redhat.c
+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-04-29  Mark Wielaard  <mjw at redhat.com>
 
 	* README: Document systemtap support.
diff -r 9d89e1ada1c8 -r c7860ca7b19e configure.ac
--- a/configure.ac	Wed Apr 29 16:01:07 2009 +0200
+++ b/configure.ac	Wed Apr 29 16:11:25 2009 +0200
@@ -523,6 +523,7 @@ if test "x${SHARK_BUILD_TRUE}" = x; then
   LLVM_CFLAGS=`$LLVM_CONFIG --cflags $llvm_components | \
     sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \
     sed -e 's/-D_DEBUG//g'`
+  LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//'`"
   LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags $llvm_components`
   LLVM_LIBS=`$LLVM_CONFIG --libs $llvm_components`
 fi
diff -r 9d89e1ada1c8 -r c7860ca7b19e ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Wed Apr 29 16:01:07 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Wed Apr 29 16:11:25 2009 +0200
@@ -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 9d89e1ada1c8 -r c7860ca7b19e ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Wed Apr 29 16:01:07 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Wed Apr 29 16:11:25 2009 +0200
@@ -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
 };