/hg/icedtea: 2 new changesets

[xranby at icedtea.classpath.org]

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

	Correct suffix for the llvm.atomic.cmp.swap intrinsic.

	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.


changeset 90b892525f1b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=90b892525f1b
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Aug 05 14:12:08 2010 +0200

	Updated NEWS with correct suffix for the llvm.atomic.cmp.swap
	intrinsic fixes.

	2010-08-05 Xerxes R?nby <xerxes at zafena.se>

	 * NEWS: Updated with correct suffix for the
	llvm.atomic.cmp.swap intrinsic fixes.


diffstat:

3 files changed, 15 insertions(+), 2 deletions(-)
ChangeLog                                         |   12 ++++++++++++
NEWS                                              |    1 +
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp |    4 ++--

diffs (51 lines):

diff -r 56af4f9369ca -r 90b892525f1b ChangeLog
--- a/ChangeLog	Thu Aug 05 13:57:44 2010 +0200
+++ b/ChangeLog	Thu Aug 05 14:12:08 2010 +0200
@@ -1,3 +1,15 @@ 2010-08-05  Gary Benson  <gbenson at redhat
+2010-08-05  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* NEWS: Updated with correct suffix for the
+	llvm.atomic.cmp.swap intrinsic fixes.
+
+2010-08-05  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.
+
 2010-08-05  Gary Benson  <gbenson at redhat.com>
 
 	* NEWS: Updated with LLVM 2.7 non-product fixes.
diff -r 56af4f9369ca -r 90b892525f1b NEWS
--- a/NEWS	Thu Aug 05 13:57:44 2010 +0200
+++ b/NEWS	Thu Aug 05 14:12:08 2010 +0200
@@ -3,6 +3,7 @@ New in release 1.14 (XXXX-XX-XX)
 * Zero/Shark
   - Match Shark in icedtea6, makes OSR work by removing vestigal check.
   - LLVM 2.7 non-product fixes.
+  - Correct suffix for the llvm.atomic.cmp.swap intrinsic.
 
 New in release 1.13 (2010-07-29)
 
diff -r 56af4f9369ca -r 90b892525f1b ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Thu Aug 05 13:57:44 2010 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Thu Aug 05 14:12:08 2010 +0200
@@ -369,7 +369,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");
 }
@@ -387,7 +387,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");
 }