2009-11-11 Zoltan Varga <vargaz@gmail.com>

	* mini-llvm-cpp.cpp: Update to latest LLVM SVN.

svn path=/trunk/mono/; revision=145908

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 848782801e720bb5c875252c019156eec31c1d51..cfe8757765931dd9f9b1e06eb7b56261a7a14b59 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,7 @@
 2009-11-11  Zoltan Varga  <vargaz@gmail.com>
 
+       * mini-llvm-cpp.cpp: Update to latest LLVM SVN.
+
        * mini-llvm.c (mono_llvm_emit_method): Avoid creating plt entries for
        virtual calls.
 

diff --git a/mono/mini/mini-llvm-cpp.cpp b/mono/mini/mini-llvm-cpp.cpp
index 3e5056c329f9ec5d4143a96b08819989fa844dcc..4564a0540753c6afe9c0f7c9320d11ceb4dca3a7 100644 (file)
--- a/mono/mini/mini-llvm-cpp.cpp
+++ b/mono/mini/mini-llvm-cpp.cpp
@@ -67,16 +67,18 @@ public:
     unsigned char *getGOTBase() const {
                return mm->getGOTBase ();
     }
-    
+
+#if LLVM_MAJOR_VERSION == 2 && LLVM_MINOR_VERSION < 7
     void *getDlsymTable() const {
                return mm->getDlsymTable ();
     }
 
+       void SetDlsymTable(void *ptr);
+#endif
+
        void setPoisonMemory(bool) {
        }
-      
-       void SetDlsymTable(void *ptr);
-  
+
        unsigned char *startFunctionBody(const Function *F, 
                                                                         uintptr_t &ActualSize);
   
@@ -133,13 +135,15 @@ MonoJITMemoryManager::AllocateGOT()
 {
        mm->AllocateGOT ();
 }
-  
+
+#if LLVM_MAJOR_VERSION == 2 && LLVM_MINOR_VERSION < 7  
 void
 MonoJITMemoryManager::SetDlsymTable(void *ptr)
 {
        mm->SetDlsymTable (ptr);
 }
-  
+#endif
+
 unsigned char *
 MonoJITMemoryManager::startFunctionBody(const Function *F, 
                                        uintptr_t &ActualSize)