From 9f774cb03aa6d4d020fb1bb711a84f987bd5e42b Mon Sep 17 00:00:00 2001 From: SUGIOKA Toshinobu Date: Mon, 3 Aug 2009 19:33:16 +0900 Subject: [PATCH] linux-atomic.asm (ATOMIC_COMPARE_AND_SWAP): Rename __sync_compare_and_swap_* to __sync_val_compare_and_swap_*. * config/sh/linux-atomic.asm (ATOMIC_COMPARE_AND_SWAP): Rename __sync_compare_and_swap_* to __sync_val_compare_and_swap_*. From-SVN: r150371 --- gcc/ChangeLog | 5 +++++ gcc/config/sh/linux-atomic.asm | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ee8af4f..965beac 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2009-08-03 SUGIOKA Toshinobu + + * config/sh/linux-atomic.asm (ATOMIC_COMPARE_AND_SWAP): Rename + __sync_compare_and_swap_* to __sync_val_compare_and_swap_*. + 2009-08-03 Richard Guenther * tree.c (make_vector_type): Build a main variant first, diff --git a/gcc/config/sh/linux-atomic.asm b/gcc/config/sh/linux-atomic.asm index fd3a772..04b7d50 100644 --- a/gcc/config/sh/linux-atomic.asm +++ b/gcc/config/sh/linux-atomic.asm @@ -54,10 +54,10 @@ ATOMIC_TEST_AND_SET (2,w,extu.w) ATOMIC_TEST_AND_SET (4,l,mov) #define ATOMIC_COMPARE_AND_SWAP(N,T,EXTS,EXT) \ - .global __sync_compare_and_swap_##N; \ - HIDDEN_FUNC(__sync_compare_and_swap_##N); \ + .global __sync_val_compare_and_swap_##N; \ + HIDDEN_FUNC(__sync_val_compare_and_swap_##N); \ .align 2; \ -__sync_compare_and_swap_##N:; \ +__sync_val_compare_and_swap_##N:; \ mova 1f, r0; \ EXTS r5, r5; \ mov r15, r1; \ @@ -69,7 +69,7 @@ __sync_compare_and_swap_##N:; \ 1: mov r1, r15; \ rts; \ EXT r2, r0; \ - ENDFUNC(__sync_compare_and_swap_##N) + ENDFUNC(__sync_val_compare_and_swap_##N) ATOMIC_COMPARE_AND_SWAP (1,b,exts.b,extu.b) ATOMIC_COMPARE_AND_SWAP (2,w,exts.w,extu.w) -- 2.7.4