/hg/release/icedtea6-1.6: 2009-08-21 Xerxes R?nby <xerxes at zafe...

[cpdev-commits at icedtea.classpath.org]

changeset 4e8a939956f5 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=4e8a939956f5
summary: 2009-08-21  Xerxes R?nby  <xerxes at zafena.se>

diffstat:

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

diffs (46 lines):

diff -r 3bb4b0a830b3 -r 4e8a939956f5 ChangeLog
--- a/ChangeLog	Fri Aug 21 09:55:52 2009 +0200
+++ b/ChangeLog	Fri Aug 21 15:42:56 2009 +0200
@@ -1,3 +1,11 @@ 2009-08-21  Matthias Klose  <doko at ubuntu
+2009-08-21  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	*ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(zero_cmpxchg_int): Updated method to match current Shark
+	and LLVM atomic calling convention.
+	Fixes compilation error and logic for ARM.
+	(zero_cmpxchg_ptr): Likewise.
+
 2009-08-21  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am (stamps/hotspot-tools-class-files.stamp,
diff -r 3bb4b0a830b3 -r 4e8a939956f5 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Fri Aug 21 09:55:52 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Fri Aug 21 15:42:56 2009 +0200
@@ -385,9 +385,9 @@ Value* SharkBuilder::uncommon_trap()
 // perform these operations without delegating to a function.
 
 #ifdef ARM
-static jint zero_cmpxchg_int(volatile jint *ptr, jint *oldval, jint newval)
-{
-  return Atomic::cmpxchg(*newval, ptr, *oldval);
+static jint zero_cmpxchg_int(volatile jint *ptr, jint oldval, jint newval)
+{
+  return Atomic::cmpxchg(newval, ptr, oldval);
 }
 #endif // ARM
 
@@ -404,10 +404,10 @@ Value* SharkBuilder::cmpxchg_int()
 
 #ifdef ARM
 static intptr_t zero_cmpxchg_ptr(volatile intptr_t* ptr,
-                                 intptr_t*          oldval,
-                                 intptr_t*          newval)
-{
-  return Atomic::cmpxchg_ptr(*newval, ptr, *oldval);
+                                 intptr_t           oldval,
+                                 intptr_t           newval)
+{
+  return Atomic::cmpxchg_ptr(newval, ptr, oldval);
 }
 #endif // ARM