Merge branch 'rth/atomic/ppc'

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181459 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2368d46..1066aae 100644 (file)
--- 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 (file)
--- 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)
        {