Use unique_xmalloc_ptr in fixup_go_packaging
[deliverable/binutils-gdb.git] / bfd / elfxx-x86.c
index 5f55c948edc55bff8b0ccf52387f1af6163418cb..fc783b0e988252bdc9f2a9d717510fe4db02f8f8 100644 (file)
@@ -1,5 +1,5 @@
 /* x86 specific support for ELF
-   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+   Copyright (C) 2017-2020 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -849,6 +849,54 @@ _bfd_x86_elf_compare_relocs (const void *ap, const void *bp)
     return 0;
 }
 
+/* Mark symbol, NAME, as locally defined by linker if it is referenced
+   and not defined in a relocatable object file.  */
+
+static void
+elf_x86_linker_defined (struct bfd_link_info *info, const char *name)
+{
+  struct elf_link_hash_entry *h;
+
+  h = elf_link_hash_lookup (elf_hash_table (info), name,
+                           FALSE, FALSE, FALSE);
+  if (h == NULL)
+    return;
+
+  while (h->root.type == bfd_link_hash_indirect)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+  if (h->root.type == bfd_link_hash_new
+      || h->root.type == bfd_link_hash_undefined
+      || h->root.type == bfd_link_hash_undefweak
+      || h->root.type == bfd_link_hash_common
+      || (!h->def_regular && h->def_dynamic))
+    {
+      elf_x86_hash_entry (h)->local_ref = 2;
+      elf_x86_hash_entry (h)->linker_def = 1;
+    }
+}
+
+/* Hide a linker-defined symbol, NAME, with hidden visibility.  */
+
+static void
+elf_x86_hide_linker_defined (struct bfd_link_info *info,
+                            const char *name)
+{
+  struct elf_link_hash_entry *h;
+
+  h = elf_link_hash_lookup (elf_hash_table (info), name,
+                           FALSE, FALSE, FALSE);
+  if (h == NULL)
+    return;
+
+  while (h->root.type == bfd_link_hash_indirect)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+  if (ELF_ST_VISIBILITY (h->other) == STV_INTERNAL
+      || ELF_ST_VISIBILITY (h->other) == STV_HIDDEN)
+    _bfd_elf_link_hash_hide_symbol (info, h, TRUE);
+}
+
 bfd_boolean
 _bfd_x86_elf_link_check_relocs (bfd *abfd, struct bfd_link_info *info)
 {
@@ -879,17 +927,23 @@ _bfd_x86_elf_link_check_relocs (bfd *abfd, struct bfd_link_info *info)
 
          /* "__ehdr_start" will be defined by linker as a hidden symbol
             later if it is referenced and not defined.  */
-         h = elf_link_hash_lookup (elf_hash_table (info),
-                                   "__ehdr_start",
-                                   FALSE, FALSE, FALSE);
-         if (h != NULL
-             && (h->root.type == bfd_link_hash_new
-                 || h->root.type == bfd_link_hash_undefined
-                 || h->root.type == bfd_link_hash_undefweak
-                 || h->root.type == bfd_link_hash_common))
+         elf_x86_linker_defined (info, "__ehdr_start");
+
+         if (bfd_link_executable (info))
            {
-             elf_x86_hash_entry (h)->local_ref = 2;
-             elf_x86_hash_entry (h)->linker_def = 1;
+             /* References to __bss_start, _end and _edata should be
+                locally resolved within executables.  */
+             elf_x86_linker_defined (info, "__bss_start");
+             elf_x86_linker_defined (info, "_end");
+             elf_x86_linker_defined (info, "_edata");
+           }
+         else
+           {
+             /* Hide hidden __bss_start, _end and _edata in shared
+                libraries.  */
+             elf_x86_hide_linker_defined (info, "__bss_start");
+             elf_x86_hide_linker_defined (info, "_end");
+             elf_x86_hide_linker_defined (info, "_edata");
            }
        }
     }
