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

	generated C++-symbols as stdcall/fastcall.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9d5a23dc484031c232bf3f3976ea50f4f02cb69a..e73314721bc34f863be3ec1fef6a60223aafc723 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -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.

diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index 76a1ce3d256523970c6c1b2e0ad7d7cd10c1c380..bd3195f41d772e487e96c7306c529532bbcbc35a 100644 (file)
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -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;