Fixed duplicate definition of h_accums field in fmt_53_sadd structure

[binutils.git] / bfd / i386linux.c

diff --git a/bfd/i386linux.c b/bfd/i386linux.c
index 91d41430d60819a13fd61537e8aad5535416440e..094c2c843b7c1bd54277fc1bbd02ece757917dbd 100644 (file)
--- a/bfd/i386linux.c
+++ b/bfd/i386linux.c
@@ -1,5 +1,5 @@
 /* BFD back-end for linux flavored i386 a.out binaries.
-   Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -15,9 +15,9 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#define        PAGE_SIZE       4096
+#define        TARGET_PAGE_SIZE        4096
 #define ZMAGIC_DISK_BLOCK_SIZE 1024
 #define        SEGMENT_SIZE    4096
 #define TEXT_START_ADDR        0x0
@@ -36,6 +36,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define MY(OP) CAT(i386linux_,OP)
 #define TARGETNAME "a.out-i386-linux"
 
+extern const bfd_target MY(vec);
+
 /* We always generate QMAGIC files in preference to ZMAGIC files.  It
    would be possible to make this a linker option, if that ever
    becomes important.  */
@@ -94,6 +96,12 @@ i386linux_write_object_contents (abfd)
 #define IS_PLT_SYM(name) \
   (strncmp (name, PLT_REF_PREFIX, sizeof PLT_REF_PREFIX - 1) == 0)
 
+/* This string is used to generate specialized error messages.  */
+
+#ifndef NEEDS_SHRLIB
+#define NEEDS_SHRLIB "__NEEDS_SHRLIB_"
+#endif
+
 /* This special symbol is a set vector that contains a list of
    pointers to fixup tables.  It will be present in any dynamicly
    linked file.  The linker generated fixup table should also be added
@@ -211,12 +219,9 @@ linux_link_hash_table_create (abfd)
   struct linux_link_hash_table *ret;
 
   ret = ((struct linux_link_hash_table *)
-        malloc (sizeof (struct linux_link_hash_table)));
+        bfd_alloc (abfd, sizeof (struct linux_link_hash_table)));
   if (ret == (struct linux_link_hash_table *) NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return (struct bfd_link_hash_table *) NULL;
-    }
+    return (struct bfd_link_hash_table *) NULL;
   if (! NAME(aout,link_hash_table_init) (&ret->root, abfd,
                                         linux_link_hash_newfunc))
     {
@@ -422,6 +427,36 @@ linux_tally_symbols (h, data)
   struct linux_link_hash_entry *h1, *h2;
   boolean exists;
 
+  if (h->root.root.type == bfd_link_hash_undefined
+      && strncmp (h->root.root.root.string, NEEDS_SHRLIB,
+                 sizeof NEEDS_SHRLIB - 1) == 0)
+    {
+      const char *name;
+      char *p;
+      char *alloc = NULL;
+
+      name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1;
+      p = strrchr (name, '_');
+      if (p != NULL)
+       alloc = (char *) malloc (strlen (name) + 1);
+
+      if (p == NULL || alloc == NULL)
+       (*_bfd_error_handler) ("Output file requires shared library `%s'\n",
+                              name);
+      else
+       {
+         strcpy (alloc, name);
+         p = strrchr (alloc, '_');
+         *p++ = '\0';
+         (*_bfd_error_handler)
+           ("Output file requires shared library `%s.so.%s'\n",
+            alloc, p);
+         free (alloc);
+       }
+
+      abort ();
+    }
+
   /* If this symbol is not a PLT/GOT, we do not even need to look at it */
   is_plt = IS_PLT_SYM (h->root.root.root.string);
 
@@ -513,6 +548,9 @@ bfd_linux_size_dynamic_sections (output_bfd, info)
   struct fixup *f;
   asection *s;
 
+  if (output_bfd->xvec != &MY(vec))
+    return true;
+
   /* First find the fixups... */
   linux_link_hash_traverse (linux_hash_table (info),
                            linux_tally_symbols,
@@ -546,11 +584,8 @@ bfd_linux_size_dynamic_sections (output_bfd, info)
       s->_raw_size = 8 + linux_hash_table (info)->fixup_count * 8;
       s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
       if (s->contents == NULL)
-       {
-         bfd_set_error (bfd_error_no_memory);
-         return false;
-       }
-      memset (s->contents, 0, s->_raw_size);
+       return false;
+      memset (s->contents, 0, (size_t) s->_raw_size);
     }
 
   return true;
@@ -571,7 +606,7 @@ linux_finish_dynamic_link (output_bfd, info)
   struct fixup *f;
   unsigned int new_addr;
   int section_offset;
-  int fixups_written;
+  unsigned int fixups_written;
 
   if (linux_hash_table (info)->dynobj == NULL)
     return true;
@@ -601,10 +636,9 @@ linux_finish_dynamic_link (output_bfd, info)
       if (f->h->root.root.type != bfd_link_hash_defined
          && f->h->root.root.type != bfd_link_hash_defweak)
        {
-         /* FIXME!  */
-         fprintf (stderr,
-                  "Symbol %s not defined for fixups\n",
-                  f->h->root.root.root.string);
+         (*_bfd_error_handler)
+           ("Symbol %s not defined for fixups\n",
+            f->h->root.root.root.string);
          continue;
        }
 
@@ -652,10 +686,9 @@ linux_finish_dynamic_link (output_bfd, info)
          if (f->h->root.root.type != bfd_link_hash_defined
              && f->h->root.root.type != bfd_link_hash_defweak)
            {
-             /* FIXME!  */
-             fprintf (stderr,
-                      "Symbol %s not defined for fixups\n",
-                      f->h->root.root.root.string);
+             (*_bfd_error_handler)
+               ("Symbol %s not defined for fixups\n",
+                f->h->root.root.root.string);
              continue;
            }
 
@@ -678,8 +711,7 @@ linux_finish_dynamic_link (output_bfd, info)
 
   if (linux_hash_table (info)->fixup_count != fixups_written)
     {
-      /* FIXME!  */
-      fprintf (stderr, "Warning: fixup count mismatch\n");
+      (*_bfd_error_handler) ("Warning: fixup count mismatch\n");
       while (linux_hash_table (info)->fixup_count > fixups_written)
        {
          bfd_put_32 (output_bfd, 0, fixup_table);