Changeset 609 for branches/GNU/src/binutils/ld/pe-dll.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/ld/pe-dll.c (modified) (100 diffs, 1 prop)

branches/GNU/src/binutils/ld/pe-dll.c

@@ -1 +1 @@
 /* Routines to help build PEI-format DLLs (Win32 etc)
-   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Written by DJ Delorie <dj@cygnus.com>
 
@@ -24 +24 @@
 #include "bfdlink.h"
 #include "libiberty.h"
+#include "safe-ctype.h"
 
 #include <time.h>
-#include <ctype.h>
 
 #include "ld.h"
@@ -33 +33 @@
 #include "ldwrite.h"
 #include "ldmisc.h"
-#include "ldgram.h"
+#include <ldgram.h>
 #include "ldmain.h"
 #include "ldfile.h"
@@ -42 +42 @@
 #include "pe-dll.h"
 
-/************************************************************************
-
- This file turns a regular Windows PE image into a DLL.  Because of
- the complexity of this operation, it has been broken down into a
- number of separate modules which are all called by the main function
- at the end of this file.  This function is not re-entrant and is
- normally only called once, so static variables are used to reduce
- the number of parameters and return values required.
-
- See also: ld/emultempl/pe.em
-
- ************************************************************************/
-
-/* for emultempl/pe.em */
-
-def_file *pe_def_file = 0;
+/*  This file turns a regular Windows PE image into a DLL.  Because of
+    the complexity of this operation, it has been broken down into a
+    number of separate modules which are all called by the main function
+    at the end of this file.  This function is not re-entrant and is
+    normally only called once, so static variables are used to reduce
+    the number of parameters and return values required.
+
+    See also: ld/emultempl/pe.em.  */
+
+/*  Auto-import feature by Paul Sokolovsky
+
+    Quick facts:
+
+    1. With this feature on, DLL clients can import variables from DLL
+    without any concern from their side (for example, without any source
+    code modifications).
+
+    2. This is done completely in bounds of the PE specification (to be fair,
+    there's a place where it pokes nose out of, but in practice it works).
+    So, resulting module can be used with any other PE compiler/linker.
+
+    3. Auto-import is fully compatible with standard import method and they
+    can be mixed together.
+
+    4. Overheads: space: 8 bytes per imported symbol, plus 20 for each
+    reference to it; load time: negligible; virtual/physical memory: should be
+    less than effect of DLL relocation, and I sincerely hope it doesn't affect
+    DLL sharability (too much).
+
+    Idea
+
+    The obvious and only way to get rid of dllimport insanity is to make client
+    access variable directly in the DLL, bypassing extra dereference. I.e.,
+    whenever client contains something like
+
+    mov dll_var,%eax,
+
+    address of dll_var in the command should be relocated to point into loaded
+    DLL. The aim is to make OS loader do so, and than make ld help with that.
+    Import section of PE made following way: there's a vector of structures
+    each describing imports from particular DLL. Each such structure points
+    to two other parallel vectors: one holding imported names, and one which
+    will hold address of corresponding imported name. So, the solution is
+    de-vectorize these structures, making import locations be sparse and
+    pointing directly into code. Before continuing, it is worth a note that,
+    while authors strives to make PE act ELF-like, there're some other people
+    make ELF act PE-like: elfvector, ;-) .
+
+    Implementation
+
+    For each reference of data symbol to be imported from DLL (to set of which
+    belong symbols with name <sym>, if __imp_<sym> is found in implib), the
+    import fixup entry is generated. That entry is of type
+    IMAGE_IMPORT_DESCRIPTOR and stored in .idata$3 subsection. Each
+    fixup entry contains pointer to symbol's address within .text section
+    (marked with __fuN_<sym> symbol, where N is integer), pointer to DLL name
+    (so, DLL name is referenced by multiple entries), and pointer to symbol
+    name thunk. Symbol name thunk is singleton vector (__nm_th_<symbol>)
+    pointing to IMAGE_IMPORT_BY_NAME structure (__nm_<symbol>) directly
+    containing imported name. Here comes that "om the edge" problem mentioned
+    above: PE specification rambles that name vector (OriginalFirstThunk)
+    should run in parallel with addresses vector (FirstThunk), i.e. that they
+    should have same number of elements and terminated with zero. We violate
+    this, since FirstThunk points directly into machine code. But in practice,
+    OS loader implemented the sane way: it goes thru OriginalFirstThunk and
+    puts addresses to FirstThunk, not something else. It once again should be
+    noted that dll and symbol name structures are reused across fixup entries
+    and should be there anyway to support standard import stuff, so sustained
+    overhead is 20 bytes per reference. Other question is whether having several
+    IMAGE_IMPORT_DESCRIPTORS for the same DLL is possible. Answer is yes, it is
+    done even by native compiler/linker (libth32's functions are in fact reside
+    in windows9x kernel32.dll, so if you use it, you have two
+    IMAGE_IMPORT_DESCRIPTORS for kernel32.dll). Yet other question is whether
+    referencing the same PE structures several times is valid. The answer is why
+    not, prohibiting that (detecting violation) would require more work on
+    behalf of loader than not doing it.
+
+    See also: ld/emultempl/pe.em.  */
+
+static void
+add_bfd_to_link PARAMS ((bfd *, const char *, struct bfd_link_info *));
+
+/* For emultempl/pe.em.  */
+
+def_file * pe_def_file = 0;
 int pe_dll_export_everything = 0;
 int pe_dll_do_default_excludes = 1;
@@ -64 +133 @@
 int pe_dll_warn_dup_exports = 0;
 int pe_dll_compat_implib = 0;
-
-/************************************************************************
-
- static variables and types
-
- ************************************************************************/
+int pe_dll_extra_pe_debug = 0;
+
+/* Static variables and types.  */
 
 static bfd_vma image_base;
-
 static bfd *filler_bfd;
 static struct sec *edata_s, *reloc_s;
 static unsigned char *edata_d, *reloc_d;
 static size_t edata_sz, reloc_sz;
-
-typedef struct {
-  char *target_name;
-  char *object_target;
-  unsigned int imagebase_reloc;
-  int pe_arch;
-  int bfd_arch;
-  int underscored;
-} pe_details_type;
+static int runtime_pseudo_relocs_created = 0;
+
+typedef struct
+  {
+    char *target_name;
+    char *object_target;
+    unsigned int imagebase_reloc;
+    int pe_arch;
+    int bfd_arch;
+    int underscored;
+  }
+pe_details_type;
+
+typedef struct
+  {
+    char *name;
+    int len;
+  }
+autofilter_entry_type;
 
 #define PE_ARCH_i386    1
@@ -91 +166 @@
 #define PE_ARCH_mips    3
 #define PE_ARCH_arm     4
