* m10300-opc.c (mn10300_opcodes): Fix opcode for 4 operand "mul" and

[deliverable/binutils-gdb.git] / bfd / sunos.c

diff --git a/bfd/sunos.c b/bfd/sunos.c
index 25b9072c3066b0e5a75871efe3bd14eeb1ef7fd8..75f3ce3f63f98f01679eb876e4c79a93581b46d3 100644 (file)
--- a/bfd/sunos.c
+++ b/bfd/sunos.c
@@ -1,5 +1,5 @@
 /* BFD backend for SunOS binaries.
-   Copyright (C) 1990, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -78,6 +78,14 @@ static boolean sunos_finish_dynamic_link
 #define MY_check_dynamic_reloc sunos_check_dynamic_reloc
 #define MY_finish_dynamic_link sunos_finish_dynamic_link
 
+/* ??? Where should this go?  */
+#define MACHTYPE_OK(mtype) \
+  (((mtype) == M_SPARC && bfd_lookup_arch (bfd_arch_sparc, 0) != NULL) \
+   || ((mtype) == M_SPARCLET \
+       && bfd_lookup_arch (bfd_arch_sparc, bfd_mach_sparc_sparclet) != NULL) \
+   || (((mtype) == M_UNKNOWN || (mtype) == M_68010 || (mtype) == M_68020) \
+       && bfd_lookup_arch (bfd_arch_m68k, 0) != NULL))
+
 /* Include the usual a.out support.  */
 #include "aoutf1.h"
 
@@ -620,9 +628,11 @@ struct sunos_link_hash_entry
   /* Symbol is defined by a regular object.  */
 #define SUNOS_DEF_REGULAR 02
   /* Symbol is referenced by a dynamic object.  */
-#define SUNOS_REF_DYNAMIC 010
+#define SUNOS_REF_DYNAMIC 04
   /* Symbol is defined by a dynamic object.  */
-#define SUNOS_DEF_DYNAMIC 020
+#define SUNOS_DEF_DYNAMIC 010
+  /* Symbol is a constructor symbol in a regular object.  */
+#define SUNOS_CONSTRUCTOR 020
 };
 
 /* The SunOS linker hash table.  */
@@ -1026,8 +1036,13 @@ sunos_add_one_symbol (info, abfd, name, flags, section, value, string,
        return false;
     }
 
-  h = sunos_link_hash_lookup (sunos_hash_table (info), name, true, copy,
-                             false);
+  if ((flags & (BSF_INDIRECT | BSF_WARNING | BSF_CONSTRUCTOR)) != 0
+      || ! bfd_is_und_section (section))
+    h = sunos_link_hash_lookup (sunos_hash_table (info), name, true, copy,
+                               false);
+  else
+    h = ((struct sunos_link_hash_entry *)
+        bfd_wrapped_link_hash_lookup (abfd, info, name, true, copy, false));
   if (h == NULL)
     return false;
 
@@ -1077,6 +1092,29 @@ sunos_add_one_symbol (info, abfd, name, flags, section, value, string,
        }
     }
 
+  if ((abfd->flags & DYNAMIC) != 0
+      && abfd->xvec == info->hash->creator
+      && (h->flags & SUNOS_CONSTRUCTOR) != 0)
+    {
+      /* The existing symbol is a constructor symbol, and this symbol
+         is from a dynamic object.  A constructor symbol is actually a
+         definition, although the type will be bfd_link_hash_undefined
+         at this point.  We want to ignore the definition from the
+         dynamic object.  */
+      section = bfd_und_section_ptr;
+    }
+  else if ((flags & BSF_CONSTRUCTOR) != 0
+          && (abfd->flags & DYNAMIC) == 0
+          && h->root.root.type == bfd_link_hash_defined
+          && h->root.root.u.def.section->owner != NULL
+          && (h->root.root.u.def.section->owner->flags & DYNAMIC) != 0)
+    {
+      /* The existing symbol is defined by a dynamic object, and this
+         is a constructor symbol.  As above, we want to force the use
+         of the constructor symbol from the regular object.  */
+      h->root.root.type = bfd_link_hash_new;
+    }
+
   /* Do the usual procedure for adding a symbol.  */
   if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
                                          value, string, copy, collect,
@@ -1112,6 +1150,10 @@ sunos_add_one_symbol (info, abfd, name, flags, section, value, string,
          ++sunos_hash_table (info)->dynsymcount;
          h->dynindx = -2;
        }
+
+      if ((flags & BSF_CONSTRUCTOR) != 0
+         && (abfd->flags & DYNAMIC) == 0)
+       h->flags |= SUNOS_CONSTRUCTOR;
     }
 
   return true;
@@ -1477,7 +1519,7 @@ sunos_scan_std_relocs (info, abfd, sec, relocs, rel_size)
       struct sunos_link_hash_entry *h;
 
       /* We only want relocs against external symbols.  */
-      if (abfd->xvec->header_byteorder_big_p)
+      if (bfd_header_big_endian (abfd))
        {
          if ((rel->r_type[0] & RELOC_STD_BITS_EXTERN_BIG) == 0)
            continue;
@@ -1489,7 +1531,7 @@ sunos_scan_std_relocs (info, abfd, sec, relocs, rel_size)
        }
 
       /* Get the symbol index.  */
-      if (abfd->xvec->header_byteorder_big_p)
+      if (bfd_header_big_endian (abfd))
        r_index = ((rel->r_index[0] << 16)
                   | (rel->r_index[1] << 8)
                   | rel->r_index[2]);
