From c7d0307027c14f6d4e64692118df456fbd6dd6e5 Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Wed, 28 Sep 2005 22:46:48 +0000 Subject: 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 --- libjava/sysdep/powerpc/locks.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/sysdep') 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"); -- cgit v1.1