changeset 1636:b788f2c0fe74

2009-07-14 Xerxes R?nby <xerxes@zafena.se> * ports/hotspot/src/share/vm/shark/llvmValue.hpp (jfloat_constant): Handle LLVM 2.6 svn r75546 API change. llvm::ConstantFP::get have been moved to llvm::LLVMContext::getConstantFP. (jdouble_constant): Likewise.
author Xerxes R?nby <xerxes@zafena.se>
date Tue, 14 Jul 2009 12:55:48 +0200
parents 96da5a90598a
children dae4c1447578
files ChangeLog ports/hotspot/src/share/vm/shark/llvmValue.hpp
diffstat 2 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jul 13 15:22:34 2009 -0400
+++ b/ChangeLog	Tue Jul 14 12:55:48 2009 +0200
@@ -1,3 +1,11 @@
+2009-07-14  Xerxes RĂ„nby  <xerxes@zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/llvmValue.hpp
+	(jfloat_constant): Handle LLVM 2.6 svn r75546 API change.
+	llvm::ConstantFP::get have been moved to
+	llvm::LLVMContext::getConstantFP.
+	(jdouble_constant): Likewise.
+
 2009-07-13  Omair Majid  <omajid@redhat.com>
 
 	* rt/net/sourceforge/jnlp/JNLPFile.java
--- a/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Mon Jul 13 15:22:34 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Tue Jul 14 12:55:48 2009 +0200
@@ -39,20 +39,26 @@
   }
 #if SHARK_LLVM_VERSION >= 26
   static llvm::Constant* jfloat_constant(jfloat value)
+  {
+    return llvm::getGlobalContext().getConstantFP(SharkType::jfloat_type(), value); 
+  }
 #else
   static llvm::ConstantFP* jfloat_constant(jfloat value)
-#endif
   {
     return llvm::ConstantFP::get(SharkType::jfloat_type(), value);
   }
+#endif
 #if SHARK_LLVM_VERSION >= 26
   static llvm::Constant* jdouble_constant(jdouble value)
+  {
+    return llvm::getGlobalContext().getConstantFP(SharkType::jdouble_type(), value);
+  }
 #else
   static llvm::ConstantFP* jdouble_constant(jdouble value)
-#endif
   {
     return llvm::ConstantFP::get(SharkType::jdouble_type(), value);
   }
+#endif
   static llvm::ConstantPointerNull* null()
   {
     return llvm::ConstantPointerNull::get(SharkType::jobject_type());