PR22374 testcase, function pointer references in .data

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

diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c
index 33895f625554175b435047cf6453aa2f4c278552..e1e6ed0ee5734f37904f4c14790ec5b12bf371ab 100644 (file)
--- a/bfd/elf32-msp430.c
+++ b/bfd/elf32-msp430.c
@@ -1,5 +1,5 @@
 /*  MSP430-specific support for 32-bit ELF
-    Copyright (C) 2002-2016 Free Software Foundation, Inc.
+    Copyright (C) 2002-2017 Free Software Foundation, Inc.
     Contributed by Dmitry Diky <diwil@mail.ru>
 
     This file is part of BFD, the Binary File Descriptor library.
@@ -698,7 +698,7 @@ elf32_msp430_check_relocs (bfd * abfd, struct bfd_link_info * info,
 
          /* PR15323, ref flags aren't set for references in the same
             object.  */
-         h->root.non_ir_ref = 1;
+         h->root.non_ir_ref_regular = 1;
        }
     }
 
@@ -2227,8 +2227,10 @@ msp430_elf_relax_section (bfd * abfd, asection * sec,
 
        /* Try to turn a 16-bit absolute branch into a 10-bit pc-relative
           branch.  */
-       if (uses_msp430x_relocs (abfd)
-           && ELF32_R_TYPE (irel->r_info) == R_MSP430X_ABS16)
+       if ((uses_msp430x_relocs (abfd)
+            && ELF32_R_TYPE (irel->r_info) == R_MSP430X_ABS16)
+           || (! uses_msp430x_relocs (abfd)
+               && ELF32_R_TYPE (irel->r_info) == R_MSP430_16))
          {
            bfd_vma value = symval;
 
@@ -2445,9 +2447,8 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, struct bfd_link_info *info)
       _bfd_error_handler
        /* xgettext:c-format */
        (_("error: %B uses %s instructions but %B uses %s"),
-        ibfd, first_input_bfd,
-        isa_type (in_attr[OFBA_MSPABI_Tag_ISA].i),
-        isa_type (out_attr[OFBA_MSPABI_Tag_ISA].i));
+        ibfd, isa_type (in_attr[OFBA_MSPABI_Tag_ISA].i),
+        first_input_bfd, isa_type (out_attr[OFBA_MSPABI_Tag_ISA].i));
       result = FALSE;
     }
 
@@ -2458,9 +2459,8 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, struct bfd_link_info *info)
       _bfd_error_handler
        /* xgettext:c-format */
        (_("error: %B uses the %s code model whereas %B uses the %s code model"),
-        ibfd, first_input_bfd,
-        code_model (in_attr[OFBA_MSPABI_Tag_Code_Model].i),
-        code_model (out_attr[OFBA_MSPABI_Tag_Code_Model].i));
+        ibfd, code_model (in_attr[OFBA_MSPABI_Tag_Code_Model].i),
+        first_input_bfd, code_model (out_attr[OFBA_MSPABI_Tag_Code_Model].i));
       result = FALSE;
     }
 
@@ -2482,9 +2482,8 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, struct bfd_link_info *info)
       _bfd_error_handler
        /* xgettext:c-format */
        (_("error: %B uses the %s data model whereas %B uses the %s data model"),
-        ibfd, first_input_bfd,
-        data_model (in_attr[OFBA_MSPABI_Tag_Data_Model].i),
-        data_model (out_attr[OFBA_MSPABI_Tag_Data_Model].i));
+        ibfd, data_model (in_attr[OFBA_MSPABI_Tag_Data_Model].i),
+        first_input_bfd, data_model (out_attr[OFBA_MSPABI_Tag_Data_Model].i));
       result = FALSE;
     }
 
@@ -2507,8 +2506,8 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, struct bfd_link_info *info)
       _bfd_error_handler
        /* xgettext:c-format */
        (_("error: %B uses the %s data model but %B only uses MSP430 instructions"),
-        ibfd, first_input_bfd,
-        data_model (in_attr[OFBA_MSPABI_Tag_Data_Model].i));
+        ibfd, data_model (in_attr[OFBA_MSPABI_Tag_Data_Model].i),
+        first_input_bfd);
       result = FALSE;
     }
 
@@ -2555,7 +2554,8 @@ uses_large_model (bfd *abfd)
 }
 
 static unsigned int
-elf32_msp430_eh_frame_address_size (bfd *abfd, asection *sec ATTRIBUTE_UNUSED)
+elf32_msp430_eh_frame_address_size (bfd *abfd,
+                                   const asection *sec ATTRIBUTE_UNUSED)
 {
   return uses_large_model (abfd) ? 4 : 2;
 }