Mercurial > hg > release > icedtea7-2.6
changeset 2017:39216c0ef8bc
2009-08-21 Xerxes R?nby <xerxes@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.
| author | Xerxes R?nby <xerxes@zafena.se> |
|---|---|
| date | Fri, 21 Aug 2009 14:56:13 +0200 |
| parents | a5835d58e919 |
| children | 5c88e6546ce4 |
| files | ChangeLog ports/hotspot/src/share/vm/shark/sharkBuilder.cpp |
| diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 20 12:22:56 2009 +0200 +++ b/ChangeLog Fri Aug 21 14:56:13 2009 +0200 @@ -1,3 +1,11 @@ +2009-08-21 Xerxes Rånby <xerxes@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-20 Xerxes Rånby <xerxes@zafena.se> Adjust Shark to LLVM 2.6svn rev 79521.
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Aug 20 12:22:56 2009 +0200 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Fri Aug 21 14:56:13 2009 +0200 @@ -385,9 +385,9 @@ // perform these operations without delegating to a function. #ifdef ARM -static jint zero_cmpxchg_int(volatile jint *ptr, jint *oldval, jint newval) +static jint zero_cmpxchg_int(volatile jint *ptr, jint oldval, jint newval) { - return Atomic::cmpxchg(*newval, ptr, *oldval); + return Atomic::cmpxchg(newval, ptr, oldval); } #endif // ARM @@ -404,10 +404,10 @@ #ifdef ARM static intptr_t zero_cmpxchg_ptr(volatile intptr_t* ptr, - intptr_t* oldval, - intptr_t* newval) + intptr_t oldval, + intptr_t newval) { - return Atomic::cmpxchg_ptr(*newval, ptr, *oldval); + return Atomic::cmpxchg_ptr(newval, ptr, oldval); } #endif // ARM