Wed Nov 3 23:31:19 1999 Jeffrey A Law (law@cygnus.com)

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

diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index 1752d6666f4530323d3348ade53093490b9729d2..657f41dae3aceda3e02b9d4309a455b7d3d616b1 100644 (file)
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -38,6 +38,7 @@
 #include "coff/internal.h"
 #include "../bfd/libcoff.h"
 #include "deffile.h"
+#include "pe-dll.h"
 
 /************************************************************************
 
@@ -71,12 +72,12 @@ static bfd_vma image_base;
 static bfd *filler_bfd;
 static struct sec *edata_s, *reloc_s;
 static unsigned char *edata_d, *reloc_d;
-static int edata_sz, reloc_sz;
+static size_t edata_sz, reloc_sz;
 
 typedef struct {
   char *target_name;
   char *object_target;
-  int imagebase_reloc;
+  unsigned int imagebase_reloc;
   int pe_arch;
   int bfd_arch;
   int underscored;
@@ -93,7 +94,7 @@ static pe_details_type pe_detail_list[] = {
     bfd_arch_i386,
     1
   },
-  { 0 }
+  { NULL, NULL, 0, 0, 0, 0 }
 };
 
 static pe_details_type *pe_details;
@@ -102,7 +103,7 @@ static pe_details_type *pe_details;
 
 void
 pe_dll_id_target (target)
-     char *target;
+     const char *target;
 {
   int i;
   for (i=0; pe_detail_list[i].target_name; i++)
@@ -227,7 +228,7 @@ auto_export (d, n)
 
 static void
 process_def_file (abfd, info)
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
   int i, j;
@@ -383,13 +384,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)
@@ -489,7 +499,7 @@ build_filler_bfd (include_edata)
 static void
 generate_edata (abfd, info)
      bfd *abfd;
-     struct bfd_link_info *info;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
 {
   int i, next_ordinal;
   int name_table_size = 0;
@@ -571,10 +581,47 @@ 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_edata (abfd, info)
+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;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
 {
   int i, hint;
   unsigned char *edirectory;
@@ -614,6 +661,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++)
@@ -844,7 +893,7 @@ quoteput (s, f, needs_quotes)
 
 void
 pe_dll_generate_def_file (pe_out_def_filename)
-     char *pe_out_def_filename;
+     const char *pe_out_def_filename;
 {
   int i;
   FILE *out = fopen (pe_out_def_filename, "w");
@@ -1306,7 +1355,8 @@ make_one (exp, parent)
   id5 = quick_section (abfd, ".idata$5", SEC_HAS_CONTENTS, 2);
   id4 = quick_section (abfd, ".idata$4", SEC_HAS_CONTENTS, 2);
   id6 = quick_section (abfd, ".idata$6", SEC_HAS_CONTENTS, 2);
-  quick_symbol (abfd, U(""), exp->internal_name, "", tx, BSF_GLOBAL, 0);
+  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);
   quick_symbol (abfd, U("_imp__"), exp->internal_name, "", id5, BSF_GLOBAL, 0);
@@ -1397,7 +1447,7 @@ make_one (exp, parent)
 void
 pe_dll_generate_implib (def, impfilename)
      def_file *def;
-     char *impfilename;
+     const char *impfilename;
 {
   int i;
   bfd *ar_head;
@@ -1611,14 +1661,14 @@ pe_as32 (ptr)
 
 boolean
 pe_implied_import_dll (filename)
-     char *filename;
+     const char *filename;
 {
   bfd *dll;
   unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
   unsigned long export_rva, export_size, nsections, secptr, expptr;
   unsigned char *expdata, *erva;
   unsigned long name_rvas, ordinals, nexp, ordbase;
-  char *dll_name;
+  const char *dll_name;
 
   /* No, I can't use bfd here.  kernel32.dll puts its export table in
      the middle of the .rdata section. */
@@ -1717,7 +1767,7 @@ pe_dll_build_sections (abfd, info)
 void
 pe_exe_build_sections (abfd, info)
      bfd *abfd;
-     struct bfd_link_info *info;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
 {
   pe_dll_id_target (bfd_get_target (abfd));
   build_filler_bfd (0);