i386: Backport gcc.dg/torture/tls/tls-reload-1.c fix from master

	* config/i386/i386.c (ix86_expand_move): Always assign to op1
	after eliminating TLS symbols.

From-SVN: r194883

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 069c169f11ec783a2f7537b8fe018c0e5ce10a48..b482394dfdcf16885114923716a69f33db2810b0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-03  Richard Henderson  <rth@redhat.com>
+
+       * config/i386/i386.c (ix86_expand_move): Always assign to op1
+       after eliminating TLS symbols.
+
 2013-01-02  Jason Merrill  <jason@redhat.com>
 
        PR c++/55804

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 0b20d2c124296dd69dd1a16f1783a89ca263de52..436fa4f4f9fc1dcecb37a4d08af53c0fba81f6d5 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -15523,9 +15523,9 @@ ix86_expand_move (enum machine_mode mode, rtx operands[])
       if (tmp)
        {
          tmp = force_operand (tmp, NULL);
-         tmp = expand_simple_binop (Pmode, PLUS, tmp, addend,
+         op1 = expand_simple_binop (Pmode, PLUS, tmp, addend,
                                     op0, 1, OPTAB_DIRECT);
-         if (tmp == op0)
+         if (op1 == op0)
            return;
        }
     }