changeset in /hg/icedtea6: 2009-07-14 Xerxes R?nby <xerxes at zaf...

[Xerxes R?nby]

changeset b788f2c0fe74 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b788f2c0fe74
description:
	2009-07-14  Xerxes R?nby  <xerxes at 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.

diffstat:

2 files changed, 16 insertions(+), 2 deletions(-)
ChangeLog                                      |    8 ++++++++
ports/hotspot/src/share/vm/shark/llvmValue.hpp |   10 ++++++++--

diffs (47 lines):

diff -r 96da5a90598a -r b788f2c0fe74 ChangeLog
--- 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-13  Omair Majid  <omajid at redhat.
+2009-07-14  Xerxes RÃ¥nby  <xerxes at 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 at redhat.com>
 
 	* rt/net/sourceforge/jnlp/JNLPFile.java
diff -r 96da5a90598a -r b788f2c0fe74 ports/hotspot/src/share/vm/shark/llvmValue.hpp
--- 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 @@ class LLVMValue : public AllStatic {
   }
 #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());