* micromips-opc.c (micromips_opcodes): Use NODS rather than TRAP

[binutils-gdb.git] / bfd / elf32-microblaze.c

diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
index a64926a51efa5bd94dc93c4b4c4dc6b2eca4a325..b180dc4308cd9b312ae04a9f65f72504576979f4 100644 (file)
--- a/bfd/elf32-microblaze.c
+++ b/bfd/elf32-microblaze.c
@@ -1,6 +1,6 @@
 /* Xilinx MicroBlaze-specific support for 32-bit ELF
 
-   Copyright 2009, 2010 Free Software Foundation, Inc.
+   Copyright 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -824,7 +824,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
            }
 
          /* Sanity check the address.  */
-         if (offset > bfd_get_section_limit (output_bfd, input_section))
+         if (offset > bfd_get_section_limit (input_bfd, input_section))
            {
              r = bfd_reloc_outofrange;
              goto check_reloc;
@@ -1067,10 +1067,10 @@ microblaze_elf_relocate_section (bfd *output_bfd,
            case (int) R_MICROBLAZE_64:
            case (int) R_MICROBLAZE_32:
              {
-               /* r_symndx will be zero only for relocs against symbols
+               /* r_symndx will be STN_UNDEF (zero) only for relocs against symbols
                   from removed linkonce sections, or sections discarded by
                   a linker script.  */
-               if (r_symndx == 0 || (input_section->flags & SEC_ALLOC) == 0)
+               if (r_symndx == STN_UNDEF || (input_section->flags & SEC_ALLOC) == 0)
                  {
                    relocation += addend;
                    if (r_type == R_MICROBLAZE_32)
@@ -2060,7 +2060,7 @@ microblaze_elf_check_relocs (bfd * abfd,
                    const char *name;
                    bfd *dynobj;
                    unsigned int strndx = elf_elfheader (abfd)->e_shstrndx;
-                   unsigned int shnam = elf_section_data (sec)->rel_hdr.sh_name;
+                   unsigned int shnam = _bfd_elf_single_rel_hdr (sec)->sh_name;
 
                    name = bfd_elf_string_from_elf_section (abfd, strndx, shnam);
                    if (name == NULL)
@@ -2382,12 +2382,6 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * dat)
   if (h->root.type == bfd_link_hash_indirect)
     return TRUE;
 
-  if (h->root.type == bfd_link_hash_warning)
-    /* When warning symbols are created, they **replace** the "real"
-       entry in the hash table, thus we never get to see the real
-       symbol in a hash traversal.  So look at it now.  */
-    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-
   info = (struct bfd_link_info *) dat;
   htab = elf32_mb_hash_table (info);
   if (htab == NULL)