Apply mainline patches

	* elf32-cris.c (cris_elf_check_relocs) <plt accounting for
	R_CRIS_8, R_CRIS_16, and R_CRIS_32>: Move early break for
	non-SEC_ALLOC sections before GOT and PLT accounting.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 005934625d810ea8e8d1425012374c1a062def43..8b0851fe5b65764f4cd50d160f8bdd9b4eb75849 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-01  Hans-Peter Nilsson  <hp@axis.com>
+
+       Apply mainline patches
+       * elf32-cris.c (cris_elf_check_relocs) <plt accounting for
+       R_CRIS_8, R_CRIS_16, and R_CRIS_32>: Move early break for
+       non-SEC_ALLOC sections before GOT and PLT accounting.
+
 2011-11-21  Tristan Gingold  <gingold@adacore.com>
 
        * configure.in: Bump version to 2.22.0

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 243a8ec140d5468fd8933d6b2889aa06180b6e08..310f6d1e6708946412ced6ae02bc0cf5821b27c2 100644 (file)
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -3579,6 +3579,12 @@ cris_elf_check_relocs (bfd *abfd,
                 sec,
                 cris_elf_howto_table[r_type].name);
            }
+
+         /* We don't need to handle relocs into sections not going into
+            the "real" output.  */
+         if ((sec->flags & SEC_ALLOC) == 0)
+           break;
+
          if (h != NULL)
            {
              h->non_got_ref = 1;
@@ -3608,11 +3614,6 @@ cris_elf_check_relocs (bfd *abfd,
          if (! info->shared)
            break;
 
-         /* We don't need to handle relocs into sections not going into
-            the "real" output.  */
-         if ((sec->flags & SEC_ALLOC) == 0)
-           break;
-
          /* We may need to create a reloc section in the dynobj and made room
             for this reloc.  */
          if (sreloc == NULL)