-
-static pe_details_type pe_detail_list[] = {
+#define PE_ARCH_arm_epoc 5
+
+static pe_details_type pe_detail_list[] =
+{
   {
     "pei-i386",
@@ -123 +200 @@
     PE_ARCH_arm,
     bfd_arch_arm,
+    1
+  },
+  {
+    "epoc-pei-arm-little",
+    "epoc-pe-arm-little",
+    11 /* ARM_RVA32 */,
+    PE_ARCH_arm_epoc,
+    bfd_arch_arm,
     0
   },
@@ -130 +215 @@
 static pe_details_type *pe_details;
 
+static autofilter_entry_type autofilter_symbollist[] =
+{
+  { "DllMain@12", 10 },
+  { "DllEntryPoint@0", 15 },
+  { "DllMainCRTStartup@12", 20 },
+  { "_cygwin_dll_entry@12", 20 },
+  { "_cygwin_crt0_common@8", 21 },
+  { "_cygwin_noncygwin_dll_entry@12", 30 },
+  { "impure_ptr", 10 },
+  { "_pei386_runtime_relocator", 25 },
+  { "do_pseudo_reloc", 15 },
+  { "cygwin_crt0", 11 },
+  { NULL, 0 }
+};
+
+/* Do not specify library suffix explicitly, to allow for dllized versions.  */
+static autofilter_entry_type autofilter_liblist[] =
+{
+  { "libgcc", 6 },
+  { "libstdc++", 9 },
+  { "libmingw32", 10 },
+  { "libmingwex", 10 },
+  { "libg2c", 6 },
+  { "libsupc++", 9 },
+  { "libobjc", 7 },
+  { "libgcj", 6 },
+  { NULL, 0 }
+};
+
+static autofilter_entry_type autofilter_objlist[] =
+{
+  { "crt0.o", 6 },
+  { "crt1.o", 6 },
+  { "crt2.o", 6 },
+  { "dllcrt1.o", 9 },
+  { "dllcrt2.o", 9 },
+  { "gcrt0.o", 7 },
+  { "gcrt1.o", 7 },
+  { "gcrt2.o", 7 },
+  { "crtbegin.o", 10 },
+  { "crtend.o", 8 },
+  { NULL, 0 }
+};
+
+static autofilter_entry_type autofilter_symbolprefixlist[] =
+{
+  /*  { "__imp_", 6 }, */
+  /* Do __imp_ explicitly to save time.  */
+  { "__rtti_", 7 },
+  /* Don't re-export auto-imported symbols.  */
+  { "_nm_", 4 },
+  { "__builtin_", 10 },
+  /* Don't export symbols specifying internal DLL layout.  */
+  { "_head_", 6 },
+  { "_fmode", 6 },
+  { "_impure_ptr", 11 },
+  { "cygwin_attach_dll", 17 },
+  { "cygwin_premain0", 15 },
+  { "cygwin_premain1", 15 },
+  { "cygwin_premain2", 15 },
+  { "cygwin_premain3", 15 },
+  { "environ", 7 },
+  { NULL, 0 }
+};
+
+static autofilter_entry_type autofilter_symbolsuffixlist[] =
+{
+  { "_iname", 6 },
+  { NULL, 0 }
+};
+
 #define U(str) (pe_details->underscored ? "_" str : str)
+
+static int reloc_sort PARAMS ((const void *, const void *));
+static int pe_export_sort PARAMS ((const void *, const void *));
+static int auto_export PARAMS ((bfd *, def_file *, const char *));
+static void process_def_file PARAMS ((bfd *, struct bfd_link_info *));
+static void build_filler_bfd PARAMS ((int));
+static void generate_edata PARAMS ((bfd *, struct bfd_link_info *));
+static void fill_exported_offsets PARAMS ((bfd *, struct bfd_link_info *));
+static void fill_edata PARAMS ((bfd *, struct bfd_link_info *));
+static void generate_reloc PARAMS ((bfd *, struct bfd_link_info *));
+static void quoteput PARAMS ((char *, FILE *, int));
+static asection *quick_section PARAMS ((bfd *, const char *, int, int));
+static void quick_symbol
+  PARAMS ((bfd *, const char *, const char *, const char *,
+           asection *, int, int));
+static void quick_reloc PARAMS ((bfd *, int, int, int));
+static bfd *make_head PARAMS ((bfd *));
+static bfd *make_tail PARAMS ((bfd *));
+static bfd *make_one PARAMS ((def_file_export *, bfd *));
+static bfd *make_singleton_name_thunk PARAMS ((const char *, bfd *));
+static char *make_import_fixup_mark PARAMS ((arelent *));
+static bfd *make_import_fixup_entry
+  PARAMS ((const char *, const char *, const char *, bfd *));
+static bfd *make_runtime_pseudo_reloc
+  PARAMS ((const char *, const char *, int, bfd *));
+static bfd *pe_create_runtime_relocator_reference
+  PARAMS ((bfd *));
+static unsigned int pe_get16 PARAMS ((bfd *, int));
+static unsigned int pe_get32 PARAMS ((bfd *, int));
+static unsigned int pe_as32 PARAMS ((void *));
 
 void
@@ -137 +323 @@
 {
   int i;
+
   for (i = 0; pe_detail_list[i].target_name; i++)
     if (strcmp (pe_detail_list[i].target_name, target) == 0
@@ -148 +335 @@
 }
 
-/************************************************************************
-
- Helper functions for qsort.  Relocs must be sorted so that we can write
- them out by pages.
-
- ************************************************************************/
-
-typedef struct {
-  bfd_vma vma;
-  char type;
-  short extra;
-} reloc_data_type;
+/* Helper functions for qsort.  Relocs must be sorted so that we can write
+   them out by pages.  */
+
+typedef struct
+  {
+    bfd_vma vma;
+    char type;
+    short extra;
+  }
+reloc_data_type;
 
 static int
@@ -167 +352 @@
   bfd_vma a = ((reloc_data_type *) va)->vma;
   bfd_vma b = ((reloc_data_type *) vb)->vma;
+
   return (a > b) ? 1 : ((a < b) ? -1 : 0);
 }
@@ -176 +362 @@
   def_file_export *a = (def_file_export *) va;
   def_file_export *b = (def_file_export *) vb;
+
   return strcmp (a->name, b->name);
 }
 
-/************************************************************************
-
- Read and process the .DEF file
-
- ************************************************************************/
+/* Read and process the .DEF file.  */
 
 /* These correspond to the entries in pe_def_file->exports[].  I use
@@ -191 +374 @@
 static bfd_vma *exported_symbol_offsets;
 static struct sec **exported_symbol_sections;
-
 static int export_table_size;
 static int count_exported;
@@ -200 +382 @@
 static int *exported_symbols;
 
-typedef struct exclude_list_struct {
-  char *string;
-  struct exclude_list_struct *next;
-} exclude_list_struct;
+typedef struct exclude_list_struct
+  {
+    char *string;
+    struct exclude_list_struct *next;
+    int type;
+  }
+exclude_list_struct;
 
 static struct exclude_list_struct *excludes = 0;
 
 void
-pe_dll_add_excludes (new_excludes)
+pe_dll_add_excludes (new_excludes, type)
      const char *new_excludes;
+     const int type;
 {
   char *local_copy;
@@ -225 +411 @@
       new_exclude->string = (char *) xmalloc (strlen (exclude_string) + 1);
       strcpy (new_exclude->string, exclude_string);
+      new_exclude->type = type;
       new_exclude->next = excludes;
       excludes = new_exclude;
@@ -232 +419 @@
 }
 
+
+/* abfd is a bfd containing n (or NULL)
+   It can be used for contextual checks.  */
+
 static int
-auto_export (d, n)
+auto_export (abfd, d, n)
+     bfd *abfd;
      def_file *d;
      const char *n;
@@ -239 +431 @@
   int i;
   struct exclude_list_struct *ex;
+  autofilter_entry_type *afptr;
+  const char * libname = 0;
+  if (abfd && abfd->my_archive)
+    libname = lbasename (abfd->my_archive->filename);
+
+  /* We should not re-export imported stuff.  */
+  if (strncmp (n, "_imp__", 6) == 0)
+    return 0;
+
   for (i = 0; i < d->num_exports; i++)
     if (strcmp (d->exports[i].name, n) == 0)
       return 0;
+
   if (pe_dll_do_default_excludes)
     {
-      if (strcmp (n, "DllMain@12") == 0)
+      const char * p;
+      int    len;
+
+      if (pe_dll_extra_pe_debug)
+        printf ("considering exporting: %s, abfd=%p, abfd->my_arc=%p\n",
+                n, abfd, abfd->my_archive);
+
+      /* First of all, make context checks:
+         Don't export anything from standard libs.  */
+      if (libname)
+        {
+          afptr = autofilter_liblist;
+
+          while (afptr->name)
+            {
+              if (strncmp (libname, afptr->name, afptr->len) == 0 )
+                return 0;
+              afptr++;
+            }
+        }
+
+      /* Next, exclude symbols from certain startup objects.  */
+
+      if (abfd && (p = lbasename (abfd->filename)))
+        {
+          afptr = autofilter_objlist;
+          while (afptr->name)
+            {
+              if (strcmp (p, afptr->name) == 0)
+                return 0;
+              afptr++;
+            }
+        }
+
+      /* Don't try to blindly exclude all symbols
+         that begin with '__'; this was tried and
+         it is too restrictive.  */
+
+      /* Then, exclude specific symbols.  */
+      afptr = autofilter_symbollist;
+      while (afptr->name)
+        {
+          if (strcmp (n, afptr->name) == 0)
+            return 0;
+
+          afptr++;
+        }
+
+      /* Next, exclude symbols starting with ...  */
+      afptr = autofilter_symbolprefixlist;
+      while (afptr->name)
+        {
+          if (strncmp (n, afptr->name, afptr->len) == 0)
+            return 0;
+
+          afptr++;
+        }
+
+      /* Finally, exclude symbols ending with ...  */
+      len = strlen (n);
+      afptr = autofilter_symbolsuffixlist;
+      while (afptr->name)
+        {
+          if ((len >= afptr->len)
+              /* Add 1 to insure match with trailing '\0'.  */
+              && strncmp (n + len - afptr->len, afptr->name,
+                          afptr->len + 1) == 0)
+            return 0;
+
+          afptr++;
+        }
+    }
+
+  for (ex = excludes; ex; ex = ex->next)
+    {
+      if (ex->type == 1) /* exclude-libs */
+        {
+          if (libname
+              && ((strcmp (libname, ex->string) == 0)
+                   || (strcasecmp ("ALL", ex->string) == 0)))
+            return 0;
+        }
+      else if (strcmp (n, ex->string) == 0)
         return 0;
-      if (strcmp (n, "DllEntryPoint@0") == 0)
-        return 0;
-      if (strcmp (n, "impure_ptr") == 0)
-        return 0;
-    }
-  for (ex = excludes; ex; ex = ex->next)
-    if (strcmp (n, ex->string) == 0)
-      return 0;
+    }
+
   return 1;
 }
@@ -273 +551 @@
   /* First, run around to all the objects looking for the .drectve
      sections, and push those into the def file too.  */
