Fix build breakage from last commit (window-nat.c:windows_create_inferior)

[deliverable/binutils-gdb.git] / bfd / elf64-x86-64.c

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 6d92c79c931a32e746a34c726138101f71189043..5d3a65379c7180cbcfc26a4ed167801410bd29c9 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -4926,7 +4926,8 @@ do_ifunc_pointer:
                {
                  /* Symbol is referenced locally.  Make sure it is
                     defined locally or for a branch.  */
-                 fail = !h->def_regular && !branch;
+                 fail = (!(h->def_regular || ELF_COMMON_DEF_P (h))
+                         && !branch);
                }
              else if (!(bfd_link_pie (info)
                         && (h->needs_copy || eh->needs_copy)))
@@ -6912,8 +6913,8 @@ elf_x86_64_parse_gnu_properties (bfd *abfd, unsigned int type,
        {
          _bfd_error_handler
            ((type == GNU_PROPERTY_X86_ISA_1_USED
-             ? _("error: %B: <corrupt x86 ISA used size: 0x%x>\n")
-             : _("error: %B: <corrupt x86 ISA needed size: 0x%x>\n")),
+             ? _("error: %B: <corrupt x86 ISA used size: 0x%x>")
+             : _("error: %B: <corrupt x86 ISA needed size: 0x%x>")),
             abfd, datasz);
          return property_corrupt;
        }