* Makefile.in: Rebuild dependencies.

[deliverable/binutils-gdb.git] / bfd / cf-m68klynx.c

diff --git a/bfd/cf-m68klynx.c b/bfd/cf-m68klynx.c
index 15c9915b888114525d83e872be3599183ccd8cbc..bb12e2210f5511e3f5582a915e66c2c7f657f503 100644 (file)
--- a/bfd/cf-m68klynx.c
+++ b/bfd/cf-m68klynx.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Motorola M68K COFF LynxOS files.
-   Copyright 1993, 1994 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 1995 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -43,7 +43,8 @@ struct internal_syment;
 
 static bfd_reloc_status_type _bfd_m68klynx_special_fn
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static const struct reloc_howto_struct *coff_m68k_lynx_rtype_to_howto
+static boolean lynx_link_add_symbols PARAMS ((bfd *, struct bfd_link_info *));
+static reloc_howto_type *coff_m68k_lynx_rtype_to_howto
   PARAMS ((bfd *, asection *, struct internal_reloc *,
           struct coff_link_hash_entry *, struct internal_syment *,
           bfd_vma *));
@@ -103,7 +104,7 @@ _bfd_m68klynx_special_fn (abfd, reloc_entry, symbol, data, input_section,
 
   if (diff != 0)
     {
-      const reloc_howto_type *howto = reloc_entry->howto;
+      reloc_howto_type *howto = reloc_entry->howto;
       unsigned char *addr = (unsigned char *) data + reloc_entry->address;
 
       switch (howto->size)
@@ -175,20 +176,50 @@ _bfd_m68klynx_special_fn (abfd, reloc_entry, symbol, data, input_section,
       cache_ptr->addend += asect->vma;                         \
   }
 
+#define coff_bfd_link_add_symbols lynx_link_add_symbols
 #define coff_rtype_to_howto coff_m68k_lynx_rtype_to_howto
 
 #include "coff-m68k.c"
 
+/* On Lynx, we may have a COFF archive which contains a.out elements.
+   This screws up the COFF linker, which expects that any archive it
+   gets contains COFF elements.  We override the add_symbols function
+   to check for this case.  */
+
+static boolean
+lynx_link_add_symbols (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  if (bfd_get_format (abfd) == bfd_archive)
+    {
+      bfd *first;
+
+      first = bfd_openr_next_archived_file (abfd, (bfd *) NULL);
+      if (first == NULL)
+       return false;
+      if (! bfd_check_format (first, bfd_object))
+       return false;
+      if (bfd_get_flavour (first) != bfd_target_coff_flavour)
+       {
+         /* Treat the archive as though it were actually of the
+            flavour of its first element.  This ought to work,
+            since the archive support is fairly generic.  */
+         return (*first->xvec->_bfd_link_add_symbols) (abfd, info);
+       }
+    }
+
+  return _bfd_coff_link_add_symbols (abfd, info);
+}
+
 /* coff-m68k.c uses the special COFF backend linker.  We need to
-   adjust common symbols.  FIXME: We may able to get rid of
-   CALC_ADDEND and _bfd_m68klynx_special_fn.  However, they may still
-   be used by gas.
+   adjust common symbols.
 
    We can't define this function until after we have included
    coff-m68k.c, because it uses RTYPE2HOWTO.  */
 
 /*ARGSUSED*/
-static const struct reloc_howto_struct *
+static reloc_howto_type *
 coff_m68k_lynx_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
      bfd *abfd;
      asection *sec;
@@ -198,13 +229,13 @@ coff_m68k_lynx_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
      bfd_vma *addendp;
 {
   arelent relent;
-  const struct reloc_howto_struct *howto;
+  reloc_howto_type *howto;
 
   RTYPE2HOWTO (&relent, rel);
 
   howto = relent.howto;
 
-  if (sym->n_scnum == 0 && sym->n_value != 0)
+  if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
     {
       /* This is a common symbol.  The section contents include the
         size (sym->n_value) as an addend.  The relocate_section