aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2003-04-21 23:23:39 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2003-04-21 23:23:39 +0000
commitbfc6c67ed6b61266991c4135de2b3c13c3c28ea3 (patch)
tree390aa29bb5ae8192066af63ae6241b1b82a79271
parent4f0baa737f2e56b78f81f07efb9c2a55111edfe3 (diff)
downloadgcc-bfc6c67ed6b61266991c4135de2b3c13c3c28ea3.zip
gcc-bfc6c67ed6b61266991c4135de2b3c13c3c28ea3.tar.gz
gcc-bfc6c67ed6b61266991c4135de2b3c13c3c28ea3.tar.bz2
winnt.c (i386_pe_mark_dllimport): Revert previous changes.
* config/i386/winnt.c (i386_pe_mark_dllimport): Revert previous changes. From-SVN: r65920
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/i386/winnt.c12
2 files changed, 10 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e206768..faad4e5 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 dc2ac7a..c2eac3a 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;