From bfc6c67ed6b61266991c4135de2b3c13c3c28ea3 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Mon, 21 Apr 2003 23:23:39 +0000 Subject: [PATCH] winnt.c (i386_pe_mark_dllimport): Revert previous changes. * config/i386/winnt.c (i386_pe_mark_dllimport): Revert previous changes. From-SVN: r65920 --- gcc/ChangeLog | 5 +++++ gcc/config/i386/winnt.c | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e206768d61f..faad4e5b0bc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2003-04-21 Mark Mitchell + + * config/i386/winnt.c (i386_pe_mark_dllimport): Revert previous + changes. + 2003-04-21 Aldy Hernandez * 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 dc2ac7a80a6..c2eac3ac7e2 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; -- 2.30.2