From: rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 3 Jan 2013 23:26:13 +0000 (+0000)
Subject: i386: Fix gcc.dg/torture/tls/tls-reload-1.c
X-Git-Tag: upstream/4.9.2~8310
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c7f699347d950f2442eec8a562acb208657a019;p=platform%2Fupstream%2Flinaro-gcc.git

i386: Fix gcc.dg/torture/tls/tls-reload-1.c

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

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80bfc2f..f27a56b 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-03  Marc Glisse  <marc.glisse@inria.fr>
 
 	PR bootstrap/50167
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 60f68d4..6dffe14 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -1,6 +1,6 @@
 /* Subroutines used for code generation on IA-32.
-   Copyright (C) 1988, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+   Copyright (C) 1988, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -15960,8 +15960,7 @@ ix86_expand_move (enum machine_mode mode, rtx operands[])
 				     op0, 1, OPTAB_DIRECT);
 	  if (tmp == op0)
 	    return;
-	  if (GET_MODE (tmp) != mode)
-	    op1 = convert_to_mode (mode, tmp, 1);
+	  op1 = convert_to_mode (mode, tmp, 1);
 	}
     }