-
   for (b = info->input_bfds; b; b = b->link_next)
     {
@@ -281 +558 @@
           int size = bfd_get_section_size_before_reloc (s);
           char *buf = xmalloc (size);
+
           bfd_get_section_contents (b, s, buf, 0, size);
           def_file_add_directive (pe_def_file, buf, size);
@@ -287 +565 @@
     }
 
+  /* If we are not building a DLL, when there are no exports
+     we do not build an export table at all.  */
+  if (!pe_dll_export_everything && pe_def_file->num_exports == 0
+      && !(info->shared))
+    return;
+
   /* Now, maybe export everything else the default way.  */
-
   if (pe_dll_export_everything || pe_def_file->num_exports == 0)
     {
@@ -303 +586 @@
             {
               /* We should export symbols which are either global or not
-                 anything at all.  (.bss data is the latter)  */
-              if ((symbols[j]->flags & BSF_GLOBAL)
-                  || (symbols[j]->flags == BSF_NO_FLAGS))
+                 anything at all.  (.bss data is the latter)
+                 We should not export undefined symbols.  */
+              if (symbols[j]->section != &bfd_und_section
+                  && ((symbols[j]->flags & BSF_GLOBAL)
+                      || (symbols[j]->flags == BFD_FORT_COMM_DEFAULT_VALUE)))
                 {
                   const char *sn = symbols[j]->name;
+
+                  /* We should not re-export imported stuff.  */
+                  {
+                    char *name = (char *) xmalloc (strlen (sn) + 2 + 6);
+                    sprintf (name, "%s%s", U("_imp_"), sn);
+
+                    blhe = bfd_link_hash_lookup (info->hash, name,
+                                                 FALSE, FALSE, FALSE);
+                    free (name);
+
+                    if (blhe && blhe->type == bfd_link_hash_defined)
+                      continue;
+                  }
+
                   if (*sn == '_')
                     sn++;
-                  if (auto_export (pe_def_file, sn))
-                    {
-                      def_file_export *p;
-                      p=def_file_add_export (pe_def_file, sn, 0, -1);
-                      /* Fill data flag properly, from dlltool.c */
-                      p->flag_data = !(symbols[j]->flags & BSF_FUNCTION);
-                    }
+
+                  if (auto_export (b, pe_def_file, sn))
+                    {
+                      def_file_export *p;
+                      p=def_file_add_export (pe_def_file, sn, 0, -1);
+                      /* Fill data flag properly, from dlltool.c.  */
+                      p->flag_data = !(symbols[j]->flags & BSF_FUNCTION);
+                    }
                 }
             }
@@ -326 +626 @@
 
   /* Canonicalize the export list.  */
-
   if (pe_dll_kill_ats)
     {
@@ -336 +635 @@
                  pointing to the same memory as name, or might not
                  have.  */
-              char *tmp = xstrdup (pe_def_file->exports[i].name);
+              int lead_at = (*pe_def_file->exports[i].name =='@');
+              char *tmp = xstrdup (pe_def_file->exports[i].name + lead_at);
+
               *(strchr (tmp, '@')) = 0;
               pe_def_file->exports[i].name = tmp;
@@ -349 +650 @@
           if (strchr (pe_def_file->exports[i].name, '@'))
             {
-              char *tmp = xstrdup (pe_def_file->exports[i].name);
+              int lead_at = (*pe_def_file->exports[i].name == '@' ) ;
+              char *tmp = xstrdup (pe_def_file->exports[i].name + lead_at);
+
               *(strchr (tmp, '@')) = 0;
-              if (auto_export (pe_def_file, tmp))
+              if (auto_export (NULL, pe_def_file, tmp))
                 def_file_add_export (pe_def_file, tmp,
-                                     pe_def_file->exports[i].internal_name, -1);
+                                     pe_def_file->exports[i].internal_name,
+                                     -1);
               else
                 free (tmp);
@@ -395 +699 @@
                        e[j - 1].name);
             }
+
           if (e[i].ordinal != -1)
             e[j - 1].ordinal = e[i].ordinal;
@@ -414 +719 @@
     {
       char *name = (char *) xmalloc (strlen (pe_def_file->exports[i].internal_name) + 2);
-      if (pe_details->underscored)
+
+      if (pe_details->underscored
+          && (*pe_def_file->exports[i].internal_name != '@'))
         {
           *name = '_';
@@ -424 +731 @@
       blhe = bfd_link_hash_lookup (info->hash,
                                    name,
-                                   false, false, true);
+                                   FALSE, FALSE, TRUE);
 
       if (blhe
@@ -474 +781 @@
 }
 
-/************************************************************************
-
- Build the bfd that will contain .edata and .reloc sections
-
- ************************************************************************/
+/* Build the bfd that will contain .edata and .reloc sections.  */
 
 static void
@@ -527 +830 @@
       return;
     }
+
   bfd_set_section_size (filler_bfd, reloc_s, 0);
 
@@ -532 +836 @@
 }
 
-/************************************************************************
-
- Gather all the exported symbols and build the .edata section
-
- ************************************************************************/
+/* Gather all the exported symbols and build the .edata section.  */
 
 static void
@@ -549 +849 @@
   /* First, we need to know how many exported symbols there are,
      and what the range of ordinals is.  */
-
   if (pe_def_file->name)
-    {
-      dll_name = pe_def_file->name;
-    }
+    dll_name = pe_def_file->name;
   else
     {
       dll_name = abfd->filename;
+
       for (dlnp = dll_name; *dlnp; dlnp++)
-        {
-          if (*dlnp == '\\' || *dlnp == '/' || *dlnp == ':')
-            dll_name = dlnp + 1;
-        }
+        if (*dlnp == '\\' || *dlnp == '/' || *dlnp == ':')
+          dll_name = dlnp + 1;
     }
 
@@ -574 +870 @@
       max_ordinal = count_exported;
     }
+
   export_table_size = max_ordinal - min_ordinal + 1;
-
   exported_symbols = (int *) xmalloc (export_table_size * sizeof (int));
   for (i = 0; i < export_table_size; i++)
@@ -589 +885 @@
               int ei = pe_def_file->exports[i].ordinal - min_ordinal;
               int pi = exported_symbols[ei];
