diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2007-09-11 01:38:40 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@gcc.gnu.org> | 2007-09-11 01:38:40 +0000 |
| commit | e599ac2befed1db5ce12c92dd8ba0099175c8bd5 (patch) | |
| tree | fdccbf43d608b52fefc69ac99783511b8a32540b /gcc | |
| parent | f3d110ef046e4dd98a82ba8a6365427181c16b1e (diff) | |
| download | gcc-e599ac2befed1db5ce12c92dd8ba0099175c8bd5.zip gcc-e599ac2befed1db5ce12c92dd8ba0099175c8bd5.tar.gz gcc-e599ac2befed1db5ce12c92dd8ba0099175c8bd5.tar.bz2 | |
cygming.h (TARGET_STRIP_NAME_ENCODING): Don't override default.
* config/i386/cygming.h (TARGET_STRIP_NAME_ENCODING): Don't
override default.
* config/i386/i386.c (get_dllimport_decl): Don't strip
FASTCALL_PREFIX.
From-SVN: r128362
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/i386/cygming.h | 2 | ||||
| -rw-r--r-- | gcc/config/i386/i386.c | 9 |
3 files changed, 8 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2ed812c..e550713 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2007-09-11 Danny Smith <dannysmith@users.sourceforge.net> + + * config/i386/cygming.h (TARGET_STRIP_NAME_ENCODING): Don't + override default. + * config/i386/i386.c (get_dllimport_decl): Don't strip + FASTCALL_PREFIX. + 2007-09-10 Janis Johnson <janis187@us.ibm.com> PR c/30013 diff --git a/gcc/config/i386/cygming.h b/gcc/config/i386/cygming.h index d0968e3..6b1c136 100644 --- a/gcc/config/i386/cygming.h +++ b/gcc/config/i386/cygming.h @@ -183,8 +183,6 @@ do { \ Note that we can be called twice on the same decl. */ #define SUBTARGET_ENCODE_SECTION_INFO i386_pe_encode_section_info -#undef TARGET_STRIP_NAME_ENCODING -#define TARGET_STRIP_NAME_ENCODING i386_pe_strip_name_encoding_full /* Output a common block. */ #undef ASM_OUTPUT_ALIGNED_DECL_COMMON diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index ce7c19b..57fb628 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -7820,14 +7820,7 @@ get_dllimport_decl (tree decl) name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl)); name = targetm.strip_name_encoding (name); - if (name[0] == FASTCALL_PREFIX) - { - name++; - prefix = "*__imp_"; - } - else - prefix = "*__imp__"; - + prefix = name[0] == FASTCALL_PREFIX ? "*__imp_": "*__imp__"; namelen = strlen (name); prefixlen = strlen (prefix); imp_name = (char *) alloca (namelen + prefixlen + 1); |