add LOCAL SECDIFF relocation for m32 mach-o

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

diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
index da80c853589d7814d8e1ac7e6262e5c3ffe11c6e..a58f7b39a07aadddc03769fa87a95b66ce596d97 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)
@@ -1109,7 +1109,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
                  {
                    Elf_Internal_Rela outrel;
                    bfd_byte *loc;
-                   bfd_boolean skip, relocate = FALSE;
+                   bfd_boolean skip;
 
                    /* When generating a shared object, these relocations
                       are copied into the output file to be resolved at run
@@ -1125,7 +1125,7 @@ microblaze_elf_relocate_section (bfd *output_bfd,
                    if (outrel.r_offset == (bfd_vma) -1)
                      skip = TRUE;
                    else if (outrel.r_offset == (bfd_vma) -2)
-                     skip = TRUE, relocate = TRUE;
+                     skip = TRUE;
                    outrel.r_offset += (input_section->output_section->vma
                                        + input_section->output_offset);
 
@@ -1880,7 +1880,8 @@ create_got_section (bfd *dynobj, struct bfd_link_info *info)
   if (!htab->sgot || !htab->sgotplt)
     return FALSE;
 
-  htab->srelgot = bfd_make_section (dynobj, ".rela.got");
+  if (!(htab->srelgot = bfd_get_section_by_name (dynobj, ".rela.got")))
+    htab->srelgot = bfd_make_section (dynobj, ".rela.got");
   if (htab->srelgot == NULL
       || ! bfd_set_section_flags (dynobj, htab->srelgot, SEC_ALLOC
                                   | SEC_LOAD
@@ -1907,7 +1908,6 @@ microblaze_elf_check_relocs (bfd * abfd,
   const Elf_Internal_Rela *     rel;
   const Elf_Internal_Rela *     rel_end;
   struct elf32_mb_link_hash_table *htab;
-  bfd_vma *local_got_offsets;
   asection *sreloc = NULL;
 
   if (info->relocatable)
@@ -1917,7 +1917,6 @@ microblaze_elf_check_relocs (bfd * abfd,
   if (htab == NULL)
     return FALSE;
 
-  local_got_offsets = elf_local_got_offsets (abfd);
   symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
   sym_hashes_end = sym_hashes + symtab_hdr->sh_size / sizeof (Elf32_External_Sym);
@@ -2062,7 +2061,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)
@@ -2384,12 +2383,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)
@@ -2747,15 +2740,12 @@ microblaze_elf_finish_dynamic_symbol (bfd *output_bfd,
                                      struct elf_link_hash_entry *h,
                                      Elf_Internal_Sym *sym)
 {
-  bfd *dynobj;
   struct elf32_mb_link_hash_table *htab;
 
   htab = elf32_mb_hash_table (info);
   if (htab == NULL)
     return FALSE;
 
-  dynobj = htab->elf.dynobj;
-
   if (h->plt.offset != (bfd_vma) -1)
     {
       asection *splt;
@@ -3031,6 +3021,7 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
 #define TARGET_BIG_NAME                "elf32-microblaze"
 
 #define ELF_ARCH               bfd_arch_microblaze
+#define ELF_TARGET_ID          MICROBLAZE_ELF_DATA
 #define ELF_MACHINE_CODE       EM_MICROBLAZE
 #define ELF_MACHINE_ALT1       EM_MICROBLAZE_OLD
 #define ELF_MAXPAGESIZE                0x4             /* 4k, if we ever have 'em.  */