apply patch from MArk Elbrecht tpo update comment and copyright

[deliverable/binutils-gdb.git] / ld / pe-dll.c

diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index 61f57f0989e3241296e00bfcf7e70be26b10d304..9fff27649ee7ce269b7ee654f1ba5255b2f4f56a 100644 (file)
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -1,5 +1,5 @@
 /* Routines to help build PEI-format DLLs (Win32 etc)
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
    Written by DJ Delorie <dj@cygnus.com>
 
    This file is part of GLD, the Gnu Linker.
@@ -60,6 +60,8 @@ int pe_dll_export_everything = 0;
 int pe_dll_do_default_excludes = 1;
 int pe_dll_kill_ats = 0;
 int pe_dll_stdcall_aliases = 0;
+int pe_dll_warn_dup_exports = 0;
+int pe_dll_compat_implib = 0;
 
 /************************************************************************
 
@@ -338,20 +340,22 @@ process_def_file (abfd, info)
     {
       if (i > 0 && strcmp (e[i].name, e[i - 1].name) == 0)
        {
-         /* This is a duplicate */
+         /* This is a duplicate.  */
          if (e[j - 1].ordinal != -1
              && e[i].ordinal != -1
              && e[j - 1].ordinal != e[i].ordinal)
            {
-             /* xgettext:c-format */
-             einfo (_("%XError, duplicate EXPORT with oridinals: %s (%d vs %d)\n"),
-                    e[j - 1].name, e[j - 1].ordinal, e[i].ordinal);
+             if (pe_dll_warn_dup_exports)
+               /* xgettext:c-format */
+               einfo (_("%XError, duplicate EXPORT with oridinals: %s (%d vs %d)\n"),
+                      e[j - 1].name, e[j - 1].ordinal, e[i].ordinal);
            }
          else
            {
-             /* xgettext:c-format */
-             einfo (_("Warning, duplicate EXPORT: %s\n"),
-                    e[j - 1].name);
+             if (pe_dll_warn_dup_exports)
+               /* xgettext:c-format */
+               einfo (_("Warning, duplicate EXPORT: %s\n"),
+                      e[j - 1].name);
            }
          if (e[i].ordinal)
            e[j - 1].ordinal = e[i].ordinal;
@@ -384,13 +388,22 @@ process_def_file (abfd, info)
                                   name,
                                   false, false, true);
 
-      if (blhe && (blhe->type == bfd_link_hash_defined))
+      if (blhe
+          && (blhe->type == bfd_link_hash_defined
+             || (blhe->type == bfd_link_hash_common)))
        {
          count_exported++;
          if (!pe_def_file->exports[i].flag_noname)
            count_exported_byname++;
-         exported_symbol_offsets[i] = blhe->u.def.value;
-         exported_symbol_sections[i] = blhe->u.def.section;
+
+         /* Only fill in the sections. The actual offsets are computed
+            in fill_exported_offsets() after common symbols are laid
+            out.  */
+          if (blhe->type == bfd_link_hash_defined)
+           exported_symbol_sections[i] = blhe->u.def.section;
+         else
+           exported_symbol_sections[i] = blhe->u.c.p->section;
+
          if (pe_def_file->exports[i].ordinal != -1)
            {
              if (max_ordinal < pe_def_file->exports[i].ordinal)
@@ -572,6 +585,43 @@ generate_edata (abfd, info)
              + name_table_size + strlen (dll_name) + 1);
 }
 
+/* Fill the exported symbol offsets. The preliminary work has already
+   been done in process_def_file().  */
+
+static void
+fill_exported_offsets (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  int i, j;
+  struct bfd_link_hash_entry *blhe;
+  bfd *b;
+  struct sec *s;
+  def_file_export *e=0;
+
+  for (i = 0; i < pe_def_file->num_exports; i++)
+    {
+      char *name = (char *) xmalloc (strlen (pe_def_file->exports[i].internal_name) + 2);
+      if (pe_details->underscored)
+       {
+         *name = '_';
+         strcpy (name + 1, pe_def_file->exports[i].internal_name);
+       }
+      else
+       strcpy (name, pe_def_file->exports[i].internal_name);
+
+      blhe = bfd_link_hash_lookup (info->hash,
+                                  name,
+                                  false, false, true);
+
+      if (blhe && (blhe->type == bfd_link_hash_defined))
+       {
+         exported_symbol_offsets[i] = blhe->u.def.value;
+        }
+      free (name);
+    }
+}
+
 static void
 fill_edata (abfd, info)
      bfd *abfd;
@@ -615,6 +665,8 @@ fill_edata (abfd, info)
   bfd_put_32 (abfd, ERVA (enameptrs), edata_d + 32);
   bfd_put_32 (abfd, ERVA (eordinals), edata_d + 36);
 
+  fill_exported_offsets (abfd, info);
+
   /* Ok, now for the filling in part */
   hint = 0;
   for (i = 0; i < export_table_size; i++)
@@ -1311,7 +1363,9 @@ make_one (exp, parent)
     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);
-  quick_symbol (abfd, U("_imp__"), exp->internal_name, "", id5, BSF_GLOBAL, 0);
+  if (pe_dll_compat_implib)
+    quick_symbol (abfd, U("__imp_"), exp->internal_name, "", 
+                  id5, BSF_GLOBAL, 0);
 
   bfd_set_section_size (abfd, tx, jmp_byte_count);
   td = (unsigned char *) xmalloc (jmp_byte_count);
@@ -1407,14 +1461,7 @@ pe_dll_generate_implib (def, impfilename)
   bfd *outarch;
   bfd *head = 0;
 
-  dll_filename = def->name;
-  if (dll_filename == 0)
-    {
-      dll_filename = dll_name;
-      for (i=0; impfilename[i]; i++)
-       if (impfilename[i] == '/' || impfilename[i] == '\\')
-         dll_filename = impfilename+1;
-    }
+  dll_filename = (def->name) ? def->name : dll_name;
   dll_symname = xstrdup (dll_filename);
   for (i=0; dll_symname[i]; i++)
     if (!isalnum ((unsigned char) dll_symname[i]))