From: Mark Mitchell <mark@codesourcery.com>
Date: Mon, 21 Apr 2003 15:20:39 +0000 (+0000)
Subject: winnt.c (i386_pe_mark_dllimport): Make the new RTL have the same form as the old... 
X-Git-Tag: releases/gcc-3.4.0~7129
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3819b963dc052accf5bcd51f16ac763b168901b0;p=thirdparty%2Fgcc.git

winnt.c (i386_pe_mark_dllimport): Make the new RTL have the same form as the old RTL.

	* config/i386/winnt.c (i386_pe_mark_dllimport): Make the new RTL
	have the same form as the old RTL.

From-SVN: r65885
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef0ad87aa500..fecac218bf5a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-21  Mark Mitchell  <mark@codesourcery.com>
+
+	* config/i386/winnt.c (i386_pe_mark_dllimport): Make the new RTL
+	have the same form as the old RTL.
+
 2003-04-21  Andreas Jaeger  <aj@suse.de>
 
         * cppcharset.c (_cpp_valid_ucn): Cast field precision to int.
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index ee3448da339d..dc2ac7a80a66 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -274,6 +274,7 @@ i386_pe_mark_dllimport (decl)
   char  *newname;
   tree idp;
   rtx rtlname;
+  rtx new_symbol;
 
   rtlname = XEXP (DECL_RTL (decl), 0);
   if (GET_CODE (rtlname) == SYMBOL_REF)
@@ -335,8 +336,11 @@ i386_pe_mark_dllimport (decl)
      identical.  */
   idp = get_identifier (newname);
 
-  XEXP (DECL_RTL (decl), 0) 
-    = gen_rtx_SYMBOL_REF (Pmode, IDENTIFIER_POINTER (idp));
+  new_symbol = gen_rtx_SYMBOL_REF (Pmode, IDENTIFIER_POINTER (idp));
+  XEXP (DECL_RTL (decl), 0)
+    = ((GET_CODE (XEXP (DECL_RTL (decl), 0)) == MEM)
+       ? gen_rtx (MEM, Pmode, new_symbol)
+       : new_symbol);
 
   /* Can't treat a pointer to this as a constant address */
   DECL_NON_ADDR_CONST_P (decl) = 1;