diff options
| author | Geoffrey Keating <geoffk@apple.com> | 2005-09-28 22:46:48 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2005-09-28 22:46:48 +0000 |
| commit | c7d0307027c14f6d4e64692118df456fbd6dd6e5 (patch) | |
| tree | faf724ba881bcb1a272116fb9caed07bfefc1341 | |
| parent | 107bcc113333f47bc389c0e7bca28671fa8874ff (diff) | |
| download | gcc-c7d0307027c14f6d4e64692118df456fbd6dd6e5.zip gcc-c7d0307027c14f6d4e64692118df456fbd6dd6e5.tar.gz gcc-c7d0307027c14f6d4e64692118df456fbd6dd6e5.tar.bz2 | |
locks.h: Use 64-bit versions of primitives when __LP64__ is defined rather than...
* sysdep/powerpc/locks.h: Use 64-bit versions of primitives when
__LP64__ is defined rather than __powerpc64__.
(compare_and_swap): 'ret' is an obj_addr_t not just an int.
(compare_and_swap_release): Likewise.
From-SVN: r104746
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/sysdep/powerpc/locks.h | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7cfe8f3f..8f881c9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2005-09-28 Geoffrey Keating <geoffk@apple.com> + + * sysdep/powerpc/locks.h: Use 64-bit versions of primitives when + __LP64__ is defined rather than __powerpc64__. + (compare_and_swap): 'ret' is an obj_addr_t not just an int. + (compare_and_swap_release): Likewise. + 2005-09-28 David Daney <ddaney@avtrex.com> * HACKING: Update instructions for classpath import. diff --git a/libjava/sysdep/powerpc/locks.h b/libjava/sysdep/powerpc/locks.h index 5a6a945..fe4f01e 100644 --- a/libjava/sysdep/powerpc/locks.h +++ b/libjava/sysdep/powerpc/locks.h @@ -11,7 +11,7 @@ details. */ #ifndef __SYSDEP_LOCKS_H__ #define __SYSDEP_LOCKS_H__ -#ifdef __powerpc64__ +#ifdef __LP64__ #define _LARX "ldarx " #define _STCX "stdcx. " #else @@ -30,7 +30,7 @@ inline static bool compare_and_swap (volatile obj_addr_t *addr, obj_addr_t old, obj_addr_t new_val) { - int ret; + obj_addr_t ret; __asm__ __volatile__ ( "0: " _LARX "%0,0,%1 \n" @@ -62,7 +62,7 @@ inline static bool compare_and_swap_release (volatile obj_addr_t *addr, obj_addr_t old, obj_addr_t new_val) { - int ret; + obj_addr_t ret; __asm__ __volatile__ ("sync" : : : "memory"); |