* pe-dll.c (process_def_file_and_drectve): Don't handle VC

generated C++-symbols as stdcall/fastcall.
This commit is contained in:
Kai Tietz 2013-03-21 14:05:29 +00:00
parent 088ca6c1e3
commit 31fd86f1cf
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2013-03-21 Kai Tietz <ktietz@redhat.com>
* pe-dll.c (process_def_file_and_drectve): Don't handle VC
generated C++-symbols as stdcall/fastcall.
2013-03-18 Alan Modra <amodra@gmail.com>
* ld.texinfo (--as-needed): Update.

View File

@ -782,14 +782,17 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
{
for (i = 0; i < NE; i++)
{
if (strchr (pe_def_file->exports[i].name, '@'))
/* Check for fastcall/stdcall-decoration, but ignore
C++ mangled names. */
if (pe_def_file->exports[i].name[0] != '?'
&& strchr (pe_def_file->exports[i].name, '@'))
{
/* This will preserve internal_name, which may have been
pointing to the same memory as name, or might not
have. */
int lead_at = (*pe_def_file->exports[i].name == '@');
char *tmp = xstrdup (pe_def_file->exports[i].name + lead_at);
char *tmp_at = strchr (tmp, '@');
char *tmp_at = strrchr (tmp, '@');
if (tmp_at)
*tmp_at = 0;