2009-11-15 Kai Tietz <kai.tietz@onevision.com>

[thirdparty/binutils-gdb.git] / ld / emultempl / pep.em

diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index a7ea8e110a0a2d87cb8597ad5ca73069e88a9239..753f4252d1690b470315fcc56ecfbee666a2b454 100644 (file)
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -871,10 +871,13 @@ pep_undef_cdecl_match (struct bfd_link_hash_entry *h, void *inf)
 {
   int sl;
   char *string = inf;
+  const char *hs = h->root.string;
 
   sl = strlen (string);
   if (h->type == bfd_link_hash_defined
-      && strncmp (h->root.string, string, sl) == 0
+      && ((*hs == '@' && *string == '_'
+                  && strncmp (hs + 1, string + 1, sl - 1) == 0)
+                 || strncmp (hs, string, sl) == 0)
       && h->root.string[sl] == '@')
     {
       pep_undef_found_sym = h;
@@ -897,15 +900,19 @@ pep_fixup_stdcalls (void)
       {
        char* at = strchr (undef->root.string, '@');
        int lead_at = (*undef->root.string == '@');
-       /* For now, don't try to fixup fastcall symbols.  */
-
-       if (at && !lead_at)
+       if (lead_at)
+         at = strchr (undef->root.string + 1, '@');
+       if (at || lead_at)
          {
            /* The symbol is a stdcall symbol, so let's look for a
               cdecl symbol with the same name and resolve to that.  */
-           char *cname = xstrdup (undef->root.string /* + lead_at */);
+           char *cname = xstrdup (undef->root.string);
+
+           if (lead_at)
+             *cname = '_';
            at = strchr (cname, '@');
-           *at = 0;
+           if (at)
+             *at = 0;
            sym = bfd_link_hash_lookup (link_info.hash, cname, 0, 0, 1);
 
            if (sym && sym->type == bfd_link_hash_defined)
@@ -1179,6 +1186,11 @@ gld_${EMULATION_NAME}_after_open (void)
 
   pep_find_data_imports ();
 
+  /* As possibly new symbols are added by imports, we rerun
+     stdcall/fastcall fixup here.  */
+  if (pep_enable_stdcall_fixup) /* -1=warn or 1=disable */
+    pep_fixup_stdcalls ();
+
 #ifndef TARGET_IS_i386pep
   if (link_info.shared)
 #else