diff options
| author | Richard Henderson <rth@redhat.com> | 2011-11-17 14:12:31 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2011-11-17 14:12:31 -0800 |
| commit | f6d9912f6b30e4880183dbafdc61cd3765269d2e (patch) | |
| tree | 2dbb4c7640ec3c6f80e878068b5361c6d99de243 /gcc | |
| parent | f631ae2eb17563cde864012b518c9ee5e28a64a1 (diff) | |
| download | gcc-f6d9912f6b30e4880183dbafdc61cd3765269d2e.zip gcc-f6d9912f6b30e4880183dbafdc61cd3765269d2e.tar.gz gcc-f6d9912f6b30e4880183dbafdc61cd3765269d2e.tar.bz2 | |
Merge branch 'rth/atomic/ppc'
From-SVN: r181459
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2368d46..1066aae 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -16,6 +16,12 @@ 2011-11-17 Richard Henderson <rth@redhat.com> + * config/rs6000/rs6000.c (rs6000_expand_atomic_compare_and_swap): Get + new pseudo for target after convert_modes. + (rs6000_expand_atomic_exchange, rs6000_expand_atomic_op): Likewise. + +2011-11-17 Richard Henderson <rth@redhat.com> + * builtins.c (expand_builtin_mem_thread_fence): Remove. (expand_builtin_mem_signal_fence): Remove. (expand_builtin_atomic_thread_fence): Use expand_mem_thread_fence. diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 89c2ea0..f01353b 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -17341,12 +17341,12 @@ rs6000_expand_atomic_compare_and_swap (rtx operands[]) /* Shift and mask OLDVAL into position with the word. */ oldval = convert_modes (SImode, mode, oldval, 1); oldval = expand_simple_binop (SImode, ASHIFT, oldval, shift, - oldval, 1, OPTAB_LIB_WIDEN); + NULL_RTX, 1, OPTAB_LIB_WIDEN); /* Shift and mask NEWVAL into position within the word. */ newval = convert_modes (SImode, mode, newval, 1); newval = expand_simple_binop (SImode, ASHIFT, newval, shift, - newval, 1, OPTAB_LIB_WIDEN); + NULL_RTX, 1, OPTAB_LIB_WIDEN); /* Prepare to adjust the return value. */ retval = gen_reg_rtx (SImode); @@ -17434,7 +17434,7 @@ rs6000_expand_atomic_exchange (rtx operands[]) /* Shift and mask VAL into position with the word. */ val = convert_modes (SImode, mode, val, 1); val = expand_simple_binop (SImode, ASHIFT, val, shift, - val, 1, OPTAB_LIB_WIDEN); + NULL_RTX, 1, OPTAB_LIB_WIDEN); /* Prepare to adjust the return value. */ retval = gen_reg_rtx (SImode); @@ -17487,7 +17487,7 @@ rs6000_expand_atomic_op (enum rtx_code code, rtx mem, rtx val, /* Shift and mask VAL into position with the word. */ val = convert_modes (SImode, mode, val, 1); val = expand_simple_binop (SImode, ASHIFT, val, shift, - val, 1, OPTAB_LIB_WIDEN); + NULL_RTX, 1, OPTAB_LIB_WIDEN); switch (code) { |