* sunos.c (sunos_create_dynamic_sections): We need the dynamic

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

diff --git a/bfd/cf-m68klynx.c b/bfd/cf-m68klynx.c
index 0a4dc09c3f17dc584b9e2b0328e7cfb33b4947cd..6425c3013e759c62472d5380b7ae8c06260b9667 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, 1996 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -16,7 +16,7 @@ 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 TARGET_SYM     m68klynx_coff_vec
 #define TARGET_NAME    "coff-m68k-lynx"
@@ -43,8 +43,7 @@ struct internal_syment;
 
 static bfd_reloc_status_type _bfd_m68klynx_special_fn
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean lynx_link_add_symbols PARAMS ((bfd *, struct bfd_link_info *));
-static const struct reloc_howto_struct *coff_m68k_lynx_rtype_to_howto
+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 *));
@@ -176,42 +175,10 @@ _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.
 
@@ -219,7 +186,7 @@ lynx_link_add_symbols (abfd, info)
    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;
@@ -229,12 +196,15 @@ 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 (howto->pc_relative)
+    *addendp += sec->vma;
+
   if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
     {
       /* This is a common symbol.  The section contents include the