@@ -1184,7 +1238,7 @@ _bfd_x86_elf_size_dynamic_sections (bfd *output_bfd,
        {
          /* Strip these too.  */
        }
-      else if (htab->is_reloc_section (bfd_get_section_name (dynobj, s)))
+      else if (htab->is_reloc_section (bfd_section_name (s)))
        {
          if (s->size != 0
              && s != htab->elf.srelplt
@@ -1221,6 +1275,13 @@ _bfd_x86_elf_size_dynamic_sections (bfd *output_bfd,
       if ((s->flags & SEC_HAS_CONTENTS) == 0)
        continue;
 
+      /* NB: Initially, the iplt section has minimal alignment to
+        avoid moving dot of the following section backwards when
+        it is empty.  Update its section alignment now since it
+        is non-empty.  */
+      if (s == htab->elf.iplt)
+       bfd_set_section_alignment (s, htab->plt.iplt_alignment);
+
       /* Allocate memory for the section contents.  We use bfd_zalloc
         here in case unused entries are not reclaimed before the
         section's contents are written out.  This should not happen,
@@ -1319,7 +1380,8 @@ _bfd_x86_elf_size_dynamic_sections (bfd *output_bfd,
                {
                  info->callbacks->einfo
                    (_("%P%X: read-only segment has dynamic IFUNC relocations;"
-                      " recompile with -fPIC\n"));
+                      " recompile with %s\n"),
+                    bfd_link_dll (info) ? "-fPIC" : "-fPIE");
                  bfd_set_error (bfd_error_bad_value);
                  return FALSE;
                }
@@ -1705,6 +1767,52 @@ _bfd_x86_elf_fixup_symbol (struct bfd_link_info *info,
   return TRUE;
 }
 
+/* Change the STT_GNU_IFUNC symbol defined in position-dependent
+   executable into the normal function symbol and set its address
+   to its PLT entry, which should be resolved by R_*_IRELATIVE at
+   run-time.  */
+
+void
+_bfd_x86_elf_link_fixup_ifunc_symbol (struct bfd_link_info *info,
+                                     struct elf_x86_link_hash_table *htab,
+                                     struct elf_link_hash_entry *h,
+                                     Elf_Internal_Sym *sym)
+{
+  if (bfd_link_pde (info)
+      && h->def_regular
+      && h->dynindx != -1
+      && h->plt.offset != (bfd_vma) -1
+      && h->type == STT_GNU_IFUNC
+      && h->pointer_equality_needed)
+    {
+      asection *plt_s;
+      bfd_vma plt_offset;
+      bfd *output_bfd = info->output_bfd;
+
+      if (htab->plt_second)
+       {
+         struct elf_x86_link_hash_entry *eh
+           = (struct elf_x86_link_hash_entry *) h;
+
+         plt_s = htab->plt_second;
+         plt_offset = eh->plt_second.offset;
+       }
+      else
+       {
+         plt_s = htab->elf.splt;
+         plt_offset = h->plt.offset;
+       }
+
+      sym->st_size = 0;
+      sym->st_info = ELF_ST_INFO (ELF_ST_BIND (sym->st_info), STT_FUNC);
+      sym->st_shndx
+       = _bfd_elf_section_from_bfd_section (output_bfd,
+                                            plt_s->output_section);
+      sym->st_value = (plt_s->output_section->vma
+                      + plt_s->output_offset + plt_offset);
+    }
+}
+
 /* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
 
 bfd_boolean
@@ -1967,10 +2075,8 @@ _bfd_x86_elf_link_symbol_references_local (struct bfd_link_info *info,
                  && htab->interp == NULL)
              || info->dynamic_undefined_weak == 0))
       || ((h->def_regular || ELF_COMMON_DEF_P (h))
-         && h->versioned == unversioned
          && info->version_info != NULL
-         && bfd_hide_sym_by_version (info->version_info,
-                                     h->root.root.string)))
+         && _bfd_elf_link_hide_sym_by_version (info, h)))
     {
       eh->local_ref = 2;
       return TRUE;
@@ -2064,17 +2170,18 @@ _bfd_x86_elf_get_synthetic_symtab (bfd *abfd,
                              bfd_vma);
   bfd_boolean (*valid_plt_reloc_p) (unsigned int);
 
+  dynrelbuf = NULL;
   if (count == 0)
-    return -1;
+    goto bad_return;
 
   dynrelbuf = (arelent **) bfd_malloc (relsize);
   if (dynrelbuf == NULL)
-    return -1;
+    goto bad_return;
 
   dynrelcount = bfd_canonicalize_dynamic_reloc (abfd, dynrelbuf,
                                                dynsyms);
   if (dynrelcount <= 0)
-    return -1;
+    goto bad_return;
 
   /* Sort the relocs by address.  */
   qsort (dynrelbuf, dynrelcount, sizeof (arelent *),
@@ -2263,33 +2370,29 @@ _bfd_x86_elf_parse_gnu_properties (bfd *abfd, unsigned int type,
 {
   elf_property *prop;
 
-  switch (type)
+  if (type == GNU_PROPERTY_X86_COMPAT_ISA_1_USED
+      || type == GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED
+      || (type >= GNU_PROPERTY_X86_UINT32_AND_LO
+         && type <= GNU_PROPERTY_X86_UINT32_AND_HI)
+      || (type >= GNU_PROPERTY_X86_UINT32_OR_LO
+         && type <= GNU_PROPERTY_X86_UINT32_OR_HI)
+      || (type >= GNU_PROPERTY_X86_UINT32_OR_AND_LO
+         && type <= GNU_PROPERTY_X86_UINT32_OR_AND_HI))
     {
-    case GNU_PROPERTY_X86_ISA_1_USED:
-    case GNU_PROPERTY_X86_ISA_1_NEEDED:
-    case GNU_PROPERTY_X86_FEATURE_1_AND:
       if (datasz != 4)
        {
          _bfd_error_handler
-           ((type == GNU_PROPERTY_X86_ISA_1_USED
-             ? _("error: %pB: <corrupt x86 ISA used size: 0x%x>")
-             : (type == GNU_PROPERTY_X86_ISA_1_NEEDED
-                ? _("error: %pB: <corrupt x86 ISA needed size: 0x%x>")
-                : _("error: %pB: <corrupt x86 feature size: 0x%x>"))),
-            abfd, datasz);
+           (_("error: %pB: <corrupt x86 property (0x%x) size: 0x%x>"),
+            abfd, type, datasz);
          return property_corrupt;
        }
       prop = _bfd_elf_get_property (abfd, type, datasz);
-      /* Combine properties of the same type.  */
       prop->u.number |= bfd_h_get_32 (abfd, ptr);
       prop->pr_kind = property_number;
-      break;
-
-    default:
-      return property_ignored;
+      return property_number;
     }
 
-  return property_number;
+  return property_ignored;
 }
 
 /* Merge x86 GNU property BPROP with APROP.  If APROP isn't NULL,
@@ -2299,6 +2402,7 @@ _bfd_x86_elf_parse_gnu_properties (bfd *abfd, unsigned int type,
 bfd_boolean
 _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
                                   bfd *abfd ATTRIBUTE_UNUSED,
+                                  bfd *bbfd ATTRIBUTE_UNUSED,
                                   elf_property *aprop,
                                   elf_property *bprop)
 {
@@ -2306,36 +2410,88 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
   bfd_boolean updated = FALSE;
   unsigned int pr_type = aprop != NULL ? aprop->pr_type : bprop->pr_type;
 
-  switch (pr_type)
+  if (pr_type == GNU_PROPERTY_X86_COMPAT_ISA_1_USED
+      || (pr_type >= GNU_PROPERTY_X86_UINT32_OR_AND_LO
+         && pr_type <= GNU_PROPERTY_X86_UINT32_OR_AND_HI))
     {
-    case GNU_PROPERTY_X86_ISA_1_USED:
-    case GNU_PROPERTY_X86_ISA_1_NEEDED:
-      if (aprop != NULL && bprop != NULL)
+      if (aprop == NULL || bprop == NULL)
+       {
+         /* Only one of APROP and BPROP can be NULL.  */
+         if (aprop != NULL)
+           {
+             /* Remove this property since the other input file doesn't
+                have it.  */
+             aprop->pr_kind = property_remove;
+             updated = TRUE;
+           }
+       }
+      else
        {
          number = aprop->u.number;
          aprop->u.number = number | bprop->u.number;
          updated = number != (unsigned int) aprop->u.number;
        }
+      return updated;
+    }
+  else if (pr_type == GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED
+          || (pr_type >= GNU_PROPERTY_X86_UINT32_OR_LO
+              && pr_type <= GNU_PROPERTY_X86_UINT32_OR_HI))
+    {
+      if (aprop != NULL && bprop != NULL)
+       {
+         number = aprop->u.number;
+         aprop->u.number = number | bprop->u.number;
+         /* Remove the property if all bits are empty.  */
+         if (aprop->u.number == 0)
+           {
+             aprop->pr_kind = property_remove;
+             updated = TRUE;
+           }
+         else
+           updated = number != (unsigned int) aprop->u.number;
+       }
       else
        {
-         /* Return TRUE if APROP is NULL to indicate that BPROP should
-            be added to ABFD.  */
-         updated = aprop == NULL;
+         /* Only one of APROP and BPROP can be NULL.  */
+         if (aprop != NULL)
+           {
+             if (aprop->u.number == 0)
+               {
+                 /* Remove APROP if all bits are empty.  */
+                 aprop->pr_kind = property_remove;
+                 updated = TRUE;
+               }
+           }
+         else
+           {
+             /* Return TRUE if APROP is NULL and all bits of BPROP
+                aren't empty to indicate that BPROP should be added
+                to ABFD.  */
+             updated = bprop->u.number != 0;
+           }
        }
-      break;
-
-    case GNU_PROPERTY_X86_FEATURE_1_AND:
+      return updated;
+    }
+  else if (pr_type >= GNU_PROPERTY_X86_UINT32_AND_LO
+          && pr_type <= GNU_PROPERTY_X86_UINT32_AND_HI)
+    {
       /* Only one of APROP and BPROP can be NULL:
         1. APROP & BPROP when both APROP and BPROP aren't NULL.
         2. If APROP is NULL, remove x86 feature.
         3. Otherwise, do nothing.
        */
+      const struct elf_backend_data *bed
+       = get_elf_backend_data (info->output_bfd);
+      struct elf_x86_link_hash_table *htab
+       = elf_x86_hash_table (info, bed->target_id);
+      if (!htab)
+       abort ();
       if (aprop != NULL && bprop != NULL)
        {
          features = 0;
-         if (info->ibt)
+         if (htab->params->ibt)
            features = GNU_PROPERTY_X86_FEATURE_1_IBT;
-         if (info->shstk)
+         if (htab->params->shstk)
            features |= GNU_PROPERTY_X86_FEATURE_1_SHSTK;
          number = aprop->u.number;
          /* Add GNU_PROPERTY_X86_FEATURE_1_IBT and
@@ -2348,25 +2504,25 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
        }
       else
        {
+         /* There should be no AND properties since some input doesn't
+            have them.  Set IBT and SHSTK properties for -z ibt and -z
+            shstk if needed.  */
          features = 0;
-         if (info->ibt)
+         if (htab->params->ibt)
            features = GNU_PROPERTY_X86_FEATURE_1_IBT;
-         if (info->shstk)
+         if (htab->params->shstk)
            features |= GNU_PROPERTY_X86_FEATURE_1_SHSTK;
          if (features)
            {
-             /* Add GNU_PROPERTY_X86_FEATURE_1_IBT and
-                GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
              if (aprop != NULL)
                {
-                 number = aprop->u.number;
-                 aprop->u.number = number | features;
-                 updated = number != (unsigned int) aprop->u.number;
+                 updated = features != (unsigned int) aprop->u.number;
+                 aprop->u.number = features;
                }
              else
                {
-                 bprop->u.number |= features;
                  updated = TRUE;
+                 bprop->u.number = features;
                }
            }
          else if (aprop != NULL)
@@ -2375,9 +2531,10 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
              updated = TRUE;
            }
        }
-      break;
-
-    default:
+      return updated;
+    }
+  else
+    {
       /* Never should happen.  */
       abort ();
     }
@@ -2406,12 +2563,6 @@ _bfd_x86_elf_link_setup_gnu_properties
   unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2;
   unsigned int got_align;
 
-  features = 0;
-  if (info->ibt)
-    features = GNU_PROPERTY_X86_FEATURE_1_IBT;
-  if (info->shstk)
-    features |= GNU_PROPERTY_X86_FEATURE_1_SHSTK;
-
   /* Find a normal input file with GNU property note.  */
   for (pbfd = info->input_bfds;
        pbfd != NULL;
@@ -2425,18 +2576,42 @@ _bfd_x86_elf_link_setup_gnu_properties
          break;
       }
 
-  if (ebfd != NULL && features)
+  bed = get_elf_backend_data (info->output_bfd);
+
+  htab = elf_x86_hash_table (info, bed->target_id);
+  if (htab == NULL)
+    return pbfd;
+
+  features = 0;
+  if (htab->params->ibt)
     {
-      /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
-        GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
-      prop = _bfd_elf_get_property (ebfd,
-                                   GNU_PROPERTY_X86_FEATURE_1_AND,
-                                   4);
-      prop->u.number |= features;
-      prop->pr_kind = property_number;
+      features = GNU_PROPERTY_X86_FEATURE_1_IBT;
+      htab->params->cet_report &= ~cet_report_ibt;
+    }
+  if (htab->params->shstk)
+    {
+      features |= GNU_PROPERTY_X86_FEATURE_1_SHSTK;
+      htab->params->cet_report &= ~cet_report_shstk;
+    }
+  if (!(htab->params->cet_report & (cet_report_ibt | cet_report_shstk)))
+    htab->params->cet_report = cet_report_none;
+
+  if (ebfd != NULL)
+    {
+      prop = NULL;
+      if (features)
+       {
+         /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
+            GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
+         prop = _bfd_elf_get_property (ebfd,
+                                       GNU_PROPERTY_X86_FEATURE_1_AND,
+                                       4);
+         prop->u.number |= features;
+         prop->pr_kind = property_number;
+       }
 
       /* Create the GNU property note section if needed.  */
-      if (pbfd == NULL)
+      if (prop != NULL && pbfd == NULL)
        {
          sec = bfd_make_section_with_flags (ebfd,
                                             NOTE_GNU_PROPERTY_SECTION_NAME,
@@ -2449,7 +2624,7 @@ _bfd_x86_elf_link_setup_gnu_properties
          if (sec == NULL)
            info->callbacks->einfo (_("%F%P: failed to create GNU property section\n"));
 
-         if (!bfd_set_section_alignment (ebfd, sec, class_align))
+         if (!bfd_set_section_alignment (sec, class_align))
            {
 error_alignment:
              info->callbacks->einfo (_("%F%pA: failed to align section\n"),
@@ -2460,13 +2635,55 @@ error_alignment:
        }
     }
 
-  pbfd = _bfd_elf_link_setup_gnu_properties (info);
+  if (htab->params->cet_report)
+    {
+      /* Report missing IBT and SHSTK properties.  */
+      bfd *abfd;
+      const char *msg;
+      elf_property_list *p;
+      bfd_boolean missing_ibt, missing_shstk;
+      bfd_boolean check_ibt
+       = !!(htab->params->cet_report & cet_report_ibt);
+      bfd_boolean check_shstk
+       = !!(htab->params->cet_report & cet_report_shstk);
+
+      if ((htab->params->cet_report & cet_report_warning))
+       msg = _("%P: %pB: warning: missing %s\n");
+      else
+       msg = _("%X%P: %pB: error: missing %s\n");
 
-  bed = get_elf_backend_data (info->output_bfd);
+      for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link.next)
+       if (!(abfd->flags & (DYNAMIC | BFD_PLUGIN | BFD_LINKER_CREATED))
+           && bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+         {
+           for (p = elf_properties (abfd); p; p = p->next)
+             if (p->property.pr_type == GNU_PROPERTY_X86_FEATURE_1_AND)
+               break;
 
-  htab = elf_x86_hash_table (info, bed->target_id);
-  if (htab == NULL)
-    return pbfd;
+           missing_ibt = check_ibt;
+           missing_shstk = check_shstk;
+           if (p)
+             {
+               missing_ibt &= !(p->property.u.number
+                                & GNU_PROPERTY_X86_FEATURE_1_IBT);
+               missing_shstk &= !(p->property.u.number
+                                  & GNU_PROPERTY_X86_FEATURE_1_SHSTK);
+             }
+           if (missing_ibt || missing_shstk)
+             {
+               const char *missing;
+               if (missing_ibt && missing_shstk)
+                 missing = _("IBT and SHSTK properties");
+               else if (missing_ibt)
+                 missing = _("IBT property");
+               else
+                 missing = _("SHSTK property");
+               info->callbacks->einfo (msg, abfd, missing);
+             }
+         }
+    }
+
+  pbfd = _bfd_elf_link_setup_gnu_properties (info);
 
   htab->r_info = init_table->r_info;
   htab->r_sym = init_table->r_sym;
@@ -2476,7 +2693,7 @@ error_alignment:
 
   htab->plt0_pad_byte = init_table->plt0_pad_byte;
 
-  use_ibt_plt = info->ibtplt || info->ibt;
+  use_ibt_plt = htab->params->ibtplt || htab->params->ibt;
   if (!use_ibt_plt && pbfd != NULL)
     {
       /* Check if GNU_PROPERTY_X86_FEATURE_1_IBT is on.  */
@@ -2518,7 +2735,9 @@ error_alignment:
               abfd = abfd->link.next)
            if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
                && (abfd->flags
-                   & (DYNAMIC | BFD_LINKER_CREATED | BFD_PLUGIN)) == 0)
+                   & (DYNAMIC | BFD_LINKER_CREATED | BFD_PLUGIN)) == 0
+               && bed->relocs_compatible (abfd->xvec,
+                                          info->output_bfd->xvec))
              {
                htab->elf.dynobj = abfd;
                dynobj = abfd;
@@ -2619,11 +2838,11 @@ error_alignment:
      instead of in create_dynamic_sections so that they are always
      properly aligned even if create_dynamic_sections isn't called.  */
   sec = htab->elf.sgot;
-  if (!bfd_set_section_alignment (dynobj, sec, got_align))
+  if (!bfd_set_section_alignment (sec, got_align))
     goto error_alignment;
 
   sec = htab->elf.sgotplt;
-  if (!bfd_set_section_alignment (dynobj, sec, got_align))
+  if (!bfd_set_section_alignment (sec, got_align))
     goto error_alignment;
 
   /* Create the ifunc sections here so that check_relocs can be
@@ -2661,8 +2880,7 @@ error_alignment:
            = bfd_log2 (htab->non_lazy_plt->plt_entry_size);
 
          sec = pltsec;
-         if (!bfd_set_section_alignment (sec->owner, sec,
-                                         plt_alignment))
+         if (!bfd_set_section_alignment (sec, plt_alignment))
            goto error_alignment;
 
          /* Create the GOT procedure linkage table.  */
@@ -2672,8 +2890,7 @@ error_alignment:
          if (sec == NULL)
            info->callbacks->einfo (_("%F%P: failed to create GOT PLT section\n"));
 
-         if (!bfd_set_section_alignment (dynobj, sec,
-                                         non_lazy_plt_alignment))
+         if (!bfd_set_section_alignment (sec, non_lazy_plt_alignment))
            goto error_alignment;
 
          htab->plt_got = sec;
@@ -2693,11 +2910,10 @@ error_alignment:
                  if (sec == NULL)
                    info->callbacks->einfo (_("%F%P: failed to create IBT-enabled PLT section\n"));
 
-                 if (!bfd_set_section_alignment (dynobj, sec,
-                                                 plt_alignment))
+                 if (!bfd_set_section_alignment (sec, plt_alignment))
                    goto error_alignment;
                }
-             else if (info->bndplt && ABI_64_P (dynobj))
+             else if (htab->params->bndplt && ABI_64_P (dynobj))
                {
                  /* Create the second PLT for Intel MPX support.  MPX
                     PLT is supported only for non-NaCl target in 64-bit
@@ -2708,8 +2924,7 @@ error_alignment:
                  if (sec == NULL)
                    info->callbacks->einfo (_("%F%P: failed to create BND PLT section\n"));
 
-                 if (!bfd_set_section_alignment (dynobj, sec,
-                                                 non_lazy_plt_alignment))
+                 if (!bfd_set_section_alignment (sec, non_lazy_plt_alignment))
                    goto error_alignment;
                }
 
@@ -2729,7 +2944,7 @@ error_alignment:
          if (sec == NULL)
            info->callbacks->einfo (_("%F%P: failed to create PLT .eh_frame section\n"));
 
-         if (!bfd_set_section_alignment (dynobj, sec, class_align))
+         if (!bfd_set_section_alignment (sec, class_align))
            goto error_alignment;
 
          htab->plt_eh_frame = sec;
@@ -2742,7 +2957,7 @@ error_alignment:
              if (sec == NULL)
                info->callbacks->einfo (_("%F%P: failed to create GOT PLT .eh_frame section\n"));
 
-             if (!bfd_set_section_alignment (dynobj, sec, class_align))
+             if (!bfd_set_section_alignment (sec, class_align))
                goto error_alignment;
 
              htab->plt_got_eh_frame = sec;
@@ -2756,7 +2971,7 @@ error_alignment:
              if (sec == NULL)
                info->callbacks->einfo (_("%F%P: failed to create the second PLT .eh_frame section\n"));
 
-             if (!bfd_set_section_alignment (dynobj, sec, class_align))
+             if (!bfd_set_section_alignment (sec, class_align))
                goto error_alignment;
 
              htab->plt_second_eh_frame = sec;
@@ -2764,16 +2979,79 @@ error_alignment:
        }
     }
 
-  if (normal_target)
+  /* The .iplt section is used for IFUNC symbols in static
+     executables.  */
+  sec = htab->elf.iplt;
+  if (sec != NULL)
     {
-      /* The .iplt section is used for IFUNC symbols in static
-        executables.  */
-      sec = htab->elf.iplt;
-      if (sec != NULL
-         && !bfd_set_section_alignment (sec->owner, sec,
-                                        plt_alignment))
+      /* NB: Delay setting its alignment until we know it is non-empty.
+        Otherwise an empty iplt section may change vma and lma of the
+        following sections, which triggers moving dot of the following
+        section backwards, resulting in a warning and section lma not
+        being set properly.  It later leads to a "File truncated"
+        error.  */
+      if (!bfd_set_section_alignment (sec, 0))
        goto error_alignment;
+
+      htab->plt.iplt_alignment = (normal_target
+                                 ? plt_alignment
+                                 : bed->plt_alignment);
     }
 
   return pbfd;
 }
+
+/* Fix up x86 GNU properties.  */
+
+void
+_bfd_x86_elf_link_fixup_gnu_properties
+  (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+   elf_property_list **listp)
+{
+  elf_property_list *p;
+
+  for (p = *listp; p; p = p->next)
+    {
+      unsigned int type = p->property.pr_type;
+      if (type == GNU_PROPERTY_X86_COMPAT_ISA_1_USED
+         || type == GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED
+         || (type >= GNU_PROPERTY_X86_UINT32_AND_LO
+             && type <= GNU_PROPERTY_X86_UINT32_AND_HI)
+         || (type >= GNU_PROPERTY_X86_UINT32_OR_LO
+             && type <= GNU_PROPERTY_X86_UINT32_OR_HI)
+         || (type >= GNU_PROPERTY_X86_UINT32_OR_AND_LO
+             && type <= GNU_PROPERTY_X86_UINT32_OR_AND_HI))
+       {
+         if (p->property.u.number == 0
+             && (type == GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED
+                 || (type >= GNU_PROPERTY_X86_UINT32_AND_LO
+                     && type <= GNU_PROPERTY_X86_UINT32_AND_HI)
+                 || (type >= GNU_PROPERTY_X86_UINT32_OR_LO
+                     && type <= GNU_PROPERTY_X86_UINT32_OR_HI)))
+           {
+             /* Remove empty property.  */
+             *listp = p->next;
+             continue;
+           }
+
+         listp = &p->next;
+       }
+      else if (type > GNU_PROPERTY_HIPROC)
+       {
+         /* The property list is sorted in order of type.  */
+         break;
+       }
+    }
+}
+
+void
+_bfd_elf_linker_x86_set_options (struct bfd_link_info * info,
+                                struct elf_linker_x86_params *params)
+{
+  const struct elf_backend_data *bed
+    = get_elf_backend_data (info->output_bfd);
+  struct elf_x86_link_hash_table *htab
+    = elf_x86_hash_table (info, bed->target_id);
+  if (htab != NULL)
+    htab->params = params;
+}
This page took 0.032979 seconds and 4 git commands to generate.