+
               if (pi != -1)
                 {
@@ -610 +907 @@
           while (exported_symbols[next_ordinal - min_ordinal] != -1)
             next_ordinal++;
+
           exported_symbols[next_ordinal - min_ordinal] = i;
           pe_def_file->exports[i].ordinal = next_ordinal;
@@ -615 +913 @@
 
   /* OK, now we can allocate some memory.  */
-
-  edata_sz = (40                /* directory */
-              + 4 * export_table_size   /* addresses */
+  edata_sz = (40                                /* directory */
+              + 4 * export_table_size           /* addresses */
               + 4 * count_exported_byname       /* name ptrs */
               + 2 * count_exported_byname       /* ordinals */
@@ -637 +934 @@
     {
       char *name = (char *) xmalloc (strlen (pe_def_file->exports[i].internal_name) + 2);
-      if (pe_details->underscored)
+
+      if (pe_details->underscored
+          && (*pe_def_file->exports[i].internal_name != '@'))
         {
           *name = '_';
@@ -647 +946 @@
       blhe = bfd_link_hash_lookup (info->hash,
                                    name,
-                                   false, false, true);
+                                   FALSE, FALSE, TRUE);
 
       if (blhe && (blhe->type == bfd_link_hash_defined))
-        {
-          exported_symbol_offsets[i] = blhe->u.def.value;
-        }
+        exported_symbol_offsets[i] = blhe->u.def.value;
+
       free (name);
     }
@@ -690 +988 @@
       bfd_put_16 (abfd, pe_def_file->version_minor, edata_d + 10);
     }
+
   bfd_put_32 (abfd, ERVA (enamestr), edata_d + 12);
   strcpy (enamestr, dll_name);
@@ -707 +1006 @@
     {
       int s = exported_symbols[i];
+
       if (s != -1)
         {
@@ -717 +1017 @@
           bfd_put_32 (abfd, srva - image_base,
                       (void *) (eaddresses + ord - min_ordinal));
+
           if (!pe_def_file->exports[s].flag_noname)
             {
@@ -732 +1033 @@
 }
 
-/************************************************************************
-
- Gather all the relocations and build the .reloc section
-
- ************************************************************************/
+
+static struct sec *current_sec;
+
+void
+pe_walk_relocs_of_symbol (info, name, cb)
+     struct bfd_link_info *info;
+     const char *name;
+     int (*cb) (arelent *, asection *);
+{
+  bfd *b;
+  asection *s;
+
+  for (b = info->input_bfds; b; b = b->link_next)
+    {
+      asymbol **symbols;
+      int nsyms, symsize;
+
+      symsize = bfd_get_symtab_upper_bound (b);
+      symbols = (asymbol **) xmalloc (symsize);
+      nsyms   = bfd_canonicalize_symtab (b, symbols);
+
+      for (s = b->sections; s; s = s->next)
+        {
+          arelent **relocs;
+          int relsize, nrelocs, i;
+          int flags = bfd_get_section_flags (b, s);
+
+          /* Skip discarded linkonce sections.  */
+          if (flags & SEC_LINK_ONCE
+              && s->output_section == bfd_abs_section_ptr)
+            continue;
+
+          current_sec = s;
+
+          relsize = bfd_get_reloc_upper_bound (b, s);
+          relocs = (arelent **) xmalloc ((size_t) relsize);
+          nrelocs = bfd_canonicalize_reloc (b, s, relocs, symbols);
+
+          for (i = 0; i < nrelocs; i++)
+            {
+              struct symbol_cache_entry *sym = *relocs[i]->sym_ptr_ptr;
+
+              if (!strcmp (name, sym->name))
+                cb (relocs[i], s);
+            }
+
+          free (relocs);
+
+          /* Warning: the allocated symbols are remembered in BFD and reused
+             later, so don't free them! */
+          /* free (symbols); */
+        }
+    }
+}
+
+/* Gather all the relocations and build the .reloc section.  */
 
 static void
@@ -759 +1111 @@
       total_relocs += s->reloc_count;
 
-  reloc_data = (reloc_data_type *) xmalloc (total_relocs * sizeof (reloc_data_type));
+  reloc_data =
+    (reloc_data_type *) xmalloc (total_relocs * sizeof (reloc_data_type));
 
   total_relocs = 0;
@@ -802 +1155 @@
           for (i = 0; i < nrelocs; i++)
             {
+              if (pe_dll_extra_pe_debug)
+                {
+                  struct symbol_cache_entry *sym = *relocs[i]->sym_ptr_ptr;
+                  printf ("rel: %s\n", sym->name);
+                }
               if (!relocs[i]->howto->pc_relative
                   && relocs[i]->howto->type != pe_details->imagebase_reloc)
@@ -807 +1165 @@
                   bfd_vma sym_vma;
                   struct symbol_cache_entry *sym = *relocs[i]->sym_ptr_ptr;
+
                   sym_vma = (relocs[i]->addend
                              + sym->value
@@ -860 +1219 @@
      reloc_addresses, which are all suitable for the .reloc section.
      We must now create the new sections.  */
-
   qsort (reloc_data, total_relocs, sizeof (*reloc_data), reloc_sort);
 
@@ -869 +1227 @@
       if (this_page != sec_page)
         {
-          reloc_sz = (reloc_sz + 3) & ~3;       /* 4-byte align */
+          reloc_sz = (reloc_sz + 3) & ~3;       /* 4-byte align.  */
           reloc_sz += 8;
           sec_page = this_page;
@@ -879 +1237 @@
         reloc_sz += 2;
     }
-  reloc_sz = (reloc_sz + 3) & ~3;       /* 4-byte align */
-
+
+  reloc_sz = (reloc_sz + 3) & ~3;       /* 4-byte align.  */
   reloc_d = (unsigned char *) xmalloc (reloc_sz);
-
   sec_page = (unsigned long) (-1);
   reloc_sz = 0;
   page_ptr = (unsigned long) (-1);
   page_count = 0;
+
   for (i = 0; i < total_relocs; i++)
     {
       unsigned long rva = reloc_data[i].vma - image_base;
       unsigned long this_page = (rva & ~0xfff);
+
       if (this_page != sec_page)
         {
           while (reloc_sz & 3)
             reloc_d[reloc_sz++] = 0;
+
           if (page_ptr != (unsigned long) (-1))
             bfd_put_32 (abfd, reloc_sz - page_ptr, reloc_d + page_ptr + 4);
+
           bfd_put_32 (abfd, this_page, reloc_d + reloc_sz);
           page_ptr = reloc_sz;
@@ -903 +1264 @@
           page_count = 0;
         }
+
       bfd_put_16 (abfd, (rva & 0xfff) + (reloc_data[i].type << 12),
                   reloc_d + reloc_sz);
       reloc_sz += 2;
+
       if (reloc_data[i].type == 4)
         {
@@ -911 +1274 @@
           reloc_sz += 2;
         }
+
       page_count++;
     }
+
   while (reloc_sz & 3)
     reloc_d[reloc_sz++] = 0;
+
   if (page_ptr != (unsigned long) (-1))
     bfd_put_32 (abfd, reloc_sz - page_ptr, reloc_d + page_ptr + 4);
+
   while (reloc_sz < reloc_s->_raw_size)
     reloc_d[reloc_sz++] = 0;
 }
 
-/************************************************************************
-
- Given the exiting def_file structure, print out a .DEF file that
- corresponds to it.
-
- ************************************************************************/
+/* Given the exiting def_file structure, print out a .DEF file that
+   corresponds to it.  */
 
 static void
@@ -935 +1298 @@
 {
   char *cp;
+
   for (cp = s; *cp; cp++)
     if (*cp == '\''
         || *cp == '"'
         || *cp == '\\'
-        || isspace ((unsigned char) *cp)
+        || ISSPACE (*cp)
         || *cp == ','
         || *cp == ';')
       needs_quotes = 1;
+
   if (needs_quotes)
     {
       putc ('"', f);
+
       while (*s)
         {
           if (*s == '"' || *s == '\\')
             putc ('\\', f);
+
           putc (*s, f);
           s++;
         }
+
       putc ('"', f);
     }
@@ -965 +1333 @@
   int i;
   FILE *out = fopen (pe_out_def_filename, "w");
+
   if (out == NULL)
-    {
-      /* xgettext:c-format */
-      einfo (_("%s: Can't open output def file %s\n"),
-             program_name, pe_out_def_filename);
-    }
+    /* xgettext:c-format */
+    einfo (_("%s: Can't open output def file %s\n"),
+           program_name, pe_out_def_filename);
 
   if (pe_def_file)
@@ -980 +1347 @@
           else
             fprintf (out, "NAME ");
+
           quoteput (pe_def_file->name, out, 1);
+
           if (pe_data (output_bfd)->pe_opthdr.ImageBase)
             fprintf (out, " BASE=0x%lx",
@@ -1008 +1377 @@
       else if (pe_def_file->stack_reserve != -1)
         fprintf (out, "STACKSIZE 0x%x\n", pe_def_file->stack_reserve);
+
       if (pe_def_file->heap_commit != -1)
         fprintf (out, "HEAPSIZE 0x%x,0x%x\n",
@@ -1017 +1387 @@
         {
           fprintf (out, "\nSECTIONS\n\n");
+
           for (i = 0; i < pe_def_file->num_section_defs; i++)
             {
               fprintf (out, "    ");
               quoteput (pe_def_file->section_defs[i].name, out, 0);
+
               if (pe_def_file->section_defs[i].class)
                 {
@@ -1026 +1398 @@
                   quoteput (pe_def_file->section_defs[i].class, out, 0);
                 }
+
               if (pe_def_file->section_defs[i].flag_read)
                 fprintf (out, " READ");
+
               if (pe_def_file->section_defs[i].flag_write)
                 fprintf (out, " WRITE");
+
               if (pe_def_file->section_defs[i].flag_execute)
                 fprintf (out, " EXECUTE");
+
               if (pe_def_file->section_defs[i].flag_shared)
                 fprintf (out, " SHARED");
+
               fprintf (out, "\n");
             }
@@ -1040 +1417 @@
       if (pe_def_file->num_exports > 0)
         {
-          fprintf (out, "\nEXPORTS\n\n");
+          fprintf (out, "EXPORTS\n");
+
           for (i = 0; i < pe_def_file->num_exports; i++)
             {
@@ -1046 +1424 @@
               fprintf (out, "    ");
               quoteput (e->name, out, 0);
+
               if (e->internal_name && strcmp (e->internal_name, e->name))
                 {
@@ -1051 +1430 @@
                   quoteput (e->internal_name, out, 0);
                 }
+
               if (e->ordinal != -1)
                 fprintf (out, " @%d", e->ordinal);
+
               if (e->flag_private)
                 fprintf (out, " PRIVATE");
+
               if (e->flag_constant)
                 fprintf (out, " CONSTANT");
+
               if (e->flag_noname)
                 fprintf (out, " NONAME");
+
               if (e->flag_data)
                 fprintf (out, " DATA");
@@ -1069 +1453 @@
         {
           fprintf (out, "\nIMPORTS\n\n");
+
           for (i = 0; i < pe_def_file->num_imports; i++)
             {
               def_file_import *im = pe_def_file->imports + i;
               fprintf (out, "    ");
+
               if (im->internal_name
                   && (!im->name || strcmp (im->internal_name, im->name)))
@@ -1079 +1465 @@
                   fprintf (out, " = ");
                 }
+
               quoteput (im->module->name, out, 0);
               fprintf (out, ".");
+
               if (im->name)
                 quoteput (im->name, out, 0);
               else
                 fprintf (out, "%d", im->ordinal);
+
               fprintf (out, "\n");
             }
@@ -1093 +1482 @@
 
   if (fclose (out) == EOF)
-    {
-      /* xgettext:c-format */
-      einfo (_("%P: Error closing file `%s'\n"), pe_out_def_filename);
-    }
-}
-
-/************************************************************************
-
- Generate the import library
-
- ************************************************************************/
+    /* xgettext:c-format */
+    einfo (_("%P: Error closing file `%s'\n"), pe_out_def_filename);
+}
+
+/* Generate the import library.  */
 
 static asymbol **symtab;
@@ -1142 +1525 @@
 quick_symbol (abfd, n1, n2, n3, sec, flags, addr)
      bfd *abfd;
-     char *n1;
-     char *n2;
-     char *n3;
+     const char *n1;
+     const char *n2;
+     const char *n3;
      asection *sec;
      int flags;
@@ -1151 +1534 @@
   asymbol *sym;
   char *name = (char *) xmalloc (strlen (n1) + strlen (n2) + strlen (n3) + 1);
+
   strcpy (name, n1);
   strcat (name, n2);
@@ -1191 +1575 @@
 {
   int i;
+
   sec->relocation = reltab;
   sec->reloc_count = relcount;
@@ -1202 +1587 @@
 }
 
-/*
- *      .section        .idata$2
- *      .global         __head_my_dll
- * __head_my_dll:
- *      .rva            hname
- *      .long           0
- *      .long           0
- *      .rva            __my_dll_iname
- *      .rva            fthunk
- *
- *      .section        .idata$5
- *      .long           0
- * fthunk:
- *
- *      .section        .idata$4
- *      .long           0
- * hname:
- */
+/*      .section        .idata$2
+        .global         __head_my_dll
+   __head_my_dll:
+        .rva            hname
+        .long           0
+        .long           0
+        .rva            __my_dll_iname
+        .rva            fthunk
+
+        .section        .idata$5
+        .long           0
+   fthunk:
+
+        .section        .idata$4
+        .long           0
+   hname:                              */
 
 static bfd *
@@ -1259 +1642 @@
   id2->contents = d2;
   memset (d2, 0, 20);
-  d2[0] = d2[16] = 4; /* reloc addend */
+  d2[0] = d2[16] = 4; /* Reloc addend.  */
   quick_reloc (abfd,  0, BFD_RELOC_RVA, 2);
   quick_reloc (abfd, 12, BFD_RELOC_RVA, 4);
@@ -1285 +1668 @@
 }
 
-/*
- *      .section        .idata$4
- *      .long           0
- *      .section        .idata$5
- *      .long           0
- *      .section        idata$7
- *      .global         __my_dll_iname
- *__my_dll_iname:
- *      .asciz          "my.dll"
- */
+/*      .section        .idata$4
+        .long           0
+        .section        .idata$5
+        .long           0
+        .section        idata$7
+        .global         __my_dll_iname
+  __my_dll_iname:
+        .asciz          "my.dll"       */
 
 static bfd *
@@ -1352 +1733 @@
 }
 
-/*
- *      .text
- *      .global         _function
- *      .global         ___imp_function
- *      .global         __imp__function
- *_function:
- *      jmp             *__imp__function:
- *
- *      .section        idata$7
- *      .long           __head_my_dll
- *
- *      .section        .idata$5
- *___imp_function:
- *__imp__function:
- *iat?
- *      .section        .idata$4
- *iat?
- *      .section        .idata$6
- *ID<ordinal>:
- *      .short          <hint>
- *      .asciz          "function" xlate? (add underscore, kill at)
- */
-
-static unsigned char jmp_ix86_bytes[] = {
+/*      .text
+        .global         _function
+        .global         ___imp_function
+        .global         __imp__function
+  _function:
+        jmp             *__imp__function:
+
+        .section        idata$7
+        .long           __head_my_dll
+
+        .section        .idata$5
+  ___imp_function:
+  __imp__function:
+  iat?
+        .section        .idata$4
+  iat?
+        .section        .idata$6
+  ID<ordinal>:
+        .short          <hint>
+        .asciz          "function" xlate? (add underscore, kill at)  */
+
+static unsigned char jmp_ix86_bytes[] =
+{
   0xff, 0x25, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90
 };
 
-/*
- *_function:
- *      mov.l   ip+8,r0
- *      mov.l   @r0,r0
- *      jmp     @r0
- *      nop
- *      .dw     __imp_function
- */
-
-static unsigned char jmp_sh_bytes[] = {
+/* _function:
+        mov.l   ip+8,r0
+        mov.l   @r0,r0
+        jmp     @r0
+        nop
+        .dw     __imp_function   */
+
+static unsigned char jmp_sh_bytes[] =
+{
   0x01, 0xd0, 0x02, 0x60, 0x2b, 0x40, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-/*
- *_function:
- *      lui     $t0,<high:__imp_function>
- *      lw      $t0,<low:__imp_function>
- *      jr      $t0
- *      nop
- */
-
-static unsigned char jmp_mips_bytes[] = {
+/* _function:
+        lui     $t0,<high:__imp_function>
+        lw      $t0,<low:__imp_function>
+        jr      $t0
+        nop                              */
+
+static unsigned char jmp_mips_bytes[] =
+{
   0x00, 0x00, 0x08, 0x3c,  0x00, 0x00, 0x08, 0x8d,
   0x08, 0x00, 0x00, 0x01,  0x00, 0x00, 0x00, 0x00
@@ -1432 +1810 @@
       jmp_byte_count = sizeof (jmp_mips_bytes);
       break;
+    default:
+      abort ();
     }
 
@@ -1446 +1826 @@
 
   symptr = 0;
-  symtab = (asymbol **) xmalloc (10 * sizeof (asymbol *));
+  symtab = (asymbol **) xmalloc (11 * sizeof (asymbol *));
   tx  = quick_section (abfd, ".text",    SEC_CODE|SEC_HAS_CONTENTS, 2);
   id7 = quick_section (abfd, ".idata$7", SEC_HAS_CONTENTS, 2);
@@ -1452 +1832 @@
   id4 = quick_section (abfd, ".idata$4", SEC_HAS_CONTENTS, 2);
   id6 = quick_section (abfd, ".idata$6", SEC_HAS_CONTENTS, 2);
-  if (! exp->flag_data)
-    quick_symbol (abfd, U (""), exp->internal_name, "", tx, BSF_GLOBAL, 0);
-  quick_symbol (abfd, U ("_head_"), dll_symname, "", UNDSEC, BSF_GLOBAL, 0);
-  quick_symbol (abfd, U ("_imp__"), exp->internal_name, "", id5, BSF_GLOBAL, 0);
+
+  if  (*exp->internal_name == '@')
+    {
+      if (! exp->flag_data)
+        quick_symbol (abfd, "", exp->internal_name, "", tx, BSF_GLOBAL, 0);
+      quick_symbol (abfd, U ("_head_"), dll_symname, "", UNDSEC, BSF_GLOBAL, 0);
+      quick_symbol (abfd, U ("_imp_"), exp->internal_name, "", id5, BSF_GLOBAL, 0);
+      /* Fastcall applies only to functions,
+         so no need for auto-import symbol.  */
+    }
+  else
+    {
+      if (! exp->flag_data)
+        quick_symbol (abfd, U (""), exp->internal_name, "", tx, BSF_GLOBAL, 0);
+      quick_symbol (abfd, U ("_head_"), dll_symname, "", UNDSEC, BSF_GLOBAL, 0);
+      quick_symbol (abfd, U ("_imp__"), exp->internal_name, "", id5, BSF_GLOBAL, 0);
+      /* Symbol to reference ord/name of imported
+         data symbol, used to implement auto-import.  */
+      if (exp->flag_data)
+        quick_symbol (abfd, U("_nm__"), exp->internal_name, "", id6, BSF_GLOBAL,0);
+    }
   if (pe_dll_compat_implib)
     quick_symbol (abfd, U ("__imp_"), exp->internal_name, "",
@@ -1461 +1858 @@
 
   if (! exp->flag_data)
-  {
-    bfd_set_section_size (abfd, tx, jmp_byte_count);
-    td = (unsigned char *) xmalloc (jmp_byte_count);
-    tx->contents = td;
-    memcpy (td, jmp_bytes, jmp_byte_count);
-    switch (pe_details->pe_arch)
-      {
-      case PE_ARCH_i386:
-        quick_reloc (abfd, 2, BFD_RELOC_32, 2);
-        break;
-      case PE_ARCH_sh:
-        quick_reloc (abfd, 8, BFD_RELOC_32, 2);
-        break;
-      case PE_ARCH_mips:
-        quick_reloc (abfd, 0, BFD_RELOC_HI16_S, 2);
-        quick_reloc (abfd, 0, BFD_RELOC_LO16, 0); /* MIPS_R_PAIR */
-        quick_reloc (abfd, 4, BFD_RELOC_LO16, 2);
-        break;
-      }
-    save_relocs (tx);
-  }
+    {
+      bfd_set_section_size (abfd, tx, jmp_byte_count);
+      td = (unsigned char *) xmalloc (jmp_byte_count);
+      tx->contents = td;
+      memcpy (td, jmp_bytes, jmp_byte_count);
+
+      switch (pe_details->pe_arch)
+        {
+        case PE_ARCH_i386:
+          quick_reloc (abfd, 2, BFD_RELOC_32, 2);
+          break;
+        case PE_ARCH_sh:
+          quick_reloc (abfd, 8, BFD_RELOC_32, 2);
+          break;
+        case PE_ARCH_mips:
+          quick_reloc (abfd, 0, BFD_RELOC_HI16_S, 2);
+          quick_reloc (abfd, 0, BFD_RELOC_LO16, 0); /* MIPS_R_PAIR */
+          quick_reloc (abfd, 4, BFD_RELOC_LO16, 2);
+          break;
+        default:
+          abort ();
+        }
+      save_relocs (tx);
+    }
 
   bfd_set_section_size (abfd, id7, 4);
@@ -1494 +1894 @@
   id5->contents = d5;
   memset (d5, 0, 4);
+
   if (exp->flag_noname)
     {
@@ -1510 +1911 @@
   id4->contents = d4;
   memset (d4, 0, 4);
+
   if (exp->flag_noname)
     {
@@ -1554 +1956 @@
 }
 
+static bfd *
+make_singleton_name_thunk (import, parent)
+     const char *import;
+     bfd *parent;
+{
+  /* Name thunks go to idata$4.  */
+  asection *id4;
+  unsigned char *d4;
+  char *oname;
+  bfd *abfd;
+
+  oname = (char *) xmalloc (20);
+  sprintf (oname, "nmth%06d.o", tmp_seq);
+  tmp_seq++;
+
+  abfd = bfd_create (oname, parent);
+  bfd_find_target (pe_details->object_target, abfd);
+  bfd_make_writable (abfd);
+
+  bfd_set_format (abfd, bfd_object);
+  bfd_set_arch_mach (abfd, pe_details->bfd_arch, 0);
+
+  symptr = 0;
+  symtab = (asymbol **) xmalloc (3 * sizeof (asymbol *));
+  id4 = quick_section (abfd, ".idata$4", SEC_HAS_CONTENTS, 2);
+  quick_symbol (abfd, U ("_nm_thnk_"), import, "", id4, BSF_GLOBAL, 0);
+  quick_symbol (abfd, U ("_nm_"), import, "", UNDSEC, BSF_GLOBAL, 0);
+
+  bfd_set_section_size (abfd, id4, 8);
+  d4 = (unsigned char *) xmalloc (4);
+  id4->contents = d4;
+  memset (d4, 0, 8);
+  quick_reloc (abfd, 0, BFD_RELOC_RVA, 2);
+  save_relocs (id4);
+
+  bfd_set_symtab (abfd, symtab, symptr);
+
+  bfd_set_section_contents (abfd, id4, d4, 0, 8);
+
+  bfd_make_readable (abfd);
+  return abfd;
+}
+
+static char *
+make_import_fixup_mark (rel)
+     arelent *rel;
+{
+  /* We convert reloc to symbol, for later reference.  */
+  static int counter;
+  static char *fixup_name = NULL;
+  static size_t buffer_len = 0;
+
+  struct symbol_cache_entry *sym = *rel->sym_ptr_ptr;
+
+  bfd *abfd = bfd_asymbol_bfd (sym);
+  struct bfd_link_hash_entry *bh;
+
+  if (!fixup_name)
+    {
+      fixup_name = (char *) xmalloc (384);
+      buffer_len = 384;
+    }
+
+  if (strlen (sym->name) + 25 > buffer_len)
+  /* Assume 25 chars for "__fu" + counter + "_".  If counter is
+     bigger than 20 digits long, we've got worse problems than
+     overflowing this buffer...  */
+    {
+      free (fixup_name);
+      /* New buffer size is length of symbol, plus 25, but
+         then rounded up to the nearest multiple of 128.  */
+      buffer_len = ((strlen (sym->name) + 25) + 127) & ~127;
+      fixup_name = (char *) xmalloc (buffer_len);
+    }
+
+  sprintf (fixup_name, "__fu%d_%s", counter++, sym->name);
+
+  bh = NULL;
+  bfd_coff_link_add_one_symbol (&link_info, abfd, fixup_name, BSF_GLOBAL,
+                                current_sec, /* sym->section, */
+                                rel->address, NULL, TRUE, FALSE, &bh);
+
+  if (0)
+    {
+      struct coff_link_hash_entry *myh;
+
+      myh = (struct coff_link_hash_entry *) bh;
+      printf ("type:%d\n", myh->type);
+      printf ("%s\n", myh->root.u.def.section->name);
+    }
+
+  return fixup_name;
+}
+
+/*      .section        .idata$3
+        .rva            __nm_thnk_SYM (singleton thunk with name of func)
+        .long           0
+        .long           0
+        .rva            __my_dll_iname (name of dll)
+        .rva            __fuNN_SYM (pointer to reference (address) in text)  */
+
+static bfd *
+make_import_fixup_entry (name, fixup_name, dll_symname, parent)
+     const char *name;
+     const char *fixup_name;
+     const char *dll_symname;
+     bfd *parent;
+{
+  asection *id3;
+  unsigned char *d3;
+  char *oname;
+  bfd *abfd;
+
+  oname = (char *) xmalloc (20);
+  sprintf (oname, "fu%06d.o", tmp_seq);
+  tmp_seq++;
+
+  abfd = bfd_create (oname, parent);
+  bfd_find_target (pe_details->object_target, abfd);
+  bfd_make_writable (abfd);
+
+  bfd_set_format (abfd, bfd_object);
+  bfd_set_arch_mach (abfd, pe_details->bfd_arch, 0);
+
+  symptr = 0;
+  symtab = (asymbol **) xmalloc (6 * sizeof (asymbol *));
+  id3 = quick_section (abfd, ".idata$3", SEC_HAS_CONTENTS, 2);
+
+#if 0
+  quick_symbol (abfd, U ("_head_"), dll_symname, "", id2, BSF_GLOBAL, 0);
+#endif
+  quick_symbol (abfd, U ("_nm_thnk_"), name, "", UNDSEC, BSF_GLOBAL, 0);
+  quick_symbol (abfd, U (""), dll_symname, "_iname", UNDSEC, BSF_GLOBAL, 0);
+  quick_symbol (abfd, "", fixup_name, "", UNDSEC, BSF_GLOBAL, 0);
+
+  bfd_set_section_size (abfd, id3, 20);
+  d3 = (unsigned char *) xmalloc (20);
+  id3->contents = d3;
+  memset (d3, 0, 20);
+
+  quick_reloc (abfd, 0, BFD_RELOC_RVA, 1);
+  quick_reloc (abfd, 12, BFD_RELOC_RVA, 2);
+  quick_reloc (abfd, 16, BFD_RELOC_RVA, 3);
+  save_relocs (id3);
+
+  bfd_set_symtab (abfd, symtab, symptr);
+
+  bfd_set_section_contents (abfd, id3, d3, 0, 20);
+
+  bfd_make_readable (abfd);
+  return abfd;
+}
+
+/*      .section        .rdata_runtime_pseudo_reloc
+        .long           addend
+        .rva            __fuNN_SYM (pointer to reference (address) in text)  */
+
+static bfd *
+make_runtime_pseudo_reloc (name, fixup_name, addend, parent)
+     const char *name ATTRIBUTE_UNUSED;
+     const char *fixup_name;
+     int addend;
+     bfd *parent;
+{
+  asection *rt_rel;
+  unsigned char *rt_rel_d;
+  char *oname;
+  bfd *abfd;
+
+  oname = (char *) xmalloc (20);
+  sprintf (oname, "rtr%06d.o", tmp_seq);
+  tmp_seq++;
+
+  abfd = bfd_create (oname, parent);
+  bfd_find_target (pe_details->object_target, abfd);
+  bfd_make_writable (abfd);
+
+  bfd_set_format (abfd, bfd_object);
+  bfd_set_arch_mach (abfd, pe_details->bfd_arch, 0);
+
+  symptr = 0;
+  symtab = (asymbol **) xmalloc (2 * sizeof (asymbol *));
+  rt_rel = quick_section (abfd, ".rdata_runtime_pseudo_reloc", SEC_HAS_CONTENTS, 2);
+
+  quick_symbol (abfd, "", fixup_name, "", UNDSEC, BSF_GLOBAL, 0);
+
+  bfd_set_section_size (abfd, rt_rel, 8);
+  rt_rel_d = (unsigned char *) xmalloc (8);
+  rt_rel->contents = rt_rel_d;
+  memset (rt_rel_d, 0, 8);
+  bfd_put_32 (abfd, addend, rt_rel_d);
+
+  quick_reloc (abfd, 4, BFD_RELOC_RVA, 1);
+  save_relocs (rt_rel);
+
+  bfd_set_symtab (abfd, symtab, symptr);
+
+  bfd_set_section_contents (abfd, rt_rel, rt_rel_d, 0, 8);
+
+  bfd_make_readable (abfd);
+  return abfd;
+}
+
+/*      .section        .rdata
+        .rva            __pei386_runtime_relocator  */
+
+static bfd *
+pe_create_runtime_relocator_reference (parent)
+     bfd *parent;
+{
+  asection *extern_rt_rel;
+  unsigned char *extern_rt_rel_d;
+  char *oname;
+  bfd *abfd;
+
+  oname = (char *) xmalloc (20);
+  sprintf (oname, "ertr%06d.o", tmp_seq);
+  tmp_seq++;
+
+  abfd = bfd_create (oname, parent);
+  bfd_find_target (pe_details->object_target, abfd);
+  bfd_make_writable (abfd);
+
+  bfd_set_format (abfd, bfd_object);
+  bfd_set_arch_mach (abfd, pe_details->bfd_arch, 0);
+
+  symptr = 0;
+  symtab = (asymbol **) xmalloc (2 * sizeof (asymbol *));
+  extern_rt_rel = quick_section (abfd, ".rdata", SEC_HAS_CONTENTS, 2);
+
+  quick_symbol (abfd, "", "__pei386_runtime_relocator", "", UNDSEC, BSF_NO_FLAGS, 0);
+
+  bfd_set_section_size (abfd, extern_rt_rel, 4);
+  extern_rt_rel_d = (unsigned char *) xmalloc (4);
+  extern_rt_rel->contents = extern_rt_rel_d;
+
+  quick_reloc (abfd, 0, BFD_RELOC_RVA, 1);
+  save_relocs (extern_rt_rel);
+
+  bfd_set_symtab (abfd, symtab, symptr);
+
+  bfd_set_section_contents (abfd, extern_rt_rel, extern_rt_rel_d, 0, 4);
+
+  bfd_make_readable (abfd);
+  return abfd;
+}
+
+void
+pe_create_import_fixup (rel, s, addend)
+     arelent *rel;
+     asection *s;
+     int addend;
+{
+  char buf[300];
+  struct symbol_cache_entry *sym = *rel->sym_ptr_ptr;
+  struct bfd_link_hash_entry *name_thunk_sym;
+  const char *name = sym->name;
+  char *fixup_name = make_import_fixup_mark (rel);
+  bfd *b;
+
+  sprintf (buf, U ("_nm_thnk_%s"), name);
+
+  name_thunk_sym = bfd_link_hash_lookup (link_info.hash, buf, 0, 0, 1);
+
+  if (!name_thunk_sym || name_thunk_sym->type != bfd_link_hash_defined)
+    {
+      bfd *b = make_singleton_name_thunk (name, output_bfd);
+      add_bfd_to_link (b, b->filename, &link_info);
+
+      /* If we ever use autoimport, we have to cast text section writable.  */
+      config.text_read_only = FALSE;
+    }
+
+  if (addend == 0 || link_info.pei386_runtime_pseudo_reloc)
+    {
+      extern char * pe_data_import_dll;
+      char * dll_symname = pe_data_import_dll ? pe_data_import_dll : "unknown";
+
+      b = make_import_fixup_entry (name, fixup_name, dll_symname, output_bfd);
+      add_bfd_to_link (b, b->filename, &link_info);
+    }
+
+  if (addend != 0)
+    {
+      if (link_info.pei386_runtime_pseudo_reloc)
+        {
+          if (pe_dll_extra_pe_debug)
+            printf ("creating runtime pseudo-reloc entry for %s (addend=%d)\n",
+                   fixup_name, addend);
+          b = make_runtime_pseudo_reloc (name, fixup_name, addend, output_bfd);
+          add_bfd_to_link (b, b->filename, &link_info);
+
+          if (runtime_pseudo_relocs_created == 0)
+            {
+              b = pe_create_runtime_relocator_reference (output_bfd);
+              add_bfd_to_link (b, b->filename, &link_info);
+            }
+          runtime_pseudo_relocs_created++;
+        }
+      else
+        {
+          einfo (_("%C: variable '%T' can't be auto-imported. Please read the documentation for ld's --enable-auto-import for details.\n"),
+                 s->owner, s, rel->address, sym->name);
+          einfo ("%X");
+        }
+    }
+}
+
+
 void
 pe_dll_generate_implib (def, impfilename)
@@ -1568 +2279 @@
   dll_symname = xstrdup (dll_filename);
   for (i = 0; dll_symname[i]; i++)
-    if (!isalnum ((unsigned char) dll_symname[i]))
+    if (!ISALNUM (dll_symname[i]))
       dll_symname[i] = '_';
 
@@ -1589 +2300 @@
 
   /* Work out a reasonable size of things to put onto one line.  */
-
   ar_head = make_head (outarch);
 
@@ -1597 +2307 @@
       char *internal = def->exports[i].internal_name;
       bfd *n;
+
       def->exports[i].internal_name = def->exports[i].name;
       n = make_one (def->exports + i, outarch);
@@ -1610 +2321 @@
 
   /* Now stick them all into the archive.  */
-
   ar_head->next = head;
   ar_tail->next = ar_head;
@@ -1632 +2342 @@
 add_bfd_to_link (abfd, name, link_info)
      bfd *abfd;
-     char *name;
+     const char *name;
      struct bfd_link_info *link_info;
 {
   lang_input_statement_type *fake_file;
+
   fake_file = lang_add_input_file (name,
                                    lang_input_file_is_fake_enum,
@@ -1641 +2352 @@
   fake_file->the_bfd = abfd;
   ldlang_add_file (fake_file);
+
   if (!bfd_link_add_symbols (abfd, link_info))
     einfo ("%Xaddsym %s: %s\n", name, bfd_errmsg (bfd_get_error ()));
@@ -1651 +2363 @@
 {
   def_file_module *module;
+
   pe_dll_id_target (bfd_get_target (output_bfd));
 
@@ -1663 +2376 @@
       dll_symname = xstrdup (module->name);
       for (i = 0; dll_symname[i]; i++)
-        if (!isalnum (dll_symname[i]))
+        if (!ISALNUM (dll_symname[i]))
           dll_symname[i] = '_';
 
@@ -1673 +2386 @@
             def_file_export exp;
             struct bfd_link_hash_entry *blhe;
-
+            int lead_at = (*pe_def_file->imports[i].internal_name == '@');
             /* See if we need this import.  */
             char *name = (char *) xmalloc (strlen (pe_def_file->imports[i].internal_name) + 2 + 6);
-            sprintf (name, "%s%s", U (""), pe_def_file->imports[i].internal_name);
+
+            if (lead_at)
+              sprintf (name, "%s%s", "", pe_def_file->imports[i].internal_name);
+            else
+              sprintf (name, "%s%s",U (""), pe_def_file->imports[i].internal_name);
+
             blhe = bfd_link_hash_lookup (link_info->hash, name,
-                                         false, false, false);
+                                         FALSE, FALSE, FALSE);
+
             if (!blhe || (blhe && blhe->type != bfd_link_hash_undefined))
               {
-                sprintf (name, "%s%s", U ("_imp__"),
-                         pe_def_file->imports[i].internal_name);
+                if (lead_at)
+                  sprintf (name, "%s%s", U ("_imp_"),
+                           pe_def_file->imports[i].internal_name);
+                else
+                  sprintf (name, "%s%s", U ("_imp__"),
+                           pe_def_file->imports[i].internal_name);
+
                 blhe = bfd_link_hash_lookup (link_info->hash, name,
-                                             false, false, false);
+                                             FALSE, FALSE, FALSE);
               }
             free (name);
+
             if (blhe && blhe->type == bfd_link_hash_undefined)
               {
@@ -1703 +2428 @@
                 exp.flag_private = 0;
                 exp.flag_constant = 0;
-                exp.flag_data = 0;
+                exp.flag_data = pe_def_file->imports[i].data;
                 exp.flag_noname = exp.name ? 0 : 1;
                 one = make_one (&exp, output_bfd);
@@ -1719 +2444 @@
 }
 
-/************************************************************************
-
- We were handed a *.DLL file.  Parse it and turn it into a set of
- IMPORTS directives in the def file.  Return true if the file was
- handled, false if not.
-
- ************************************************************************/
+/* We were handed a *.DLL file.  Parse it and turn it into a set of
+   IMPORTS directives in the def file.  Return TRUE if the file was
+   handled, FALSE if not.  */
 
 static unsigned int
@@ -1733 +2454 @@
 {
   unsigned char b[2];
-  bfd_seek (abfd, where, SEEK_SET);
-  bfd_read (b, 1, 2, abfd);
+
+  bfd_seek (abfd, (file_ptr) where, SEEK_SET);
+  bfd_bread (b, (bfd_size_type) 2, abfd);
   return b[0] + (b[1] << 8);
 }
@@ -1744 +2466 @@
 {
   unsigned char b[4];
-  bfd_seek (abfd, where, SEEK_SET);
-  bfd_read (b, 1, 4, abfd);
+
+  bfd_seek (abfd, (file_ptr) where, SEEK_SET);
+  bfd_bread (b, (bfd_size_type) 4, abfd);
   return b[0] + (b[1] << 8) + (b[2] << 16) + (b[3] << 24);
 }
@@ -1756 +2479 @@
 {
   unsigned char *b = ptr;
+
   return b[0] + (b[1] << 8);
 }
@@ -1766 +2490 @@
 {
   unsigned char *b = ptr;
+
   return b[0] + (b[1] << 8) + (b[2] << 16) + (b[3] << 24);
 }
 
-boolean
+bfd_boolean
 pe_implied_import_dll (filename)
      const char *filename;
@@ -1776 +2501 @@
   unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
   unsigned long export_rva, export_size, nsections, secptr, expptr;
+  unsigned long exp_funcbase;
   unsigned char *expdata, *erva;
   unsigned long name_rvas, ordinals, nexp, ordbase;
   const char *dll_name;
+  /* Initialization with start > end guarantees that is_data
+     will not be set by mistake, and avoids compiler warning.  */
+  unsigned long data_start = 1;
+  unsigned long data_end   = 0;
+  unsigned long bss_start  = 1;
+  unsigned long bss_end    = 0;
 
   /* No, I can't use bfd here.  kernel32.dll puts its export table in
      the middle of the .rdata section.  */
-
   dll = bfd_openr (filename, pe_details->target_name);
   if (!dll)
     {
       einfo ("%Xopen %s: %s\n", filename, bfd_errmsg (bfd_get_error ()));
-      return false;
-    }
+      return FALSE;
+    }
+
   /* PEI dlls seem to be bfd_objects.  */
   if (!bfd_check_format (dll, bfd_object))
     {
       einfo ("%X%s: this doesn't appear to be a DLL\n", filename);
-      return false;
-    }
-
-  dll_name = filename;
-  for (i = 0; filename[i]; i++)
-    if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':')
-      dll_name = filename + i + 1;
-
+      return FALSE;
+    }
+
+  /* Get pe_header, optional header and numbers of export entries.  */
   pe_header_offset = pe_get32 (dll, 0x3c);
   opthdr_ofs = pe_header_offset + 4 + 20;
   num_entries = pe_get32 (dll, opthdr_ofs + 92);
-  if (num_entries < 1) /* no exports */
-    return false;
+
+  if (num_entries < 1) /* No exports.  */
+    return FALSE;
+
   export_rva = pe_get32 (dll, opthdr_ofs + 96);
   export_size = pe_get32 (dll, opthdr_ofs + 100);
@@ -1812 +2542 @@
             pe_get16 (dll, pe_header_offset + 4 + 16));
   expptr = 0;
+
+  /* Get the rva and size of the export section.  */ 
   for (i = 0; i < nsections; i++)
     {
@@ -1819 +2551 @@
       unsigned long vsize = pe_get32 (dll, secptr1 + 16);
       unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-      bfd_seek (dll, secptr1, SEEK_SET);
-      bfd_read (sname, 1, 8, dll);
+
+      bfd_seek (dll, (file_ptr) secptr1, SEEK_SET);
+      bfd_bread (sname, (bfd_size_type) 8, dll);
+
       if (vaddr <= export_rva && vaddr + vsize > export_rva)
         {
@@ -1830 +2564 @@
     }
 
+  /* Scan sections and store the base and size of the
+     data and bss segments in data/base_start/end.  */ 
+  for (i = 0; i < nsections; i++)
+    {
+      unsigned long secptr1 = secptr + 40 * i;
+      unsigned long vsize = pe_get32 (dll, secptr1 + 8);
+      unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
+      unsigned long flags = pe_get32 (dll, secptr1 + 36);
+      char sec_name[9];
+
+      sec_name[8] = '\0';
+      bfd_seek (dll, (file_ptr) secptr1 + 0, SEEK_SET);
+      bfd_bread (sec_name, (bfd_size_type) 8, dll);
+
+      if (strcmp(sec_name,".data") == 0)
+        {
+          data_start = vaddr;
+          data_end = vaddr + vsize;
+
+          if (pe_dll_extra_pe_debug)
+            printf ("%s %s: 0x%08lx-0x%08lx (0x%08lx)\n",
+                    __FUNCTION__, sec_name, vaddr, vaddr + vsize, flags);
+        }
+      else if (strcmp (sec_name,".bss") == 0)
+        {
+          bss_start = vaddr;
+          bss_end = vaddr + vsize;
+
+          if (pe_dll_extra_pe_debug)
+            printf ("%s %s: 0x%08lx-0x%08lx (0x%08lx)\n",
+                    __FUNCTION__, sec_name, vaddr, vaddr + vsize, flags);
+        }
+    }
+
   expdata = (unsigned char *) xmalloc (export_size);
-  bfd_seek (dll, expptr, SEEK_SET);
-  bfd_read (expdata, 1, export_size, dll);
+  bfd_seek (dll, (file_ptr) expptr, SEEK_SET);
+  bfd_bread (expdata, (bfd_size_type) export_size, dll);
   erva = expdata - export_rva;
 
@@ -1842 +2610 @@
   ordinals = pe_as32 (expdata + 36);
   ordbase = pe_as32 (expdata + 16);
+  exp_funcbase = pe_as32 (expdata + 28);
+
+  /* Use internal dll name instead of filename
+     to enable symbolic dll linking.  */
+  dll_name = pe_as32 (expdata + 12) + erva;
+
+  /* Check to see if the dll has already been added to
+     the definition list and if so return without error.
+     This avoids multiple symbol definitions.  */
+  if (def_get_module (pe_def_file, dll_name))
+    {
+      if (pe_dll_extra_pe_debug)
+        printf ("%s is already loaded\n", dll_name);
+      return TRUE;
+    }
+
+  /* Iterate through the list of symbols.  */
   for (i = 0; i < nexp; i++)
     {
+      /* Pointer to the names vector.  */
       unsigned long name_rva = pe_as32 (erva + name_rvas + i * 4);
       def_file_import *imp;
-      imp = def_file_add_import (pe_def_file, erva + name_rva, dll_name,
-                                 i, 0);
-    }
-
-  return true;
-}
-
-/************************************************************************
-
- These are the main functions, called from the emulation.  The first
- is called after the bfds are read, so we can guess at how much space
- we need.  The second is called after everything is placed, so we
- can put the right values in place.
-
- ************************************************************************/
+      /* Pointer to the function address vector.  */ 
+      unsigned long func_rva = pe_as32 (erva + exp_funcbase + i * 4);
+      int is_data = 0;
+
+      /* Skip unwanted symbols, which are
+         exported in buggy auto-import releases.  */
+      if (strncmp (erva + name_rva, "_nm_", 4) != 0)
+        {
+          /* is_data is true if the address is in the data or bss segment.  */
+          is_data =
+            (func_rva >= data_start && func_rva < data_end)
+            || (func_rva >= bss_start && func_rva < bss_end);
+
+          imp = def_file_add_import (pe_def_file, erva + name_rva,
+                                     dll_name, i, 0);
+          /* Mark symbol type.  */
+          imp->data = is_data;
+ 
+          if (pe_dll_extra_pe_debug)
+            printf ("%s dll-name: %s sym: %s addr: 0x%lx %s\n",
+                    __FUNCTION__, dll_name, erva + name_rva,
+                    func_rva, is_data ? "(data)" : "");
+        }
+    }
+
+  return TRUE;
+}
+
+/* These are the main functions, called from the emulation.  The first
+   is called after the bfds are read, so we can guess at how much space
+   we need.  The second is called after everything is placed, so we
+   can put the right values in place.  */
 
 void
@@ -1870 +2673 @@
   process_def_file (abfd, info);
 
+  if (pe_def_file->num_exports == 0 && !(info->shared))
+    return;
+
   generate_edata (abfd, info);
   build_filler_bfd (1);
@@ -1898 +2704 @@
       /* Resize the sections.  */
       lang_size_sections (stat_ptr->head, abs_output_section,
-                          &stat_ptr->head, 0, (bfd_vma) 0, false);
+                          &stat_ptr->head, 0, (bfd_vma) 0, NULL, TRUE);
 
       /* Redo special stuff.  */
@@ -1906 +2712 @@
       lang_do_assignments (stat_ptr->head,
                            abs_output_section,
-                           (fill_type) 0, (bfd_vma) 0);
+                           (fill_type *) 0, (bfd_vma) 0);
     }
 
   fill_edata (abfd, info);
 
-  pe_data (abfd)->dll = 1;
+  if (info->shared)
+    pe_data (abfd)->dll = 1;
 
   edata_s->contents = edata_d;
@@ -1932 +2739 @@
       /* Resize the sections.  */
       lang_size_sections (stat_ptr->head, abs_output_section,
-                          &stat_ptr->head, 0, (bfd_vma) 0, false);
+                          &stat_ptr->head, 0, (bfd_vma) 0, NULL, TRUE);
 
       /* Redo special stuff.  */
@@ -1940 +2747 @@
       lang_do_assignments (stat_ptr->head,
                            abs_output_section,
-                           (fill_type) 0, (bfd_vma) 0);
+                           (fill_type *) 0, (bfd_vma) 0);
     }
   reloc_s->contents = reloc_d;