/hg/icedtea6: 2009-11-06 Xerxes R?nby <xerxes at zafena.se>

[xranby at icedtea.classpath.org]

changeset b7141f77eb4d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b7141f77eb4d
author: Xerxes R?nby <xerxes at zafena.se>
date: Fri Nov 06 13:03:15 2009 +0100

	2009-11-06 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
	(SharkBuilder::cmpxchg_int): Correct suffix for the
	llvm.atomic.cmp.swap intrinsic. (SharkBuilder::cmpxchg_ptr):
	Likewise.


diffstat:

2 files changed, 9 insertions(+), 2 deletions(-)
ChangeLog                                         |    7 +++++++
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp |    4 ++--

diffs (35 lines):

diff -r d966ce93b58b -r b7141f77eb4d ChangeLog
--- a/ChangeLog	Thu Nov 05 23:24:59 2009 +0100
+++ b/ChangeLog	Fri Nov 06 13:03:15 2009 +0100
@@ -1,3 +1,10 @@ 2009-11-05 Martin Matejovic <mmatejov at re
+2009-11-06  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(SharkBuilder::cmpxchg_int): Correct suffix for the
+	llvm.atomic.cmp.swap intrinsic.
+	(SharkBuilder::cmpxchg_ptr): Likewise.
+
 2009-11-05 Martin Matejovic <mmatejov at redhat.com>
 	* patches/security/icedtea-6631533.patch
 	* patches/security/icedtea-6632445.patch
diff -r d966ce93b58b -r b7141f77eb4d ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Thu Nov 05 23:24:59 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Fri Nov 06 13:03:15 2009 +0100
@@ -402,7 +402,7 @@ Value* SharkBuilder::cmpxchg_int()
 #ifdef ARM
     (address) zero_cmpxchg_int,
 #else
-    "llvm.atomic.cmp.swap.i32",
+    "llvm.atomic.cmp.swap.i32.p0i32",
 #endif // ARM
     "Iii", "i");
 }
@@ -422,7 +422,7 @@ Value* SharkBuilder::cmpxchg_ptr()
 #ifdef ARM
     (address) zero_cmpxchg_ptr,
 #else
-    "llvm.atomic.cmp.swap.i" LP64_ONLY("64") NOT_LP64("32"),
+    "llvm.atomic.cmp.swap.i" LP64_ONLY("64") NOT_LP64("32") ".p0i" LP64_ONLY("64") NOT_LP64("32"),
 #endif // ARM
     "Xxx", "x");
 }