PowerPC fix for ifunc broken by d1eca1e4

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

diff --git a/bfd/elf32-moxie.c b/bfd/elf32-moxie.c
index b43f396d61f167ec565b1bae28362252f30c1dad..1f685b9c2d6ef65ea0dfa59986c79be72a68316d 100644 (file)
--- a/bfd/elf32-moxie.c
+++ b/bfd/elf32-moxie.c
@@ -1,9 +1,8 @@
 /* moxie-specific support for 32-bit ELF.
-   Copyright 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    Copied from elf32-fr30.c which is..
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1998-2014 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -240,26 +239,19 @@ moxie_elf_relocate_section (bfd *output_bfd,
        }
       else
        {
-         bfd_boolean unresolved_reloc, warned;
+         bfd_boolean unresolved_reloc, warned, ignored;
 
          RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
                                   r_symndx, symtab_hdr, sym_hashes,
                                   h, sec, relocation,
-                                  unresolved_reloc, warned);
+                                  unresolved_reloc, warned, ignored);
 
          name = h->root.root.string;
        }
 
-      if (sec != NULL && elf_discarded_section (sec))
-       {
-         /* For relocs against symbols from removed linkonce sections,
-            or sections discarded by a linker script, we just want the
-            section contents zeroed.  Avoid any special processing.  */
-         _bfd_clear_contents (howto, input_bfd, contents + rel->r_offset);
-         rel->r_info = 0;
-         rel->r_addend = 0;
-         continue;
-       }
+      if (sec != NULL && discarded_section (sec))
+       RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+                                        rel, 1, relend, howto, 0, contents);
 
       if (info->relocatable)
        continue;
@@ -363,6 +355,10 @@ moxie_elf_check_relocs (bfd *abfd,
          while (h->root.type == bfd_link_hash_indirect
                 || h->root.type == bfd_link_hash_warning)
            h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+         /* PR15323, ref flags aren't set for references in the same
+            object.  */
+         h->root.non_ir_ref = 1;
        }
     }
 
@@ -373,8 +369,10 @@ moxie_elf_check_relocs (bfd *abfd,
 #define ELF_MACHINE_CODE       EM_MOXIE
 #define ELF_MAXPAGESIZE                0x1
 
-#define TARGET_BIG_SYM          bfd_elf32_moxie_vec
-#define TARGET_BIG_NAME                "elf32-moxie"
+#define TARGET_BIG_SYM          moxie_elf32_be_vec
+#define TARGET_BIG_NAME                "elf32-bigmoxie"
+#define TARGET_LITTLE_SYM       moxie_elf32_le_vec
+#define TARGET_LITTLE_NAME     "elf32-littlemoxie"
 
 #define elf_info_to_howto_rel                  NULL
 #define elf_info_to_howto                      moxie_info_to_howto_rela