* elf64-mips.c (elf_backend_got_header_size): Correct definition.

[deliverable/binutils-gdb.git] / bfd / elfcode.h

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index b7e022614ca59648f0c8e941a9fc0a7789f53674..c985c63ee61c3b9ae3f2370820148b533e0817c7 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -1,6 +1,6 @@
 /* ELF executable support for BFD.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
    Free Software Foundation, Inc.
 
    Written by Fred Fish @ Cygnus Support, from information published
@@ -1097,8 +1097,28 @@ elf_checksum_contents (bfd *abfd,
       elf_swap_shdr_out (abfd, &i_shdr, &x_shdr);
       (*process) (&x_shdr, sizeof x_shdr, arg);
 
+      /* PR ld/12451:
+        Process the section's contents, if it has some.  Read them in if necessary.  */
       if (i_shdr.contents)
        (*process) (i_shdr.contents, i_shdr.sh_size, arg);
+      else if (i_shdr.sh_type != SHT_NOBITS)
+       {
+         asection *sec;
+
+         sec = bfd_section_from_elf_index (abfd, count);
+         if (sec != NULL)
+           {
+             if (sec->contents == NULL)
+               {
+                 /* Force rereading from file.  */
+                 sec->flags &= ~SEC_IN_MEMORY;
+                 if (! bfd_malloc_and_get_section (abfd, sec, & sec->contents))
+                   continue;
+               }
+             if (sec->contents != NULL)
+               (*process) (sec->contents, i_shdr.sh_size, arg);
+           }
+       }
     }
 
   return TRUE;
@@ -1430,7 +1450,7 @@ elf_slurp_reloc_table_from_section (bfd *abfd,
          (*_bfd_error_handler)
            (_("%s(%s): relocation %d has invalid symbol index %ld"),
             abfd->filename, asect->name, i, ELF_R_SYM (rela.r_info));
-         relent->sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
+         relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
        }
       else
        {