From: Mark Mitchell <mark@codesourcery.com>
Date: Mon, 21 Apr 2003 23:23:39 +0000 (+0000)
Subject: winnt.c (i386_pe_mark_dllimport): Revert previous changes.
X-Git-Tag: releases/gcc-3.4.0~7107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bfc6c67ed6b61266991c4135de2b3c13c3c28ea3;p=thirdparty%2Fgcc.git

winnt.c (i386_pe_mark_dllimport): Revert previous changes.

	* config/i386/winnt.c (i386_pe_mark_dllimport): Revert previous
	changes.

From-SVN: r65920
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e206768d61f1..faad4e5b0bc2 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): Revert previous
+	changes.
+
 2003-04-21  Aldy Hernandez  <aldyh@redhat.com>
 
         * config/rs6000/rs6000.c (rs6000_override_options): No SPE means
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index dc2ac7a80a66..c2eac3ac7e2d 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -273,8 +273,7 @@ i386_pe_mark_dllimport (decl)
   const char *oldname;
   char  *newname;
   tree idp;
-  rtx rtlname;
-  rtx new_symbol;
+  rtx rtlname, newrtl;
 
   rtlname = XEXP (DECL_RTL (decl), 0);
   if (GET_CODE (rtlname) == SYMBOL_REF)
@@ -336,11 +335,10 @@ i386_pe_mark_dllimport (decl)
      identical.  */
   idp = get_identifier (newname);
 
-  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);
+  newrtl = gen_rtx (MEM, Pmode,
+		    gen_rtx (SYMBOL_REF, Pmode,
+			     IDENTIFIER_POINTER (idp)));
+  XEXP (DECL_RTL (decl), 0) = newrtl;
 
   /* Can't treat a pointer to this as a constant address */
   DECL_NON_ADDR_CONST_P (decl) = 1;