From: Richard Henderson <rth@redhat.com>
Date: Fri, 4 Jan 2013 04:19:44 +0000 (-0800)
Subject: i386: Backport gcc.dg/torture/tls/tls-reload-1.c fix from master
X-Git-Tag: releases/gcc-4.6.4~211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae222e0c186ceeea35470ada10e035dff9543069;p=thirdparty%2Fgcc.git

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 069c169f11ec..b482394dfdcf 100644
--- 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 0b20d2c12429..436fa4f4f9fc 100644
--- 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;
 	}
     }