@@ -1632,7 +1674,7 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
       struct sunos_link_hash_entry *h = NULL;
 
       /* Swap in the reloc information.  */
-      if (abfd->xvec->header_byteorder_big_p)
+      if (bfd_header_big_endian (abfd))
        {
          r_index = ((rel->r_index[0] << 16)
                     | (rel->r_index[1] << 8)
@@ -1767,6 +1809,17 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
              || (h->flags & SUNOS_DEF_REGULAR) != 0))
        continue;
 
+      if (r_type == RELOC_JMP_TBL
+         && ! info->shared
+         && (h->flags & SUNOS_DEF_DYNAMIC) == 0
+         && (h->flags & SUNOS_DEF_REGULAR) == 0)
+       {
+         /* This symbol is apparently undefined.  Don't do anything
+             here; just let the relocation routine report an undefined
+             symbol.  */
+         continue;
+       }
+
       if (strcmp (h->root.root.root.string, "__GLOBAL_OFFSET_TABLE_") == 0)
        continue;
 
@@ -1782,6 +1835,7 @@ sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
        }
 
       BFD_ASSERT (r_type == RELOC_JMP_TBL
+                 || info->shared
                  || (h->flags & SUNOS_REF_REGULAR) != 0);
       BFD_ASSERT (r_type == RELOC_JMP_TBL
                  || info->shared
@@ -2169,7 +2223,7 @@ sunos_write_dynamic_symbol (output_bfd, info, harg)
 
              srel = (struct reloc_std_external *) p;
              PUT_WORD (output_bfd, r_address, srel->r_address);
-             if (output_bfd->xvec->header_byteorder_big_p)
+             if (bfd_header_big_endian (output_bfd))
                {
                  srel->r_index[0] = h->dynindx >> 16;
                  srel->r_index[1] = h->dynindx >> 8;
@@ -2192,7 +2246,7 @@ sunos_write_dynamic_symbol (output_bfd, info, harg)
 
              erel = (struct reloc_ext_external *) p;
              PUT_WORD (output_bfd, r_address, erel->r_address);
-             if (output_bfd->xvec->header_byteorder_big_p)
+             if (bfd_header_big_endian (output_bfd))
                {
                  erel->r_index[0] = h->dynindx >> 16;
                  erel->r_index[1] = h->dynindx >> 8;
@@ -2266,7 +2320,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
       struct reloc_std_external *srel;
 
       srel = (struct reloc_std_external *) reloc;
-      if (input_bfd->xvec->header_byteorder_big_p)
+      if (bfd_header_big_endian (input_bfd))
        {
          baserel = (0 != (srel->r_type[0] & RELOC_STD_BITS_BASEREL_BIG));
          jmptbl = (0 != (srel->r_type[0] & RELOC_STD_BITS_JMPTABLE_BIG));
@@ -2283,7 +2337,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
       int r_type;
 
       erel = (struct reloc_ext_external *) reloc;
-      if (input_bfd->xvec->header_byteorder_big_p)
+      if (bfd_header_big_endian (input_bfd))
        r_type = ((erel->r_type[0] & RELOC_EXT_BITS_TYPE_BIG)
                  >> RELOC_EXT_BITS_TYPE_SH_BIG);
       else
@@ -2312,7 +2366,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
          srel = (struct reloc_std_external *) reloc;
          if (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE)
            {
-             if (input_bfd->xvec->header_byteorder_big_p)
+             if (bfd_header_big_endian (input_bfd))
                r_index = ((srel->r_index[0] << 16)
                           | (srel->r_index[1] << 8)
                           | srel->r_index[2]);
@@ -2326,7 +2380,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
              struct reloc_ext_external *erel;
 
              erel = (struct reloc_ext_external *) reloc;
-             if (input_bfd->xvec->header_byteorder_big_p)
+             if (bfd_header_big_endian (input_bfd))
                r_index = ((erel->r_index[0] << 16)
                           | (erel->r_index[1] << 8)
                           | erel->r_index[2]);
@@ -2386,7 +2440,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
                             + sgot->output_section->vma
                             + sgot->output_offset),
                            srel->r_address);
-                 if (dynobj->xvec->header_byteorder_big_p)
+                 if (bfd_header_big_endian (dynobj))
                    {
                      srel->r_index[0] = indx >> 16;
                      srel->r_index[1] = indx >> 8;
@@ -2425,7 +2479,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
                             + sgot->output_section->vma
                             + sgot->output_offset),
                            erel->r_address);
-                 if (dynobj->xvec->header_byteorder_big_p)
+                 if (bfd_header_big_endian (dynobj))
                    {
                      erel->r_index[0] = indx >> 16;
                      erel->r_index[1] = indx >> 8;
@@ -2516,7 +2570,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
                 + input_section->output_section->vma
                 + input_section->output_offset),
                srel->r_address);
-      if (dynobj->xvec->header_byteorder_big_p)
+      if (bfd_header_big_endian (dynobj))
        {
          srel->r_index[0] = indx >> 16;
          srel->r_index[1] = indx >> 8;
@@ -2539,7 +2593,7 @@ sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
                 + input_section->output_section->vma
                 + input_section->output_offset),
                erel->r_address);
-      if (dynobj->xvec->header_byteorder_big_p)
+      if (bfd_header_big_endian (dynobj))
        {
          erel->r_index[0] = indx >> 16;
          erel->r_index[1] = indx >> 8;