i386: Align branches within a fixed boundary
[deliverable/binutils-gdb.git] / bfd / elf32-i386.c
index 98d2b495535bd7171c1fd614971177c500bb2b2a..41fc403e07b8e5581bd6f9f128833f629bb129a4 100644 (file)
@@ -1,5 +1,5 @@
 /* Intel 80386/80486-specific support for 32-bit ELF
 /* Intel 80386/80486-specific support for 32-bit ELF
-   Copyright (C) 1993-2015 Free Software Foundation, Inc.
+   Copyright (C) 1993-2019 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
 
    This file is part of BFD, the Binary File Descriptor library.
 
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#include "sysdep.h"
-#include "bfd.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
+#include "elfxx-x86.h"
 #include "elf-nacl.h"
 #include "elf-vxworks.h"
 #include "elf-nacl.h"
 #include "elf-vxworks.h"
-#include "bfd_stdint.h"
-#include "objalloc.h"
-#include "hashtab.h"
 #include "dwarf2.h"
 #include "opcode/i386.h"
 
 #include "dwarf2.h"
 #include "opcode/i386.h"
 
@@ -189,6 +182,10 @@ static reloc_howto_type elf_howto_table[]=
 
 };
 
 
 };
 
+#define X86_PCREL_TYPE_P(TYPE) ((TYPE) == R_386_PC32)
+
+#define X86_SIZE_TYPE_P(TYPE) ((TYPE) == R_386_SIZE32)
+
 #ifdef DEBUG_GEN_RELOC
 #define TRACE(str) \
   fprintf (stderr, "i386 bfd reloc lookup %d (%s)\n", code, str)
 #ifdef DEBUG_GEN_RELOC
 #define TRACE(str) \
   fprintf (stderr, "i386 bfd reloc lookup %d (%s)\n", code, str)
@@ -197,7 +194,7 @@ static reloc_howto_type elf_howto_table[]=
 #endif
 
 static reloc_howto_type *
 #endif
 
 static reloc_howto_type *
-elf_i386_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+elf_i386_reloc_type_lookup (bfd *abfd,
                            bfd_reloc_code_real_type code)
 {
   switch (code)
                            bfd_reloc_code_real_type code)
 {
   switch (code)
@@ -349,11 +346,13 @@ elf_i386_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
       return &elf_howto_table[R_386_GNU_VTENTRY - R_386_vt_offset];
 
     default:
       return &elf_howto_table[R_386_GNU_VTENTRY - R_386_vt_offset];
 
     default:
-      break;
+      TRACE ("Unknown");
+      /* xgettext:c-format */
+      _bfd_error_handler (_("%pB: unsupported relocation type: %#x"),
+                         abfd, (int) code);
+      bfd_set_error (bfd_error_bad_value);
+      return NULL;
     }
     }
-
-  TRACE ("Unknown");
-  return 0;
 }
 
 static reloc_howto_type *
 }
 
 static reloc_howto_type *
@@ -371,7 +370,7 @@ elf_i386_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
 }
 
 static reloc_howto_type *
 }
 
 static reloc_howto_type *
-elf_i386_rtype_to_howto (bfd *abfd, unsigned r_type)
+elf_i386_rtype_to_howto (unsigned r_type)
 {
   unsigned int indx;
 
 {
   unsigned int indx;
 
@@ -382,24 +381,30 @@ elf_i386_rtype_to_howto (bfd *abfd, unsigned r_type)
          >= R_386_ext2 - R_386_ext)
       && ((indx = r_type - R_386_vt_offset) - R_386_ext2
          >= R_386_vt - R_386_ext2))
          >= R_386_ext2 - R_386_ext)
       && ((indx = r_type - R_386_vt_offset) - R_386_ext2
          >= R_386_vt - R_386_ext2))
-    {
-      (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
-                            abfd, (int) r_type);
-      indx = R_386_NONE;
-    }
+      return NULL;
   /* PR 17512: file: 0f67f69d.  */
   if (elf_howto_table [indx].type != r_type)
     return NULL;
   return &elf_howto_table[indx];
 }
 
   /* PR 17512: file: 0f67f69d.  */
   if (elf_howto_table [indx].type != r_type)
     return NULL;
   return &elf_howto_table[indx];
 }
 
-static void
-elf_i386_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+static bfd_boolean
+elf_i386_info_to_howto_rel (bfd *abfd,
                            arelent *cache_ptr,
                            Elf_Internal_Rela *dst)
 {
   unsigned int r_type = ELF32_R_TYPE (dst->r_info);
                            arelent *cache_ptr,
                            Elf_Internal_Rela *dst)
 {
   unsigned int r_type = ELF32_R_TYPE (dst->r_info);
-  cache_ptr->howto = elf_i386_rtype_to_howto (abfd, r_type);
+
+  if ((cache_ptr->howto = elf_i386_rtype_to_howto (r_type)) == NULL)
+    {
+      /* xgettext:c-format */
+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+                         abfd, r_type);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
+
+  return TRUE;
 }
 
 /* Return whether a symbol name implies a local label.  The UnixWare
 }
 
 /* Return whether a symbol name implies a local label.  The UnixWare
@@ -430,7 +435,7 @@ elf_i386_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
       int pr_version = bfd_get_32 (abfd, note->descdata);
 
       if (pr_version != 1)
       int pr_version = bfd_get_32 (abfd, note->descdata);
 
       if (pr_version != 1)
-       return FALSE;
+       return FALSE;
 
       /* pr_cursig */
       elf_tdata (abfd)->core->signal = bfd_get_32 (abfd, note->descdata + 20);
 
       /* pr_cursig */
       elf_tdata (abfd)->core->signal = bfd_get_32 (abfd, note->descdata + 20);
@@ -528,27 +533,20 @@ elf_i386_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
    early in the link process, elf_i386_finish_dynamic_sections is
    one of the last functions.  */
 
    early in the link process, elf_i386_finish_dynamic_sections is
    one of the last functions.  */
 
+/* The size in bytes of an entry in the lazy procedure linkage table.  */
 
 
-/* The name of the dynamic interpreter.  This is put in the .interp
-   section.  */
-
-#define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
-
-/* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
-   copying dynamic variables from a shared lib into an app's dynbss
-   section, and instead use a dynamic relocation to point into the
-   shared lib.  */
-#define ELIMINATE_COPY_RELOCS 1
+#define LAZY_PLT_ENTRY_SIZE 16
 
 
-/* The size in bytes of an entry in the procedure linkage table.  */
+/* The size in bytes of an entry in the non-lazy procedure linkage
+   table.  */
 
 
-#define PLT_ENTRY_SIZE 16
+#define NON_LAZY_PLT_ENTRY_SIZE 8
 
 
-/* The first entry in an absolute procedure linkage table looks like
-   this.  See the SVR4 ABI i386 supplement to see how this works.
-   Will be padded to PLT_ENTRY_SIZE with htab->plt0_pad_byte.  */
+/* The first entry in an absolute lazy procedure linkage table looks
+   like this.  See the SVR4 ABI i386 supplement to see how this works.
+   Will be padded to LAZY_PLT_ENTRY_SIZE with lazy_plt->plt0_pad_byte.  */
 
 
-static const bfd_byte elf_i386_plt0_entry[12] =
+static const bfd_byte elf_i386_lazy_plt0_entry[12] =
 {
   0xff, 0x35,  /* pushl contents of address */
   0, 0, 0, 0,  /* replaced with address of .got + 4.  */
 {
   0xff, 0x35,  /* pushl contents of address */
   0, 0, 0, 0,  /* replaced with address of .got + 4.  */
@@ -556,10 +554,10 @@ static const bfd_byte elf_i386_plt0_entry[12] =
   0, 0, 0, 0   /* replaced with address of .got + 8.  */
 };
 
   0, 0, 0, 0   /* replaced with address of .got + 8.  */
 };
 
-/* Subsequent entries in an absolute procedure linkage table look like
-   this.  */
+/* Subsequent entries in an absolute lazy procedure linkage table look
+   like this.  */
 
 
-static const bfd_byte elf_i386_plt_entry[PLT_ENTRY_SIZE] =
+static const bfd_byte elf_i386_lazy_plt_entry[LAZY_PLT_ENTRY_SIZE] =
 {
   0xff, 0x25,  /* jmp indirect */
   0, 0, 0, 0,  /* replaced with address of this symbol in .got.  */
 {
   0xff, 0x25,  /* jmp indirect */
   0, 0, 0, 0,  /* replaced with address of this symbol in .got.  */
@@ -569,18 +567,20 @@ static const bfd_byte elf_i386_plt_entry[PLT_ENTRY_SIZE] =
   0, 0, 0, 0   /* replaced with offset to start of .plt.  */
 };
 
   0, 0, 0, 0   /* replaced with offset to start of .plt.  */
 };
 
-/* The first entry in a PIC procedure linkage table look like this.
-   Will be padded to PLT_ENTRY_SIZE with htab->plt0_pad_byte.  */
+/* The first entry in a PIC lazy procedure linkage table look like
+   this.  Will be padded to LAZY_PLT_ENTRY_SIZE with
+   lazy_plt->plt0_pad_byte.  */
 
 
-static const bfd_byte elf_i386_pic_plt0_entry[12] =
+static const bfd_byte elf_i386_pic_lazy_plt0_entry[12] =
 {
   0xff, 0xb3, 4, 0, 0, 0,      /* pushl 4(%ebx) */
   0xff, 0xa3, 8, 0, 0, 0       /* jmp *8(%ebx) */
 };
 
 {
   0xff, 0xb3, 4, 0, 0, 0,      /* pushl 4(%ebx) */
   0xff, 0xa3, 8, 0, 0, 0       /* jmp *8(%ebx) */
 };
 
-/* Subsequent entries in a PIC procedure linkage table look like this.  */
+/* Subsequent entries in a PIC lazy procedure linkage table look like
+   this.  */
 
 
-static const bfd_byte elf_i386_pic_plt_entry[PLT_ENTRY_SIZE] =
+static const bfd_byte elf_i386_pic_lazy_plt_entry[LAZY_PLT_ENTRY_SIZE] =
 {
   0xff, 0xa3,  /* jmp *offset(%ebx) */
   0, 0, 0, 0,  /* replaced with offset of this symbol in .got.  */
 {
   0xff, 0xa3,  /* jmp *offset(%ebx) */
   0, 0, 0, 0,  /* replaced with offset of this symbol in .got.  */
@@ -590,32 +590,83 @@ static const bfd_byte elf_i386_pic_plt_entry[PLT_ENTRY_SIZE] =
   0, 0, 0, 0   /* replaced with offset to start of .plt.  */
 };
 
   0, 0, 0, 0   /* replaced with offset to start of .plt.  */
 };
 
-/* Entries in the GOT procedure linkage table look like this.  */
+/* Entries in the non-lazy procedure linkage table look like this.  */
 
 
-static const bfd_byte elf_i386_got_plt_entry[8] =
+static const bfd_byte elf_i386_non_lazy_plt_entry[NON_LAZY_PLT_ENTRY_SIZE] =
 {
   0xff, 0x25,  /* jmp indirect */
   0, 0, 0, 0,  /* replaced with offset of this symbol in .got.  */
   0x66, 0x90   /* xchg %ax,%ax  */
 };
 
 {
   0xff, 0x25,  /* jmp indirect */
   0, 0, 0, 0,  /* replaced with offset of this symbol in .got.  */
   0x66, 0x90   /* xchg %ax,%ax  */
 };
 
-/* Entries in the PIC GOT procedure linkage table look like this.  */
+/* Entries in the PIC non-lazy procedure linkage table look like
+   this.  */
 
 
-static const bfd_byte elf_i386_pic_got_plt_entry[8] =
+static const bfd_byte elf_i386_pic_non_lazy_plt_entry[NON_LAZY_PLT_ENTRY_SIZE] =
 {
   0xff, 0xa3,  /* jmp *offset(%ebx)  */
   0, 0, 0, 0,  /* replaced with offset of this symbol in .got.  */
   0x66, 0x90   /* xchg %ax,%ax  */
 };
 
 {
   0xff, 0xa3,  /* jmp *offset(%ebx)  */
   0, 0, 0, 0,  /* replaced with offset of this symbol in .got.  */
   0x66, 0x90   /* xchg %ax,%ax  */
 };
 
-/* .eh_frame covering the .plt section.  */
+/* The first entry in an absolute IBT-enabled lazy procedure linkage
+   table looks like this.  */
+
+static const bfd_byte elf_i386_lazy_ibt_plt0_entry[LAZY_PLT_ENTRY_SIZE] =
+{
+  0xff, 0x35, 0, 0, 0, 0,      /* pushl GOT[1]       */
+  0xff, 0x25, 0, 0, 0, 0,      /* jmp *GOT[2]        */
+  0x0f, 0x1f, 0x40, 0x00       /* nopl 0(%rax)       */
+};
+
+/* Subsequent entries for an absolute IBT-enabled lazy procedure linkage
+   table look like this.  Subsequent entries for a PIC IBT-enabled lazy
+   procedure linkage table are the same.  */
+
+static const bfd_byte elf_i386_lazy_ibt_plt_entry[LAZY_PLT_ENTRY_SIZE] =
+{
+  0xf3, 0x0f, 0x1e, 0xfb,      /* endbr32                    */
+  0x68, 0, 0, 0, 0,            /* pushl immediate            */
+  0xe9, 0, 0, 0, 0,            /* jmp relative               */
+  0x66, 0x90                   /* xchg %ax,%ax               */
+};
+
+/* The first entry in a PIC IBT-enabled lazy procedure linkage table
+   look like.  */
+
+static const bfd_byte elf_i386_pic_lazy_ibt_plt0_entry[LAZY_PLT_ENTRY_SIZE] =
+{
+  0xff, 0xb3, 4, 0, 0, 0,      /* pushl 4(%ebx)      */
+  0xff, 0xa3, 8, 0, 0, 0,      /* jmp *8(%ebx)       */
+  0x0f, 0x1f, 0x40, 0x00       /* nopl 0(%rax)       */
+};
+
+/* Entries for branches with IBT-enabled in the absolute non-lazey
+   procedure linkage table look like this.  They have the same size
+   as the lazy PLT entry.  */
+
+static const bfd_byte elf_i386_non_lazy_ibt_plt_entry[LAZY_PLT_ENTRY_SIZE] =
+{
+  0xf3, 0x0f, 0x1e, 0xfb,           /* endbr32               */
+  0xff, 0x25, 0, 0, 0, 0,           /* jmp *name@GOT         */
+  0x66, 0x0f, 0x1f, 0x44, 0x00, 0x00 /* nopw 0x0(%rax,%rax,1) */
+};
+
+/* Entries for branches with IBT-enabled in the PIC non-lazey procedure
+   linkage table look like this.  They have the same size as the lazy
+   PLT entry.  */
+
+static const bfd_byte elf_i386_pic_non_lazy_ibt_plt_entry[LAZY_PLT_ENTRY_SIZE] =
+{
+  0xf3, 0x0f, 0x1e, 0xfb,           /* endbr32               */
+  0xff, 0xa3, 0, 0, 0, 0,           /* jmp *name@GOT(%ebx)   */
+  0x66, 0x0f, 0x1f, 0x44, 0x00, 0x00 /* nopw 0x0(%rax,%rax,1) */
+};
+
+/* .eh_frame covering the lazy .plt section.  */
 
 
-static const bfd_byte elf_i386_eh_frame_plt[] =
+static const bfd_byte elf_i386_eh_frame_lazy_plt[] =
 {
 {
-#define PLT_CIE_LENGTH         20
-#define PLT_FDE_LENGTH         36
-#define PLT_FDE_START_OFFSET   4 + PLT_CIE_LENGTH + 8
-#define PLT_FDE_LEN_OFFSET     4 + PLT_CIE_LENGTH + 12
   PLT_CIE_LENGTH, 0, 0, 0,     /* CIE length */
   0, 0, 0, 0,                  /* CIE ID */
   1,                           /* CIE version */
   PLT_CIE_LENGTH, 0, 0, 0,     /* CIE length */
   0, 0, 0, 0,                  /* CIE ID */
   1,                           /* CIE version */
@@ -647,59 +698,142 @@ static const bfd_byte elf_i386_eh_frame_plt[] =
   DW_CFA_nop, DW_CFA_nop, DW_CFA_nop, DW_CFA_nop
 };
 
   DW_CFA_nop, DW_CFA_nop, DW_CFA_nop, DW_CFA_nop
 };
 
-struct elf_i386_plt_layout
-{
-  /* The first entry in an absolute procedure linkage table looks like this.  */
-  const bfd_byte *plt0_entry;
-  unsigned int plt0_entry_size;
+/* .eh_frame covering the lazy .plt section with IBT-enabled.  */
 
 
-  /* Offsets into plt0_entry that are to be replaced with GOT[1] and GOT[2].  */
-  unsigned int plt0_got1_offset;
-  unsigned int plt0_got2_offset;
+static const bfd_byte elf_i386_eh_frame_lazy_ibt_plt[] =
+{
+  PLT_CIE_LENGTH, 0, 0, 0,     /* CIE length */
+  0, 0, 0, 0,                  /* CIE ID */
+  1,                           /* CIE version */
+  'z', 'R', 0,                 /* Augmentation string */
+  1,                           /* Code alignment factor */
+  0x7c,                                /* Data alignment factor */
+  8,                           /* Return address column */
+  1,                           /* Augmentation size */
+  DW_EH_PE_pcrel | DW_EH_PE_sdata4, /* FDE encoding */
+  DW_CFA_def_cfa, 4, 4,                /* DW_CFA_def_cfa: r4 (esp) ofs 4 */
+  DW_CFA_offset + 8, 1,                /* DW_CFA_offset: r8 (eip) at cfa-4 */
+  DW_CFA_nop, DW_CFA_nop,
 
 
-  /* Later entries in an absolute procedure linkage table look like this.  */
-  const bfd_byte *plt_entry;
-  unsigned int plt_entry_size;
+  PLT_FDE_LENGTH, 0, 0, 0,     /* FDE length */
+  PLT_CIE_LENGTH + 8, 0, 0, 0, /* CIE pointer */
+  0, 0, 0, 0,                  /* R_386_PC32 .plt goes here */
+  0, 0, 0, 0,                  /* .plt size goes here */
+  0,                           /* Augmentation size */
+  DW_CFA_def_cfa_offset, 8,    /* DW_CFA_def_cfa_offset: 8 */
+  DW_CFA_advance_loc + 6,      /* DW_CFA_advance_loc: 6 to __PLT__+6 */
+  DW_CFA_def_cfa_offset, 12,   /* DW_CFA_def_cfa_offset: 12 */
+  DW_CFA_advance_loc + 10,     /* DW_CFA_advance_loc: 10 to __PLT__+16 */
+  DW_CFA_def_cfa_expression,   /* DW_CFA_def_cfa_expression */
+  11,                          /* Block length */
+  DW_OP_breg4, 4,              /* DW_OP_breg4 (esp): 4 */
+  DW_OP_breg8, 0,              /* DW_OP_breg8 (eip): 0 */
+  DW_OP_lit15, DW_OP_and, DW_OP_lit9, DW_OP_ge,
+  DW_OP_lit2, DW_OP_shl, DW_OP_plus,
+  DW_CFA_nop, DW_CFA_nop, DW_CFA_nop, DW_CFA_nop
+};
 
 
-  /* Offsets into plt_entry that are to be replaced with...  */
-  unsigned int plt_got_offset;    /* ... address of this symbol in .got. */
-  unsigned int plt_reloc_offset;  /* ... offset into relocation table. */
-  unsigned int plt_plt_offset;    /* ... offset to start of .plt. */
+/* .eh_frame covering the non-lazy .plt section.  */
 
 
-  /* Offset into plt_entry where the initial value of the GOT entry points.  */
-  unsigned int plt_lazy_offset;
+static const bfd_byte elf_i386_eh_frame_non_lazy_plt[] =
+{
+#define PLT_GOT_FDE_LENGTH             16
+  PLT_CIE_LENGTH, 0, 0, 0,     /* CIE length */
+  0, 0, 0, 0,                  /* CIE ID */
+  1,                           /* CIE version */
+  'z', 'R', 0,                 /* Augmentation string */
+  1,                           /* Code alignment factor */
+  0x7c,                                /* Data alignment factor */
+  8,                           /* Return address column */
+  1,                           /* Augmentation size */
+  DW_EH_PE_pcrel | DW_EH_PE_sdata4, /* FDE encoding */
+  DW_CFA_def_cfa, 4, 4,                /* DW_CFA_def_cfa: r4 (esp) ofs 4 */
+  DW_CFA_offset + 8, 1,                /* DW_CFA_offset: r8 (eip) at cfa-4 */
+  DW_CFA_nop, DW_CFA_nop,
 
 
-  /* The first entry in a PIC procedure linkage table looks like this.  */
-  const bfd_byte *pic_plt0_entry;
+  PLT_GOT_FDE_LENGTH, 0, 0, 0, /* FDE length */
+  PLT_CIE_LENGTH + 8, 0, 0, 0, /* CIE pointer */
+  0, 0, 0, 0,                  /* the start of non-lazy .plt goes here */
+  0, 0, 0, 0,                  /* non-lazy .plt size goes here */
+  0,                           /* Augmentation size */
+  DW_CFA_nop, DW_CFA_nop, DW_CFA_nop
+};
 
 
-  /* Subsequent entries in a PIC procedure linkage table look like this.  */
-  const bfd_byte *pic_plt_entry;
+/* These are the standard parameters.  */
+static const struct elf_x86_lazy_plt_layout elf_i386_lazy_plt =
+  {
+    elf_i386_lazy_plt0_entry,          /* plt0_entry */
+    sizeof (elf_i386_lazy_plt0_entry), /* plt0_entry_size */
+    elf_i386_lazy_plt_entry,           /* plt_entry */
+    LAZY_PLT_ENTRY_SIZE,               /* plt_entry_size */
+    NULL,                              /* plt_tlsdesc_entry */
+    0,                                 /* plt_tlsdesc_entry_size*/
+    0,                                 /* plt_tlsdesc_got1_offset */
+    0,                                 /* plt_tlsdesc_got2_offset */
+    0,                                 /* plt_tlsdesc_got1_insn_end */
+    0,                                 /* plt_tlsdesc_got2_insn_end */
+    2,                                 /* plt0_got1_offset */
+    8,                                 /* plt0_got2_offset */
+    0,                                 /* plt0_got2_insn_end */
+    2,                                 /* plt_got_offset */
+    7,                                 /* plt_reloc_offset */
+    12,                                        /* plt_plt_offset */
+    0,                                 /* plt_got_insn_size */
+    0,                                 /* plt_plt_insn_end */
+    6,                                 /* plt_lazy_offset */
+    elf_i386_pic_lazy_plt0_entry,      /* pic_plt0_entry */
+    elf_i386_pic_lazy_plt_entry,       /* pic_plt_entry */
+    elf_i386_eh_frame_lazy_plt,                /* eh_frame_plt */
+    sizeof (elf_i386_eh_frame_lazy_plt) /* eh_frame_plt_size */
+  };
 
 
-  /* .eh_frame covering the .plt section.  */
-  const bfd_byte *eh_frame_plt;
-  unsigned int eh_frame_plt_size;
-};
+static const struct elf_x86_non_lazy_plt_layout elf_i386_non_lazy_plt =
+  {
+    elf_i386_non_lazy_plt_entry,       /* plt_entry */
+    elf_i386_pic_non_lazy_plt_entry,   /* pic_plt_entry */
+    NON_LAZY_PLT_ENTRY_SIZE,           /* plt_entry_size */
+    2,                                 /* plt_got_offset */
+    0,                                 /* plt_got_insn_size */
+    elf_i386_eh_frame_non_lazy_plt,    /* eh_frame_plt */
+    sizeof (elf_i386_eh_frame_non_lazy_plt) /* eh_frame_plt_size */
+  };
 
 
-#define GET_PLT_ENTRY_SIZE(abfd) \
-  get_elf_i386_backend_data (abfd)->plt->plt_entry_size
+static const struct elf_x86_lazy_plt_layout elf_i386_lazy_ibt_plt =
+  {
+    elf_i386_lazy_ibt_plt0_entry,      /* plt0_entry */
+    sizeof (elf_i386_lazy_ibt_plt0_entry), /* plt0_entry_size */
+    elf_i386_lazy_ibt_plt_entry,       /* plt_entry */
+    LAZY_PLT_ENTRY_SIZE,               /* plt_entry_size */
+    NULL,                              /* plt_tlsdesc_entry */
+    0,                                 /* plt_tlsdesc_entry_size*/
+    0,                                 /* plt_tlsdesc_got1_offset */
+    0,                                 /* plt_tlsdesc_got2_offset */
+    0,                                 /* plt_tlsdesc_got1_insn_end */
+    0,                                 /* plt_tlsdesc_got2_insn_end */
+    2,                                 /* plt0_got1_offset */
+    8,                                 /* plt0_got2_offset */
+    0,                                 /* plt0_got2_insn_end */
+    4+2,                               /* plt_got_offset */
+    4+1,                               /* plt_reloc_offset */
+    4+6,                               /* plt_plt_offset */
+    0,                                 /* plt_got_insn_size */
+    0,                                 /* plt_plt_insn_end */
+    0,                                 /* plt_lazy_offset */
+    elf_i386_pic_lazy_ibt_plt0_entry,  /* pic_plt0_entry */
+    elf_i386_lazy_ibt_plt_entry,       /* pic_plt_entry */
+    elf_i386_eh_frame_lazy_ibt_plt,    /* eh_frame_plt */
+    sizeof (elf_i386_eh_frame_lazy_ibt_plt) /* eh_frame_plt_size */
+  };
 
 
-/* These are the standard parameters.  */
-static const struct elf_i386_plt_layout elf_i386_plt =
+static const struct elf_x86_non_lazy_plt_layout elf_i386_non_lazy_ibt_plt =
   {
   {
-    elf_i386_plt0_entry,                /* plt0_entry */
-    sizeof (elf_i386_plt0_entry),       /* plt0_entry_size */
-    2,                                  /* plt0_got1_offset */
-    8,                                  /* plt0_got2_offset */
-    elf_i386_plt_entry,                 /* plt_entry */
-    PLT_ENTRY_SIZE,                     /* plt_entry_size */
-    2,                                  /* plt_got_offset */
-    7,                                  /* plt_reloc_offset */
-    12,                                 /* plt_plt_offset */
-    6,                                  /* plt_lazy_offset */
-    elf_i386_pic_plt0_entry,            /* pic_plt0_entry */
-    elf_i386_pic_plt_entry,             /* pic_plt_entry */
-    elf_i386_eh_frame_plt,              /* eh_frame_plt */
-    sizeof (elf_i386_eh_frame_plt),     /* eh_frame_plt_size */
+    elf_i386_non_lazy_ibt_plt_entry,   /* plt_entry */
+    elf_i386_pic_non_lazy_ibt_plt_entry,/* pic_plt_entry */
+    LAZY_PLT_ENTRY_SIZE,               /* plt_entry_size */
+    4+2,                               /* plt_got_offset */
+    0,                                 /* plt_got_insn_size */
+    elf_i386_eh_frame_non_lazy_plt,    /* eh_frame_plt */
+    sizeof (elf_i386_eh_frame_non_lazy_plt) /* eh_frame_plt_size */
   };
 \f
 
   };
 \f
 
@@ -709,664 +843,246 @@ static const struct elf_i386_plt_layout elf_i386_plt =
 #define PLTRESOLVE_RELOCS 2
 #define PLT_NON_JUMP_SLOT_RELOCS 2
 
 #define PLTRESOLVE_RELOCS 2
 #define PLT_NON_JUMP_SLOT_RELOCS 2
 
-/* Architecture-specific backend data for i386.  */
-
-struct elf_i386_backend_data
-{
-  /* Parameters describing PLT generation.  */
-  const struct elf_i386_plt_layout *plt;
-
-  /* Value used to fill the unused bytes of the first PLT entry.  */
-  bfd_byte plt0_pad_byte;
-
-  /* True if the target system is VxWorks.  */
-  int is_vxworks;
-};
-
-#define get_elf_i386_backend_data(abfd) \
-  ((const struct elf_i386_backend_data *) \
-   get_elf_backend_data (abfd)->arch_data)
-
 /* These are the standard parameters.  */
 /* These are the standard parameters.  */
-static const struct elf_i386_backend_data elf_i386_arch_bed =
+static const struct elf_x86_backend_data elf_i386_arch_bed =
   {
   {
-    &elf_i386_plt,                      /* plt */
-    0,                                  /* plt0_pad_byte */
-    0,                                  /* is_vxworks */
+    is_normal                          /* os */
   };
 
 #define        elf_backend_arch_data   &elf_i386_arch_bed
 
   };
 
 #define        elf_backend_arch_data   &elf_i386_arch_bed
 
-/* i386 ELF linker hash entry.  */
+/* Return TRUE if the TLS access code sequence support transition
+   from R_TYPE.  */
 
 
-struct elf_i386_link_hash_entry
+static bfd_boolean
+elf_i386_check_tls_transition (asection *sec,
+                              bfd_byte *contents,
+                              Elf_Internal_Shdr *symtab_hdr,
+                              struct elf_link_hash_entry **sym_hashes,
+                              unsigned int r_type,
+                              const Elf_Internal_Rela *rel,
+                              const Elf_Internal_Rela *relend)
 {
 {
-  struct elf_link_hash_entry elf;
-
-  /* Track dynamic relocs copied for this symbol.  */
-  struct elf_dyn_relocs *dyn_relocs;
-
-#define GOT_UNKNOWN    0
-#define GOT_NORMAL     1
-#define GOT_TLS_GD     2
-#define GOT_TLS_IE     4
-#define GOT_TLS_IE_POS 5
-#define GOT_TLS_IE_NEG 6
-#define GOT_TLS_IE_BOTH 7
-#define GOT_TLS_GDESC  8
-#define GOT_TLS_GD_BOTH_P(type)                                                \
-  ((type) == (GOT_TLS_GD | GOT_TLS_GDESC))
-#define GOT_TLS_GD_P(type)                                             \
-  ((type) == GOT_TLS_GD || GOT_TLS_GD_BOTH_P (type))
-#define GOT_TLS_GDESC_P(type)                                          \
-  ((type) == GOT_TLS_GDESC || GOT_TLS_GD_BOTH_P (type))
-#define GOT_TLS_GD_ANY_P(type)                                         \
-  (GOT_TLS_GD_P (type) || GOT_TLS_GDESC_P (type))
-  unsigned char tls_type;
-
-  /* Symbol is referenced by R_386_GOTOFF relocation.  */
-  unsigned int gotoff_ref : 1;
-
-  /* Reference count of C/C++ function pointer relocations in read-write
-     section which can be resolved at run-time.  */
-  bfd_signed_vma func_pointer_refcount;
-
-  /* Information about the GOT PLT entry. Filled when there are both
-     GOT and PLT relocations against the same function.  */
-  union gotplt_union plt_got;
-
-  /* Offset of the GOTPLT entry reserved for the TLS descriptor,
-     starting at the end of the jump table.  */
-  bfd_vma tlsdesc_got;
-};
-
-#define elf_i386_hash_entry(ent) ((struct elf_i386_link_hash_entry *)(ent))
+  unsigned int val, type, reg;
+  unsigned long r_symndx;
+  struct elf_link_hash_entry *h;
+  bfd_vma offset;
+  bfd_byte *call;
+  bfd_boolean indirect_call;
 
 
-struct elf_i386_obj_tdata
-{
-  struct elf_obj_tdata root;
+  offset = rel->r_offset;
+  switch (r_type)
+    {
+    case R_386_TLS_GD:
+    case R_386_TLS_LDM:
+      if (offset < 2 || (rel + 1) >= relend)
+       return FALSE;
 
 
-  /* tls_type for each local got entry.  */
-  char *local_got_tls_type;
+      indirect_call = FALSE;
+      call = contents + offset + 4;
+      val = *(call - 5);
+      type = *(call - 6);
+      if (r_type == R_386_TLS_GD)
+       {
+         /* Check transition from GD access model.  Only
+               leal foo@tlsgd(,%ebx,1), %eax
+               call ___tls_get_addr@PLT
+            or
+               leal foo@tlsgd(%ebx) %eax
+               call ___tls_get_addr@PLT
+               nop
+            or
+               leal foo@tlsgd(%reg), %eax
+               call *___tls_get_addr@GOT(%reg)
+               which may be converted to
+               addr32 call ___tls_get_addr
+            can transit to different access model.  */
+         if ((offset + 10) > sec->size
+             || (type != 0x8d && type != 0x04))
+           return FALSE;
 
 
-  /* GOTPLT entries for TLS descriptors.  */
-  bfd_vma *local_tlsdesc_gotent;
-};
+         if (type == 0x04)
+           {
+             /* leal foo@tlsgd(,%ebx,1), %eax
+                call ___tls_get_addr@PLT  */
+             if (offset < 3)
+               return FALSE;
 
 
-#define elf_i386_tdata(abfd) \
-  ((struct elf_i386_obj_tdata *) (abfd)->tdata.any)
+             if (*(call - 7) != 0x8d
+                 || val != 0x1d
+                 || call[0] != 0xe8)
+               return FALSE;
+           }
+         else
+           {
+             /* This must be
+                       leal foo@tlsgd(%ebx), %eax
+                       call ___tls_get_addr@PLT
+                       nop
+                or
+                       leal foo@tlsgd(%reg), %eax
+                       call *___tls_get_addr@GOT(%reg)
+                       which may be converted to
+                       addr32 call ___tls_get_addr
+
+                %eax can't be used as the GOT base register since it
+                is used to pass parameter to ___tls_get_addr.  */
+             reg = val & 7;
+             if ((val & 0xf8) != 0x80 || reg == 4 || reg == 0)
+               return FALSE;
 
 
-#define elf_i386_local_got_tls_type(abfd) \
-  (elf_i386_tdata (abfd)->local_got_tls_type)
+             indirect_call = call[0] == 0xff;
+             if (!(reg == 3 && call[0] == 0xe8 && call[5] == 0x90)
+                 && !(call[0] == 0x67 && call[1] == 0xe8)
+                 && !(indirect_call
+                      && (call[1] & 0xf8) == 0x90
+                      && (call[1] & 0x7) == reg))
+               return FALSE;
+           }
+       }
+      else
+       {
+         /* Check transition from LD access model.  Only
+               leal foo@tlsldm(%ebx), %eax
+               call ___tls_get_addr@PLT
+            or
+               leal foo@tlsldm(%reg), %eax
+               call *___tls_get_addr@GOT(%reg)
+               which may be converted to
+               addr32 call ___tls_get_addr
+            can transit to different access model.  */
+         if (type != 0x8d || (offset + 9) > sec->size)
+           return FALSE;
 
 
-#define elf_i386_local_tlsdesc_gotent(abfd) \
-  (elf_i386_tdata (abfd)->local_tlsdesc_gotent)
+         /* %eax can't be used as the GOT base register since it is
+            used to pass parameter to ___tls_get_addr.  */
+         reg = val & 7;
+         if ((val & 0xf8) != 0x80 || reg == 4 || reg == 0)
+           return FALSE;
 
 
-#define is_i386_elf(bfd)                               \
-  (bfd_get_flavour (bfd) == bfd_target_elf_flavour     \
-   && elf_tdata (bfd) != NULL                          \
-   && elf_object_id (bfd) == I386_ELF_DATA)
+         indirect_call = call[0] == 0xff;
+         if (!(reg == 3 && call[0] == 0xe8)
+             && !(call[0] == 0x67 && call[1] == 0xe8)
+             && !(indirect_call
+                  && (call[1] & 0xf8) == 0x90
+                  && (call[1] & 0x7) == reg))
+           return FALSE;
+       }
 
 
-static bfd_boolean
-elf_i386_mkobject (bfd *abfd)
-{
-  return bfd_elf_allocate_object (abfd, sizeof (struct elf_i386_obj_tdata),
-                                 I386_ELF_DATA);
-}
+      r_symndx = ELF32_R_SYM (rel[1].r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+       return FALSE;
 
 
-/* i386 ELF linker hash table.  */
+      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+      if (h == NULL
+         || !((struct elf_x86_link_hash_entry *) h)->tls_get_addr)
+       return FALSE;
+      else if (indirect_call)
+       return (ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32X);
+      else
+       return (ELF32_R_TYPE (rel[1].r_info) == R_386_PC32
+               || ELF32_R_TYPE (rel[1].r_info) == R_386_PLT32);
 
 
-struct elf_i386_link_hash_table
-{
-  struct elf_link_hash_table elf;
+    case R_386_TLS_IE:
+      /* Check transition from IE access model:
+               movl foo@indntpoff(%rip), %eax
+               movl foo@indntpoff(%rip), %reg
+               addl foo@indntpoff(%rip), %reg
+       */
 
 
-  /* Short-cuts to get to dynamic linker sections.  */
-  asection *sdynbss;
-  asection *srelbss;
-  asection *plt_eh_frame;
-  asection *plt_got;
+      if (offset < 1 || (offset + 4) > sec->size)
+       return FALSE;
 
 
-  union
-  {
-    bfd_signed_vma refcount;
-    bfd_vma offset;
-  } tls_ldm_got;
+      /* Check "movl foo@tpoff(%rip), %eax" first.  */
+      val = bfd_get_8 (abfd, contents + offset - 1);
+      if (val == 0xa1)
+       return TRUE;
 
 
-  /* The amount of space used by the reserved portion of the sgotplt
-     section, plus whatever space is used by the jump slots.  */
-  bfd_vma sgotplt_jump_table_size;
+      if (offset < 2)
+       return FALSE;
 
 
-  /* Small local sym cache.  */
-  struct sym_cache sym_cache;
+      /* Check movl|addl foo@tpoff(%rip), %reg.   */
+      type = bfd_get_8 (abfd, contents + offset - 2);
+      return ((type == 0x8b || type == 0x03)
+             && (val & 0xc7) == 0x05);
 
 
-  /* _TLS_MODULE_BASE_ symbol.  */
-  struct bfd_link_hash_entry *tls_module_base;
+    case R_386_TLS_GOTIE:
+    case R_386_TLS_IE_32:
+      /* Check transition from {IE_32,GOTIE} access model:
+               subl foo@{tpoff,gontoff}(%reg1), %reg2
+               movl foo@{tpoff,gontoff}(%reg1), %reg2
+               addl foo@{tpoff,gontoff}(%reg1), %reg2
+       */
 
 
-  /* Used by local STT_GNU_IFUNC symbols.  */
-  htab_t loc_hash_table;
-  void * loc_hash_memory;
+      if (offset < 2 || (offset + 4) > sec->size)
+       return FALSE;
 
 
-  /* The (unloaded but important) .rel.plt.unloaded section on VxWorks.  */
-  asection *srelplt2;
+      val = bfd_get_8 (abfd, contents + offset - 1);
+      if ((val & 0xc0) != 0x80 || (val & 7) == 4)
+       return FALSE;
 
 
-  /* The index of the next unused R_386_TLS_DESC slot in .rel.plt.  */
-  bfd_vma next_tls_desc_index;
+      type = bfd_get_8 (abfd, contents + offset - 2);
+      return type == 0x8b || type == 0x2b || type == 0x03;
 
 
-  /* The index of the next unused R_386_JUMP_SLOT slot in .rel.plt.  */
-  bfd_vma next_jump_slot_index;
+    case R_386_TLS_GOTDESC:
+      /* Check transition from GDesc access model:
+               leal x@tlsdesc(%ebx), %eax
 
 
-  /* The index of the next unused R_386_IRELATIVE slot in .rel.plt.  */
-  bfd_vma next_irelative_index;
-};
+        Make sure it's a leal adding ebx to a 32-bit offset
+        into any register, although it's probably almost always
+        going to be eax.  */
 
 
-/* Get the i386 ELF linker hash table from a link_info structure.  */
+      if (offset < 2 || (offset + 4) > sec->size)
+       return FALSE;
 
 
-#define elf_i386_hash_table(p) \
-  (elf_hash_table_id  ((struct elf_link_hash_table *) ((p)->hash)) \
-  == I386_ELF_DATA ? ((struct elf_i386_link_hash_table *) ((p)->hash)) : NULL)
+      if (bfd_get_8 (abfd, contents + offset - 2) != 0x8d)
+       return FALSE;
 
 
-#define elf_i386_compute_jump_table_size(htab) \
-  ((htab)->elf.srelplt->reloc_count * 4)
+      val = bfd_get_8 (abfd, contents + offset - 1);
+      return (val & 0xc7) == 0x83;
 
 
-/* Create an entry in an i386 ELF linker hash table.  */
+    case R_386_TLS_DESC_CALL:
+      /* Check transition from GDesc access model:
+               call *x@tlsdesc(%eax)
+       */
+      if (offset + 2 <= sec->size)
+       {
+         /* Make sure that it's a call *x@tlsdesc(%eax).  */
+         call = contents + offset;
+         return call[0] == 0xff && call[1] == 0x10;
+       }
 
 
-static struct bfd_hash_entry *
-elf_i386_link_hash_newfunc (struct bfd_hash_entry *entry,
-                           struct bfd_hash_table *table,
-                           const char *string)
-{
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (entry == NULL)
-    {
-      entry = (struct bfd_hash_entry *)
-          bfd_hash_allocate (table, sizeof (struct elf_i386_link_hash_entry));
-      if (entry == NULL)
-       return entry;
-    }
+      return FALSE;
 
 
-  /* Call the allocation method of the superclass.  */
-  entry = _bfd_elf_link_hash_newfunc (entry, table, string);
-  if (entry != NULL)
-    {
-      struct elf_i386_link_hash_entry *eh;
-
-      eh = (struct elf_i386_link_hash_entry *) entry;
-      eh->dyn_relocs = NULL;
-      eh->tls_type = GOT_UNKNOWN;
-      eh->gotoff_ref = 0;
-      eh->func_pointer_refcount = 0;
-      eh->plt_got.offset = (bfd_vma) -1;
-      eh->tlsdesc_got = (bfd_vma) -1;
+    default:
+      abort ();
     }
     }
-
-  return entry;
-}
-
-/* Compute a hash of a local hash entry.  We use elf_link_hash_entry
-  for local symbol so that we can handle local STT_GNU_IFUNC symbols
-  as global symbol.  We reuse indx and dynstr_index for local symbol
-  hash since they aren't used by global symbols in this backend.  */
-
-static hashval_t
-elf_i386_local_htab_hash (const void *ptr)
-{
-  struct elf_link_hash_entry *h
-    = (struct elf_link_hash_entry *) ptr;
-  return ELF_LOCAL_SYMBOL_HASH (h->indx, h->dynstr_index);
 }
 
 }
 
-/* Compare local hash entries.  */
+/* Return TRUE if the TLS access transition is OK or no transition
+   will be performed.  Update R_TYPE if there is a transition.  */
 
 
-static int
-elf_i386_local_htab_eq (const void *ptr1, const void *ptr2)
+static bfd_boolean
+elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
+                        asection *sec, bfd_byte *contents,
+                        Elf_Internal_Shdr *symtab_hdr,
+                        struct elf_link_hash_entry **sym_hashes,
+                        unsigned int *r_type, int tls_type,
+                        const Elf_Internal_Rela *rel,
+                        const Elf_Internal_Rela *relend,
+                        struct elf_link_hash_entry *h,
+                        unsigned long r_symndx,
+                        bfd_boolean from_relocate_section)
 {
 {
-  struct elf_link_hash_entry *h1
-     = (struct elf_link_hash_entry *) ptr1;
-  struct elf_link_hash_entry *h2
-    = (struct elf_link_hash_entry *) ptr2;
+  unsigned int from_type = *r_type;
+  unsigned int to_type = from_type;
+  bfd_boolean check = TRUE;
 
 
-  return h1->indx == h2->indx && h1->dynstr_index == h2->dynstr_index;
-}
-
-/* Find and/or create a hash entry for local symbol.  */
-
-static struct elf_link_hash_entry *
-elf_i386_get_local_sym_hash (struct elf_i386_link_hash_table *htab,
-                            bfd *abfd, const Elf_Internal_Rela *rel,
-                            bfd_boolean create)
-{
-  struct elf_i386_link_hash_entry e, *ret;
-  asection *sec = abfd->sections;
-  hashval_t h = ELF_LOCAL_SYMBOL_HASH (sec->id,
-                                      ELF32_R_SYM (rel->r_info));
-  void **slot;
-
-  e.elf.indx = sec->id;
-  e.elf.dynstr_index = ELF32_R_SYM (rel->r_info);
-  slot = htab_find_slot_with_hash (htab->loc_hash_table, &e, h,
-                                  create ? INSERT : NO_INSERT);
-
-  if (!slot)
-    return NULL;
-
-  if (*slot)
-    {
-      ret = (struct elf_i386_link_hash_entry *) *slot;
-      return &ret->elf;
-    }
-
-  ret = (struct elf_i386_link_hash_entry *)
-       objalloc_alloc ((struct objalloc *) htab->loc_hash_memory,
-                       sizeof (struct elf_i386_link_hash_entry));
-  if (ret)
-    {
-      memset (ret, 0, sizeof (*ret));
-      ret->elf.indx = sec->id;
-      ret->elf.dynstr_index = ELF32_R_SYM (rel->r_info);
-      ret->elf.dynindx = -1;
-      ret->func_pointer_refcount = 0;
-      ret->plt_got.offset = (bfd_vma) -1;
-      *slot = ret;
-    }
-  return &ret->elf;
-}
-
-/* Destroy an i386 ELF linker hash table.  */
-
-static void
-elf_i386_link_hash_table_free (bfd *obfd)
-{
-  struct elf_i386_link_hash_table *htab
-    = (struct elf_i386_link_hash_table *) obfd->link.hash;
-
-  if (htab->loc_hash_table)
-    htab_delete (htab->loc_hash_table);
-  if (htab->loc_hash_memory)
-    objalloc_free ((struct objalloc *) htab->loc_hash_memory);
-  _bfd_elf_link_hash_table_free (obfd);
-}
-
-/* Create an i386 ELF linker hash table.  */
-
-static struct bfd_link_hash_table *
-elf_i386_link_hash_table_create (bfd *abfd)
-{
-  struct elf_i386_link_hash_table *ret;
-  bfd_size_type amt = sizeof (struct elf_i386_link_hash_table);
-
-  ret = (struct elf_i386_link_hash_table *) bfd_zmalloc (amt);
-  if (ret == NULL)
-    return NULL;
-
-  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd,
-                                     elf_i386_link_hash_newfunc,
-                                     sizeof (struct elf_i386_link_hash_entry),
-                                     I386_ELF_DATA))
-    {
-      free (ret);
-      return NULL;
-    }
-
-  ret->loc_hash_table = htab_try_create (1024,
-                                        elf_i386_local_htab_hash,
-                                        elf_i386_local_htab_eq,
-                                        NULL);
-  ret->loc_hash_memory = objalloc_create ();
-  if (!ret->loc_hash_table || !ret->loc_hash_memory)
-    {
-      elf_i386_link_hash_table_free (abfd);
-      return NULL;
-    }
-  ret->elf.root.hash_table_free = elf_i386_link_hash_table_free;
-
-  return &ret->elf.root;
-}
-
-/* Create .plt, .rel.plt, .got, .got.plt, .rel.got, .dynbss, and
-   .rel.bss sections in DYNOBJ, and set up shortcuts to them in our
-   hash table.  */
-
-static bfd_boolean
-elf_i386_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)
-{
-  struct elf_i386_link_hash_table *htab;
-
-  if (!_bfd_elf_create_dynamic_sections (dynobj, info))
-    return FALSE;
-
-  htab = elf_i386_hash_table (info);
-  if (htab == NULL)
-    return FALSE;
-
-  htab->sdynbss = bfd_get_linker_section (dynobj, ".dynbss");
-  if (!htab->sdynbss)
-    abort ();
-
-  if (bfd_link_executable (info))
-    {
-      /* Always allow copy relocs for building executables.  */
-      asection *s = bfd_get_linker_section (dynobj, ".rel.bss");
-      if (s == NULL)
-       {
-         const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
-         s = bfd_make_section_anyway_with_flags (dynobj,
-                                                 ".rel.bss",
-                                                 (bed->dynamic_sec_flags
-                                                  | SEC_READONLY));
-         if (s == NULL
-             || ! bfd_set_section_alignment (dynobj, s,
-                                             bed->s->log_file_align))
-           return FALSE;
-       }
-      htab->srelbss = s;
-    }
-
-  if (get_elf_i386_backend_data (dynobj)->is_vxworks
-      && !elf_vxworks_create_dynamic_sections (dynobj, info,
-                                              &htab->srelplt2))
-    return FALSE;
-
-  if (!info->no_ld_generated_unwind_info
-      && htab->plt_eh_frame == NULL
-      && htab->elf.splt != NULL)
-    {
-      flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY
-                       | SEC_HAS_CONTENTS | SEC_IN_MEMORY
-                       | SEC_LINKER_CREATED);
-      htab->plt_eh_frame
-       = bfd_make_section_anyway_with_flags (dynobj, ".eh_frame", flags);
-      if (htab->plt_eh_frame == NULL
-         || !bfd_set_section_alignment (dynobj, htab->plt_eh_frame, 2))
-       return FALSE;
-    }
-
-  return TRUE;
-}
-
-/* Copy the extra info we tack onto an elf_link_hash_entry.  */
-
-static void
-elf_i386_copy_indirect_symbol (struct bfd_link_info *info,
-                              struct elf_link_hash_entry *dir,
-                              struct elf_link_hash_entry *ind)
-{
-  struct elf_i386_link_hash_entry *edir, *eind;
-
-  edir = (struct elf_i386_link_hash_entry *) dir;
-  eind = (struct elf_i386_link_hash_entry *) ind;
-
-  if (eind->dyn_relocs != NULL)
-    {
-      if (edir->dyn_relocs != NULL)
-       {
-         struct elf_dyn_relocs **pp;
-         struct elf_dyn_relocs *p;
-
-         /* Add reloc counts against the indirect sym to the direct sym
-            list.  Merge any entries against the same section.  */
-         for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
-           {
-             struct elf_dyn_relocs *q;
-
-             for (q = edir->dyn_relocs; q != NULL; q = q->next)
-               if (q->sec == p->sec)
-                 {
-                   q->pc_count += p->pc_count;
-                   q->count += p->count;
-                   *pp = p->next;
-                   break;
-                 }
-             if (q == NULL)
-               pp = &p->next;
-           }
-         *pp = edir->dyn_relocs;
-       }
-
-      edir->dyn_relocs = eind->dyn_relocs;
-      eind->dyn_relocs = NULL;
-    }
-
-  if (ind->root.type == bfd_link_hash_indirect
-      && dir->got.refcount <= 0)
-    {
-      edir->tls_type = eind->tls_type;
-      eind->tls_type = GOT_UNKNOWN;
-    }
-
-  /* Copy gotoff_ref so that elf_i386_adjust_dynamic_symbol will
-     generate a R_386_COPY reloc.  */
-  edir->gotoff_ref |= eind->gotoff_ref;
-
-  if (ELIMINATE_COPY_RELOCS
-      && ind->root.type != bfd_link_hash_indirect
-      && dir->dynamic_adjusted)
-    {
-      /* If called to transfer flags for a weakdef during processing
-        of elf_adjust_dynamic_symbol, don't copy non_got_ref.
-        We clear it ourselves for ELIMINATE_COPY_RELOCS.  */
-      dir->ref_dynamic |= ind->ref_dynamic;
-      dir->ref_regular |= ind->ref_regular;
-      dir->ref_regular_nonweak |= ind->ref_regular_nonweak;
-      dir->needs_plt |= ind->needs_plt;
-      dir->pointer_equality_needed |= ind->pointer_equality_needed;
-    }
-  else
-    {
-      if (eind->func_pointer_refcount > 0)
-       {
-         edir->func_pointer_refcount += eind->func_pointer_refcount;
-         eind->func_pointer_refcount = 0;
-       }
-
-      _bfd_elf_link_hash_copy_indirect (info, dir, ind);
-    }
-}
-
-/* Return TRUE if the TLS access code sequence support transition
-   from R_TYPE.  */
-
-static bfd_boolean
-elf_i386_check_tls_transition (bfd *abfd, asection *sec,
-                              bfd_byte *contents,
-                              Elf_Internal_Shdr *symtab_hdr,
-                              struct elf_link_hash_entry **sym_hashes,
-                              unsigned int r_type,
-                              const Elf_Internal_Rela *rel,
-                              const Elf_Internal_Rela *relend)
-{
-  unsigned int val, type;
-  unsigned long r_symndx;
-  struct elf_link_hash_entry *h;
-  bfd_vma offset;
-
-  /* Get the section contents.  */
-  if (contents == NULL)
-    {
-      if (elf_section_data (sec)->this_hdr.contents != NULL)
-       contents = elf_section_data (sec)->this_hdr.contents;
-      else
-       {
-         /* FIXME: How to better handle error condition?  */
-         if (!bfd_malloc_and_get_section (abfd, sec, &contents))
-           return FALSE;
-
-         /* Cache the section contents for elf_link_input_bfd.  */
-         elf_section_data (sec)->this_hdr.contents = contents;
-       }
-    }
-
-  offset = rel->r_offset;
-  switch (r_type)
-    {
-    case R_386_TLS_GD:
-    case R_386_TLS_LDM:
-      if (offset < 2 || (rel + 1) >= relend)
-       return FALSE;
-
-      type = bfd_get_8 (abfd, contents + offset - 2);
-      if (r_type == R_386_TLS_GD)
-       {
-         /* Check transition from GD access model.  Only
-               leal foo@tlsgd(,%reg,1), %eax; call ___tls_get_addr
-               leal foo@tlsgd(%reg), %eax; call ___tls_get_addr; nop
-            can transit to different access model.  */
-         if ((offset + 10) > sec->size ||
-             (type != 0x8d && type != 0x04))
-           return FALSE;
-
-         val = bfd_get_8 (abfd, contents + offset - 1);
-         if (type == 0x04)
-           {
-             /* leal foo@tlsgd(,%reg,1), %eax; call ___tls_get_addr */
-             if (offset < 3)
-               return FALSE;
-
-             if (bfd_get_8 (abfd, contents + offset - 3) != 0x8d)
-               return FALSE;
-
-             if ((val & 0xc7) != 0x05 || val == (4 << 3))
-               return FALSE;
-           }
-         else
-           {
-             /* leal foo@tlsgd(%reg), %eax; call ___tls_get_addr; nop  */
-             if ((val & 0xf8) != 0x80 || (val & 7) == 4)
-               return FALSE;
-
-             if (bfd_get_8 (abfd, contents + offset + 9) != 0x90)
-               return FALSE;
-           }
-       }
-      else
-       {
-         /* Check transition from LD access model.  Only
-               leal foo@tlsgd(%reg), %eax; call ___tls_get_addr
-            can transit to different access model.  */
-         if (type != 0x8d || (offset + 9) > sec->size)
-           return FALSE;
-
-         val = bfd_get_8 (abfd, contents + offset - 1);
-         if ((val & 0xf8) != 0x80 || (val & 7) == 4)
-           return FALSE;
-       }
-
-      if (bfd_get_8 (abfd, contents + offset + 4) != 0xe8)
-       return FALSE;
-
-      r_symndx = ELF32_R_SYM (rel[1].r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-       return FALSE;
-
-      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-      /* Use strncmp to check ___tls_get_addr since ___tls_get_addr
-        may be versioned.  */
-      return (h != NULL
-             && h->root.root.string != NULL
-             && (ELF32_R_TYPE (rel[1].r_info) == R_386_PC32
-                 || ELF32_R_TYPE (rel[1].r_info) == R_386_PLT32)
-             && (strncmp (h->root.root.string, "___tls_get_addr",
-                          15) == 0));
-
-    case R_386_TLS_IE:
-      /* Check transition from IE access model:
-               movl foo@indntpoff(%rip), %eax
-               movl foo@indntpoff(%rip), %reg
-               addl foo@indntpoff(%rip), %reg
-       */
-
-      if (offset < 1 || (offset + 4) > sec->size)
-       return FALSE;
-
-      /* Check "movl foo@tpoff(%rip), %eax" first.  */
-      val = bfd_get_8 (abfd, contents + offset - 1);
-      if (val == 0xa1)
-       return TRUE;
-
-      if (offset < 2)
-       return FALSE;
-
-      /* Check movl|addl foo@tpoff(%rip), %reg.   */
-      type = bfd_get_8 (abfd, contents + offset - 2);
-      return ((type == 0x8b || type == 0x03)
-             && (val & 0xc7) == 0x05);
-
-    case R_386_TLS_GOTIE:
-    case R_386_TLS_IE_32:
-      /* Check transition from {IE_32,GOTIE} access model:
-               subl foo@{tpoff,gontoff}(%reg1), %reg2
-               movl foo@{tpoff,gontoff}(%reg1), %reg2
-               addl foo@{tpoff,gontoff}(%reg1), %reg2
-       */
-
-      if (offset < 2 || (offset + 4) > sec->size)
-       return FALSE;
-
-      val = bfd_get_8 (abfd, contents + offset - 1);
-      if ((val & 0xc0) != 0x80 || (val & 7) == 4)
-       return FALSE;
-
-      type = bfd_get_8 (abfd, contents + offset - 2);
-      return type == 0x8b || type == 0x2b || type == 0x03;
-
-    case R_386_TLS_GOTDESC:
-      /* Check transition from GDesc access model:
-               leal x@tlsdesc(%ebx), %eax
-
-        Make sure it's a leal adding ebx to a 32-bit offset
-        into any register, although it's probably almost always
-        going to be eax.  */
-
-      if (offset < 2 || (offset + 4) > sec->size)
-       return FALSE;
-
-      if (bfd_get_8 (abfd, contents + offset - 2) != 0x8d)
-       return FALSE;
-
-      val = bfd_get_8 (abfd, contents + offset - 1);
-      return (val & 0xc7) == 0x83;
-
-    case R_386_TLS_DESC_CALL:
-      /* Check transition from GDesc access model:
-               call *x@tlsdesc(%rax)
-       */
-      if (offset + 2 <= sec->size)
-       {
-         /* Make sure that it's a call *x@tlsdesc(%rax).  */
-         static const unsigned char call[] = { 0xff, 0x10 };
-         return memcmp (contents + offset, call, 2) == 0;
-       }
-
-      return FALSE;
-
-    default:
-      abort ();
-    }
-}
-
-/* Return TRUE if the TLS access transition is OK or no transition
-   will be performed.  Update R_TYPE if there is a transition.  */
-
-static bfd_boolean
-elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
-                        asection *sec, bfd_byte *contents,
-                        Elf_Internal_Shdr *symtab_hdr,
-                        struct elf_link_hash_entry **sym_hashes,
-                        unsigned int *r_type, int tls_type,
-                        const Elf_Internal_Rela *rel,
-                        const Elf_Internal_Rela *relend,
-                        struct elf_link_hash_entry *h,
-                        unsigned long r_symndx)
-{
-  unsigned int from_type = *r_type;
-  unsigned int to_type = from_type;
-  bfd_boolean check = TRUE;
-
-  /* Skip TLS transition for functions.  */
-  if (h != NULL
-      && (h->type == STT_FUNC
-         || h->type == STT_GNU_IFUNC))
-    return TRUE;
+  /* Skip TLS transition for functions.  */
+  if (h != NULL
+      && (h->type == STT_FUNC
+         || h->type == STT_GNU_IFUNC))
+    return TRUE;
 
   switch (from_type)
     {
 
   switch (from_type)
     {
@@ -1385,17 +1101,13 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
            to_type = R_386_TLS_IE_32;
        }
 
            to_type = R_386_TLS_IE_32;
        }
 
-      /* When we are called from elf_i386_relocate_section, CONTENTS
-        isn't NULL and there may be additional transitions based on
-        TLS_TYPE.  */
-      if (contents != NULL)
+      /* When we are called from elf_i386_relocate_section, there may
+        be additional transitions based on TLS_TYPE.  */
+      if (from_relocate_section)
        {
          unsigned int new_to_type = to_type;
 
        {
          unsigned int new_to_type = to_type;
 
-         if (bfd_link_executable (info)
-             && h != NULL
-             && h->dynindx == -1
-             && (tls_type & GOT_TLS_IE))
+         if (TLS_TRANSITION_IE_TO_LE_P (info, h, tls_type))
            new_to_type = R_386_TLS_LE_32;
 
          if (to_type == R_386_TLS_GD
            new_to_type = R_386_TLS_LE_32;
 
          if (to_type == R_386_TLS_GD
@@ -1432,23 +1144,23 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
 
   /* Check if the transition can be performed.  */
   if (check
 
   /* Check if the transition can be performed.  */
   if (check
-      && ! elf_i386_check_tls_transition (abfd, sec, contents,
+      && ! elf_i386_check_tls_transition (sec, contents,
                                          symtab_hdr, sym_hashes,
                                          from_type, rel, relend))
     {
       reloc_howto_type *from, *to;
       const char *name;
 
                                          symtab_hdr, sym_hashes,
                                          from_type, rel, relend))
     {
       reloc_howto_type *from, *to;
       const char *name;
 
-      from = elf_i386_rtype_to_howto (abfd, from_type);
-      to = elf_i386_rtype_to_howto (abfd, to_type);
+      from = elf_i386_rtype_to_howto (from_type);
+      to = elf_i386_rtype_to_howto (to_type);
 
       if (h)
        name = h->root.root.string;
       else
        {
 
       if (h)
        name = h->root.root.string;
       else
        {
-         struct elf_i386_link_hash_table *htab;
+         struct elf_x86_link_hash_table *htab;
 
 
-         htab = elf_i386_hash_table (info);
+         htab = elf_x86_hash_table (info, I386_ELF_DATA);
          if (htab == NULL)
            name = "*unknown*";
          else
          if (htab == NULL)
            name = "*unknown*";
          else
@@ -1461,11 +1173,12 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
            }
        }
 
            }
        }
 
-      (*_bfd_error_handler)
-       (_("%B: TLS transition from %s to %s against `%s' at 0x%lx "
-          "in section `%A' failed"),
-        abfd, sec, from->name, to->name, name,
-        (unsigned long) rel->r_offset);
+      _bfd_error_handler
+       /* xgettext:c-format */
+       (_("%pB: TLS transition from %s to %s against `%s'"
+          " at %#" PRIx64 " in section `%pA' failed"),
+        abfd, from->name, to->name, name,
+        (uint64_t) rel->r_offset, sec);
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }
@@ -1474,9 +1187,271 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
   return TRUE;
 }
 
   return TRUE;
 }
 
+/* With the local symbol, foo, we convert
+   mov foo@GOT[(%reg1)], %reg2
+   to
+   lea foo[@GOTOFF(%reg1)], %reg2
+   and convert
+   call/jmp *foo@GOT[(%reg)]
+   to
+   nop call foo/jmp foo nop
+   When PIC is false, convert
+   test %reg1, foo@GOT[(%reg2)]
+   to
+   test $foo, %reg1
+   and convert
+   binop foo@GOT[(%reg1)], %reg2
+   to
+   binop $foo, %reg2
+   where binop is one of adc, add, and, cmp, or, sbb, sub, xor
+   instructions.  */
+
+static
+bfd_boolean
+elf_i386_convert_load_reloc (bfd *abfd, Elf_Internal_Shdr *symtab_hdr,
+                            bfd_byte *contents,
+                            unsigned int *r_type_p,
+                            Elf_Internal_Rela *irel,
+                            struct elf_link_hash_entry *h,
+                            bfd_boolean *converted,
+                            struct bfd_link_info *link_info)
+{
+  struct elf_x86_link_hash_table *htab;
+  unsigned int opcode;
+  unsigned int modrm;
+  bfd_boolean baseless;
+  Elf_Internal_Sym *isym;
+  unsigned int addend;
+  unsigned int nop;
+  bfd_vma nop_offset;
+  bfd_boolean is_pic;
+  bfd_boolean to_reloc_32;
+  unsigned int r_type;
+  unsigned int r_symndx;
+  bfd_vma roff = irel->r_offset;
+  bfd_boolean local_ref;
+  struct elf_x86_link_hash_entry *eh;
+
+  if (roff < 2)
+    return TRUE;
+
+  /* Addend for R_386_GOT32X relocations must be 0.  */
+  addend = bfd_get_32 (abfd, contents + roff);
+  if (addend != 0)
+    return TRUE;
+
+  htab = elf_x86_hash_table (link_info, I386_ELF_DATA);
+  is_pic = bfd_link_pic (link_info);
+
+  r_type = *r_type_p;
+  r_symndx = ELF32_R_SYM (irel->r_info);
+
+  modrm = bfd_get_8 (abfd, contents + roff - 1);
+  baseless = (modrm & 0xc7) == 0x5;
+
+  if (baseless && is_pic)
+    {
+      /* For PIC, disallow R_386_GOT32X without a base register
+        since we don't know what the GOT base is.  */
+      const char *name;
+
+      if (h == NULL)
+       {
+         isym = bfd_sym_from_r_symndx (&htab->sym_cache, abfd,
+                                       r_symndx);
+         name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL);
+       }
+      else
+       name = h->root.root.string;
+
+      _bfd_error_handler
+       /* xgettext:c-format */
+       (_("%pB: direct GOT relocation R_386_GOT32X against `%s' without base"
+          " register can not be used when making a shared object"),
+        abfd, name);
+      return FALSE;
+    }
+
+  opcode = bfd_get_8 (abfd, contents + roff - 2);
+
+  /* Convert to R_386_32 if PIC is false or there is no base
+     register.  */
+  to_reloc_32 = !is_pic || baseless;
+
+  eh = elf_x86_hash_entry (h);
+
+  /* Try to convert R_386_GOT32X.  Get the symbol referred to by the
+     reloc.  */
+  if (h == NULL)
+    {
+      if (opcode == 0x0ff)
+       /* Convert "call/jmp *foo@GOT[(%reg)]".  */
+       goto convert_branch;
+      else
+       /* Convert "mov foo@GOT[(%reg1)], %reg2",
+          "test %reg1, foo@GOT(%reg2)" and
+          "binop foo@GOT[(%reg1)], %reg2". */
+       goto convert_load;
+    }
+
+  /* NB: Also set linker_def via SYMBOL_REFERENCES_LOCAL_P.  */
+  local_ref = SYMBOL_REFERENCES_LOCAL_P (link_info, h);
+
+  /* Undefined weak symbol is only bound locally in executable
+     and its reference is resolved as 0.  */
+  if (h->root.type == bfd_link_hash_undefweak
+      && !eh->linker_def
+      && local_ref)
+    {
+      if (opcode == 0xff)
+       {
+         /* No direct branch to 0 for PIC.  */
+         if (is_pic)
+           return TRUE;
+         else
+           goto convert_branch;
+       }
+      else
+       {
+         /* We can convert load of address 0 to R_386_32.  */
+         to_reloc_32 = TRUE;
+         goto convert_load;
+       }
+    }
+
+  if (opcode == 0xff)
+    {
+      /* We have "call/jmp *foo@GOT[(%reg)]".  */
+      if ((h->root.type == bfd_link_hash_defined
+          || h->root.type == bfd_link_hash_defweak)
+         && local_ref)
+       {
+         /* The function is locally defined.   */
+convert_branch:
+         /* Convert R_386_GOT32X to R_386_PC32.  */
+         if (modrm == 0x15 || (modrm & 0xf8) == 0x90)
+           {
+             /* Convert to "nop call foo".  ADDR_PREFIX_OPCODE
+                is a nop prefix.  */
+             modrm = 0xe8;
+             /* To support TLS optimization, always use addr32 prefix
+                for "call *___tls_get_addr@GOT(%reg)".  */
+             if (eh && eh->tls_get_addr)
+               {
+                 nop = 0x67;
+                 nop_offset = irel->r_offset - 2;
+               }
+             else
+               {
+                 nop = htab->params->call_nop_byte;
+                 if (htab->params->call_nop_as_suffix)
+                   {
+                     nop_offset = roff + 3;
+                     irel->r_offset -= 1;
+                   }
+                 else
+                   nop_offset = roff - 2;
+               }
+           }
+         else
+           {
+             /* Convert to "jmp foo nop".  */
+             modrm = 0xe9;
+             nop = NOP_OPCODE;
+             nop_offset = roff + 3;
+             irel->r_offset -= 1;
+           }
+
+         bfd_put_8 (abfd, nop, contents + nop_offset);
+         bfd_put_8 (abfd, modrm, contents + irel->r_offset - 1);
+         /* When converting to PC-relative relocation, we
+            need to adjust addend by -4.  */
+         bfd_put_32 (abfd, -4, contents + irel->r_offset);
+         irel->r_info = ELF32_R_INFO (r_symndx, R_386_PC32);
+         *r_type_p = R_386_PC32;
+         *converted = TRUE;
+       }
+    }
+  else
+    {
+      /* We have "mov foo@GOT[(%re1g)], %reg2",
+        "test %reg1, foo@GOT(%reg2)" and
+        "binop foo@GOT[(%reg1)], %reg2".
+
+        Avoid optimizing _DYNAMIC since ld.so may use its
+        link-time address.  */
+      if (h == htab->elf.hdynamic)
+       return TRUE;
+
+      /* def_regular is set by an assignment in a linker script in
+        bfd_elf_record_link_assignment.  start_stop is set on
+        __start_SECNAME/__stop_SECNAME which mark section SECNAME.  */
+      if (h->start_stop
+         || eh->linker_def
+         || ((h->def_regular
+              || h->root.type == bfd_link_hash_defined
+              || h->root.type == bfd_link_hash_defweak)
+             && local_ref))
+       {
+convert_load:
+         if (opcode == 0x8b)
+           {
+             if (to_reloc_32)
+               {
+                 /* Convert "mov foo@GOT[(%reg1)], %reg2" to
+                    "mov $foo, %reg2" with R_386_32.  */
+                 r_type = R_386_32;
+                 modrm = 0xc0 | (modrm & 0x38) >> 3;
+                 bfd_put_8 (abfd, modrm, contents + roff - 1);
+                 opcode = 0xc7;
+               }
+             else
+               {
+                 /* Convert "mov foo@GOT(%reg1), %reg2" to
+                    "lea foo@GOTOFF(%reg1), %reg2".  */
+                 r_type = R_386_GOTOFF;
+                 opcode = 0x8d;
+               }
+           }
+         else
+           {
+             /* Only R_386_32 is supported.  */
+             if (!to_reloc_32)
+               return TRUE;
+
+             if (opcode == 0x85)
+               {
+                 /* Convert "test %reg1, foo@GOT(%reg2)" to
+                    "test $foo, %reg1".  */
+                 modrm = 0xc0 | (modrm & 0x38) >> 3;
+                 opcode = 0xf7;
+               }
+             else
+               {
+                 /* Convert "binop foo@GOT(%reg1), %reg2" to
+                    "binop $foo, %reg2".  */
+                 modrm = (0xc0
+                          | (modrm & 0x38) >> 3
+                          | (opcode & 0x3c));
+                 opcode = 0x81;
+               }
+             bfd_put_8 (abfd, modrm, contents + roff - 1);
+             r_type = R_386_32;
+           }
+
+         bfd_put_8 (abfd, opcode, contents + roff - 2);
+         irel->r_info = ELF32_R_INFO (r_symndx, r_type);
+         *r_type_p = r_type;
+         *converted = TRUE;
+       }
+    }
+
+  return TRUE;
+}
+
 /* Rename some of the generic section flags to better document how they
    are used here.  */
 /* Rename some of the generic section flags to better document how they
    are used here.  */
-#define need_convert_load sec_flg0
+#define check_relocs_failed    sec_flg0
 
 /* Look through the relocs for a section during the first phase, and
    calculate needed space in the global offset table, procedure linkage
 
 /* Look through the relocs for a section during the first phase, and
    calculate needed space in the global offset table, procedure linkage
@@ -1488,39 +1463,59 @@ elf_i386_check_relocs (bfd *abfd,
                       asection *sec,
                       const Elf_Internal_Rela *relocs)
 {
                       asection *sec,
                       const Elf_Internal_Rela *relocs)
 {
-  struct elf_i386_link_hash_table *htab;
+  struct elf_x86_link_hash_table *htab;
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   const Elf_Internal_Rela *rel;
   const Elf_Internal_Rela *rel_end;
   asection *sreloc;
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   const Elf_Internal_Rela *rel;
   const Elf_Internal_Rela *rel_end;
   asection *sreloc;
-  bfd_boolean use_plt_got;
+  bfd_byte *contents;
+  bfd_boolean converted;
 
   if (bfd_link_relocatable (info))
     return TRUE;
 
 
   if (bfd_link_relocatable (info))
     return TRUE;
 
-  BFD_ASSERT (is_i386_elf (abfd));
+  /* Don't do anything special with non-loaded, non-alloced sections.
+     In particular, any relocs in such sections should not affect GOT
+     and PLT reference counting (ie. we don't allow them to create GOT
+     or PLT entries), there's no possibility or desire to optimize TLS
+     relocs, and there's not much point in propagating relocs to shared
+     libs that the dynamic linker won't relocate.  */
+  if ((sec->flags & SEC_ALLOC) == 0)
+    return TRUE;
 
 
-  htab = elf_i386_hash_table (info);
+  htab = elf_x86_hash_table (info, I386_ELF_DATA);
   if (htab == NULL)
   if (htab == NULL)
-    return FALSE;
+    {
+      sec->check_relocs_failed = 1;
+      return FALSE;
+    }
 
 
-  use_plt_got = (!get_elf_i386_backend_data (abfd)->is_vxworks
-                && (get_elf_i386_backend_data (abfd)
-                    == &elf_i386_arch_bed));
+  BFD_ASSERT (is_x86_elf (abfd, htab));
+
+  /* Get the section contents.  */
+  if (elf_section_data (sec)->this_hdr.contents != NULL)
+    contents = elf_section_data (sec)->this_hdr.contents;
+  else if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+    {
+      sec->check_relocs_failed = 1;
+      return FALSE;
+    }
 
   symtab_hdr = &elf_symtab_hdr (abfd);
   sym_hashes = elf_sym_hashes (abfd);
 
 
   symtab_hdr = &elf_symtab_hdr (abfd);
   sym_hashes = elf_sym_hashes (abfd);
 
+  converted = FALSE;
+
   sreloc = NULL;
 
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
     {
       unsigned int r_type;
   sreloc = NULL;
 
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
     {
       unsigned int r_type;
-      unsigned long r_symndx;
+      unsigned int r_symndx;
       struct elf_link_hash_entry *h;
       struct elf_link_hash_entry *h;
-      struct elf_i386_link_hash_entry *eh;
+      struct elf_x86_link_hash_entry *eh;
       Elf_Internal_Sym *isym;
       const char *name;
       bfd_boolean size_reloc;
       Elf_Internal_Sym *isym;
       const char *name;
       bfd_boolean size_reloc;
@@ -1530,10 +1525,10 @@ elf_i386_check_relocs (bfd *abfd,
 
       if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
        {
 
       if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
        {
-         (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
-                                abfd,
-                                r_symndx);
-         return FALSE;
+         /* xgettext:c-format */
+         _bfd_error_handler (_("%pB: bad symbol index: %d"),
+                             abfd, r_symndx);
+         goto error_return;
        }
 
       if (r_symndx < symtab_hdr->sh_info)
        }
 
       if (r_symndx < symtab_hdr->sh_info)
@@ -1542,16 +1537,18 @@ elf_i386_check_relocs (bfd *abfd,
          isym = bfd_sym_from_r_symndx (&htab->sym_cache,
                                        abfd, r_symndx);
          if (isym == NULL)
          isym = bfd_sym_from_r_symndx (&htab->sym_cache,
                                        abfd, r_symndx);
          if (isym == NULL)
-           return FALSE;
+           goto error_return;
 
          /* Check relocation against local STT_GNU_IFUNC symbol.  */
          if (ELF32_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
            {
 
          /* Check relocation against local STT_GNU_IFUNC symbol.  */
          if (ELF32_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
            {
-             h = elf_i386_get_local_sym_hash (htab, abfd, rel, TRUE);
+             h = _bfd_elf_x86_get_local_sym_hash (htab, abfd, rel, TRUE);
              if (h == NULL)
              if (h == NULL)
-               return FALSE;
+               goto error_return;
 
              /* Fake a STT_GNU_IFUNC symbol.  */
 
              /* Fake a STT_GNU_IFUNC symbol.  */
+             h->root.root.string = bfd_elf_sym_name (abfd, symtab_hdr,
+                                                     isym, NULL);
              h->type = STT_GNU_IFUNC;
              h->def_regular = 1;
              h->ref_regular = 1;
              h->type = STT_GNU_IFUNC;
              h->def_regular = 1;
              h->ref_regular = 1;
@@ -1570,51 +1567,40 @@ elf_i386_check_relocs (bfd *abfd,
            h = (struct elf_link_hash_entry *) h->root.u.i.link;
        }
 
            h = (struct elf_link_hash_entry *) h->root.u.i.link;
        }
 
-      eh = (struct elf_i386_link_hash_entry *) h;
+      eh = (struct elf_x86_link_hash_entry *) h;
       if (h != NULL)
        {
       if (h != NULL)
        {
-         /* Create the ifunc sections for static executables.  If we
-            never see an indirect function symbol nor we are building
-            a static executable, those sections will be empty and
-            won't appear in output.  */
-         switch (r_type)
-           {
-           default:
-             break;
-
-           case R_386_GOTOFF:
-             eh->gotoff_ref = 1;
-           case R_386_32:
-           case R_386_PC32:
-           case R_386_PLT32:
-           case R_386_GOT32:
-           case R_386_GOT32X:
-             if (htab->elf.dynobj == NULL)
-               htab->elf.dynobj = abfd;
-             if (!_bfd_elf_create_ifunc_sections (htab->elf.dynobj, info))
-               return FALSE;
-             break;
-           }
+         if (r_type == R_386_GOTOFF)
+           eh->gotoff_ref = 1;
 
          /* It is referenced by a non-shared object. */
          h->ref_regular = 1;
 
          /* It is referenced by a non-shared object. */
          h->ref_regular = 1;
-         h->root.non_ir_ref = 1;
+       }
 
 
-         if (h->type == STT_GNU_IFUNC)
-           elf_tdata (info->output_bfd)->has_gnu_symbols
-             |= elf_gnu_symbol_ifunc;
+      if (r_type == R_386_GOT32X
+         && (h == NULL || h->type != STT_GNU_IFUNC))
+       {
+         Elf_Internal_Rela *irel = (Elf_Internal_Rela *) rel;
+         if (!elf_i386_convert_load_reloc (abfd, symtab_hdr, contents,
+                                           &r_type, irel, h,
+                                           &converted, info))
+           goto error_return;
        }
 
        }
 
-      if (! elf_i386_tls_transition (info, abfd, sec, NULL,
+      if (! elf_i386_tls_transition (info, abfd, sec, contents,
                                     symtab_hdr, sym_hashes,
                                     &r_type, GOT_UNKNOWN,
                                     symtab_hdr, sym_hashes,
                                     &r_type, GOT_UNKNOWN,
-                                    rel, rel_end, h, r_symndx))
-       return FALSE;
+                                    rel, rel_end, h, r_symndx, FALSE))
+       goto error_return;
+
+      /* Check if _GLOBAL_OFFSET_TABLE_ is referenced.  */
+      if (h == htab->elf.hgot)
+       htab->got_referenced = TRUE;
 
       switch (r_type)
        {
        case R_386_TLS_LDM:
 
       switch (r_type)
        {
        case R_386_TLS_LDM:
-         htab->tls_ldm_got.refcount += 1;
+         htab->tls_ld_or_ldm_got.refcount = 1;
          goto create_got;
 
        case R_386_PLT32:
          goto create_got;
 
        case R_386_PLT32:
@@ -1630,8 +1616,9 @@ elf_i386_check_relocs (bfd *abfd,
          if (h == NULL)
            continue;
 
          if (h == NULL)
            continue;
 
+         eh->zero_undefweak &= 0x2;
          h->needs_plt = 1;
          h->needs_plt = 1;
-         h->plt.refcount += 1;
+         h->plt.refcount = 1;
          break;
 
        case R_386_SIZE32:
          break;
 
        case R_386_SIZE32:
@@ -1680,8 +1667,8 @@ elf_i386_check_relocs (bfd *abfd,
 
            if (h != NULL)
              {
 
            if (h != NULL)
              {
-               h->got.refcount += 1;
-               old_tls_type = elf_i386_hash_entry(h)->tls_type;
+               h->got.refcount = 1;
+               old_tls_type = elf_x86_hash_entry (h)->tls_type;
              }
            else
              {
              }
            else
              {
@@ -1697,17 +1684,17 @@ elf_i386_check_relocs (bfd *abfd,
                    size *= (sizeof (bfd_signed_vma)
                             + sizeof (bfd_vma) + sizeof(char));
                    local_got_refcounts = (bfd_signed_vma *)
                    size *= (sizeof (bfd_signed_vma)
                             + sizeof (bfd_vma) + sizeof(char));
                    local_got_refcounts = (bfd_signed_vma *)
-                        bfd_zalloc (abfd, size);
+                       bfd_zalloc (abfd, size);
                    if (local_got_refcounts == NULL)
                    if (local_got_refcounts == NULL)
-                     return FALSE;
+                     goto error_return;
                    elf_local_got_refcounts (abfd) = local_got_refcounts;
                    elf_local_got_refcounts (abfd) = local_got_refcounts;
-                   elf_i386_local_tlsdesc_gotent (abfd)
+                   elf_x86_local_tlsdesc_gotent (abfd)
                      = (bfd_vma *) (local_got_refcounts + symtab_hdr->sh_info);
                      = (bfd_vma *) (local_got_refcounts + symtab_hdr->sh_info);
-                   elf_i386_local_got_tls_type (abfd)
+                   elf_x86_local_got_tls_type (abfd)
                      = (char *) (local_got_refcounts + 2 * symtab_hdr->sh_info);
                  }
                      = (char *) (local_got_refcounts + 2 * symtab_hdr->sh_info);
                  }
-               local_got_refcounts[r_symndx] += 1;
-               old_tls_type = elf_i386_local_got_tls_type (abfd) [r_symndx];
+               local_got_refcounts[r_symndx] = 1;
+               old_tls_type = elf_x86_local_got_tls_type (abfd) [r_symndx];
              }
 
            if ((old_tls_type & GOT_TLS_IE) && (tls_type & GOT_TLS_IE))
              }
 
            if ((old_tls_type & GOT_TLS_IE) && (tls_type & GOT_TLS_IE))
@@ -1730,61 +1717,68 @@ elf_i386_check_relocs (bfd *abfd,
                    else
                      name = bfd_elf_sym_name (abfd, symtab_hdr, isym,
                                             NULL);
                    else
                      name = bfd_elf_sym_name (abfd, symtab_hdr, isym,
                                             NULL);
-                   (*_bfd_error_handler)
-                     (_("%B: `%s' accessed both as normal and "
+                   _bfd_error_handler
+                     /* xgettext:c-format */
+                     (_("%pB: `%s' accessed both as normal and "
                         "thread local symbol"),
                       abfd, name);
                    bfd_set_error (bfd_error_bad_value);
                         "thread local symbol"),
                       abfd, name);
                    bfd_set_error (bfd_error_bad_value);
-                   return FALSE;
+                   goto error_return;
                  }
              }
 
            if (old_tls_type != tls_type)
              {
                if (h != NULL)
                  }
              }
 
            if (old_tls_type != tls_type)
              {
                if (h != NULL)
-                 elf_i386_hash_entry (h)->tls_type = tls_type;
+                 elf_x86_hash_entry (h)->tls_type = tls_type;
                else
                else
-                 elf_i386_local_got_tls_type (abfd) [r_symndx] = tls_type;
+                 elf_x86_local_got_tls_type (abfd) [r_symndx] = tls_type;
              }
          }
          /* Fall through */
 
        case R_386_GOTOFF:
        case R_386_GOTPC:
              }
          }
          /* Fall through */
 
        case R_386_GOTOFF:
        case R_386_GOTPC:
-       create_got:
-         if (htab->elf.sgot == NULL)
+create_got:
+         if (r_type != R_386_TLS_IE)
            {
            {
-             if (htab->elf.dynobj == NULL)
-               htab->elf.dynobj = abfd;
-             if (!_bfd_elf_create_got_section (htab->elf.dynobj, info))
-               return FALSE;
+             if (eh != NULL)
+               {
+                 eh->zero_undefweak &= 0x2;
+
+                 /* Need GOT to resolve undefined weak symbol to 0.  */
+                 if (r_type == R_386_GOTOFF
+                     && h->root.type == bfd_link_hash_undefweak
+                     && bfd_link_executable (info))
+                   htab->got_referenced = TRUE;
+               }
+             break;
            }
            }
-         if (r_type != R_386_TLS_IE)
-           break;
          /* Fall through */
 
        case R_386_TLS_LE_32:
        case R_386_TLS_LE:
          /* Fall through */
 
        case R_386_TLS_LE_32:
        case R_386_TLS_LE:
+         if (eh != NULL)
+           eh->zero_undefweak &= 0x2;
          if (bfd_link_executable (info))
            break;
          info->flags |= DF_STATIC_TLS;
          if (bfd_link_executable (info))
            break;
          info->flags |= DF_STATIC_TLS;
-         /* Fall through */
+         goto do_relocation;
 
        case R_386_32:
        case R_386_PC32:
 
        case R_386_32:
        case R_386_PC32:
-         if (h != NULL && bfd_link_executable (info))
+         if (eh != NULL && (sec->flags & SEC_CODE) != 0)
+           eh->zero_undefweak |= 0x2;
+do_relocation:
+         /* We are called after all symbols have been resolved.  Only
+            relocation against STT_GNU_IFUNC symbol must go through
+            PLT.  */
+         if (h != NULL
+             && (bfd_link_executable (info)
+                 || h->type == STT_GNU_IFUNC))
            {
            {
-             /* If this reloc is in a read-only section, we might
-                need a copy reloc.  We can't check reliably at this
-                stage whether the section is read-only, as input
-                sections have not yet been mapped to output sections.
-                Tentatively set the flag for now, and correct in
-                adjust_dynamic_symbol.  */
-             h->non_got_ref = 1;
-
-             /* We may need a .plt entry if the function this reloc
-                refers to is in a shared lib.  */
-             h->plt.refcount += 1;
+             bfd_boolean func_pointer_ref = FALSE;
+
              if (r_type == R_386_PC32)
                {
                  /* Since something like ".long foo - ." may be used
              if (r_type == R_386_PC32)
                {
                  /* Since something like ".long foo - ." may be used
@@ -1792,6 +1786,16 @@ elf_i386_check_relocs (bfd *abfd,
                     a function defined in a shared library.  */
                  if ((sec->flags & SEC_CODE) == 0)
                    h->pointer_equality_needed = 1;
                     a function defined in a shared library.  */
                  if ((sec->flags & SEC_CODE) == 0)
                    h->pointer_equality_needed = 1;
+                 else if (h->type == STT_GNU_IFUNC
+                          && bfd_link_pic (info))
+                   {
+                     _bfd_error_handler
+                       /* xgettext:c-format */
+                       (_("%pB: unsupported non-PIC call to IFUNC `%s'"),
+                        abfd, h->root.root.string);
+                     bfd_set_error (bfd_error_bad_value);
+                     goto error_return;
+                   }
                }
              else
                {
                }
              else
                {
@@ -1799,46 +1803,32 @@ elf_i386_check_relocs (bfd *abfd,
                  /* R_386_32 can be resolved at run-time.  */
                  if (r_type == R_386_32
                      && (sec->flags & SEC_READONLY) == 0)
                  /* R_386_32 can be resolved at run-time.  */
                  if (r_type == R_386_32
                      && (sec->flags & SEC_READONLY) == 0)
-                   eh->func_pointer_refcount += 1;
+                   func_pointer_ref = TRUE;
+               }
+
+             if (!func_pointer_ref)
+               {
+                 /* If this reloc is in a read-only section, we might
+                    need a copy reloc.  We can't check reliably at this
+                    stage whether the section is read-only, as input
+                    sections have not yet been mapped to output sections.
+                    Tentatively set the flag for now, and correct in
+                    adjust_dynamic_symbol.  */
+                 h->non_got_ref = 1;
+
+                 /* We may need a .plt entry if the symbol is a function
+                    defined in a shared lib or is a function referenced
+                    from the code or read-only section.  */
+                 if (!h->def_regular
+                     || (sec->flags & (SEC_CODE | SEC_READONLY)) != 0)
+                   h->plt.refcount = 1;
                }
            }
 
          size_reloc = FALSE;
 do_size:
                }
            }
 
          size_reloc = FALSE;
 do_size:
-         /* If we are creating a shared library, and this is a reloc
-            against a global symbol, or a non PC relative reloc
-            against a local symbol, then we need to copy the reloc
-            into the shared library.  However, if we are linking with
-            -Bsymbolic, we do not need to copy a reloc against a
-            global symbol which is defined in an object we are
-            including in the link (i.e., DEF_REGULAR is set).  At
-            this point we have not seen all the input files, so it is
-            possible that DEF_REGULAR is not set now but will be set
-            later (it is never cleared).  In case of a weak definition,
-            DEF_REGULAR may be cleared later by a strong definition in
-            a shared library.  We account for that possibility below by
-            storing information in the relocs_copied field of the hash
-            table entry.  A similar situation occurs when creating
-            shared libraries and symbol visibility changes render the
-            symbol local.
-
-            If on the other hand, we are creating an executable, we
-            may need to keep relocations for symbols satisfied by a
-            dynamic library if we manage to avoid copy relocs for the
-            symbol.  */
-         if ((bfd_link_pic (info)
-              && (sec->flags & SEC_ALLOC) != 0
-              && (r_type != R_386_PC32
-                  || (h != NULL
-                      && (! SYMBOLIC_BIND (info, h)
-                          || h->root.type == bfd_link_hash_defweak
-                          || !h->def_regular))))
-             || (ELIMINATE_COPY_RELOCS
-                 && !bfd_link_pic (info)
-                 && (sec->flags & SEC_ALLOC) != 0
-                 && h != NULL
-                 && (h->root.type == bfd_link_hash_defweak
-                     || !h->def_regular)))
+         if (NEED_DYNAMIC_RELOCATION_P (info, FALSE, h, sec, r_type,
+                                        R_386_32))
            {
              struct elf_dyn_relocs *p;
              struct elf_dyn_relocs **head;
            {
              struct elf_dyn_relocs *p;
              struct elf_dyn_relocs **head;
@@ -1848,14 +1838,11 @@ do_size:
                 this reloc.  */
              if (sreloc == NULL)
                {
                 this reloc.  */
              if (sreloc == NULL)
                {
-                 if (htab->elf.dynobj == NULL)
-                   htab->elf.dynobj = abfd;
-
                  sreloc = _bfd_elf_make_dynamic_reloc_section
                    (sec, htab->elf.dynobj, 2, abfd, /*rela?*/ FALSE);
 
                  if (sreloc == NULL)
                  sreloc = _bfd_elf_make_dynamic_reloc_section
                    (sec, htab->elf.dynobj, 2, abfd, /*rela?*/ FALSE);
 
                  if (sreloc == NULL)
-                   return FALSE;
+                   goto error_return;
                }
 
              /* If this is a global symbol, we count the number of
                }
 
              /* If this is a global symbol, we count the number of
@@ -1875,7 +1862,7 @@ do_size:
                  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
                                                abfd, r_symndx);
                  if (isym == NULL)
                  isym = bfd_sym_from_r_symndx (&htab->sym_cache,
                                                abfd, r_symndx);
                  if (isym == NULL)
-                   return FALSE;
+                   goto error_return;
 
                  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
                  if (s == NULL)
 
                  s = bfd_section_from_elf_index (abfd, isym->st_shndx);
                  if (s == NULL)
@@ -1890,9 +1877,9 @@ do_size:
                {
                  bfd_size_type amt = sizeof *p;
                  p = (struct elf_dyn_relocs *) bfd_alloc (htab->elf.dynobj,
                {
                  bfd_size_type amt = sizeof *p;
                  p = (struct elf_dyn_relocs *) bfd_alloc (htab->elf.dynobj,
-                                                           amt);
+                                                          amt);
                  if (p == NULL)
                  if (p == NULL)
-                   return FALSE;
+                   goto error_return;
                  p->next = *head;
                  *head = p;
                  p->sec = sec;
                  p->next = *head;
                  *head = p;
                  p->sec = sec;
@@ -1911,1596 +1898,57 @@ do_size:
             Reconstruct it for later use during GC.  */
        case R_386_GNU_VTINHERIT:
          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
             Reconstruct it for later use during GC.  */
        case R_386_GNU_VTINHERIT:
          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-           return FALSE;
+           goto error_return;
          break;
 
          /* This relocation describes which C++ vtable entries are actually
             used.  Record for later use during GC.  */
        case R_386_GNU_VTENTRY:
          break;
 
          /* This relocation describes which C++ vtable entries are actually
             used.  Record for later use during GC.  */
        case R_386_GNU_VTENTRY:
-         BFD_ASSERT (h != NULL);
-         if (h != NULL
-             && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_offset))
-           return FALSE;
+         if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_offset))
+           goto error_return;
          break;
 
        default:
          break;
        }
          break;
 
        default:
          break;
        }
+    }
 
 
-      if (use_plt_got
-         && h != NULL
-         && h->plt.refcount > 0
-         && (((info->flags & DF_BIND_NOW) && !h->pointer_equality_needed)
-             || h->got.refcount > 0)
-         && htab->plt_got == NULL)
+  if (elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (!converted && !info->keep_memory)
+       free (contents);
+      else
        {
        {
-         /* Create the GOT procedure linkage table.  */
-         unsigned int plt_got_align;
-         const struct elf_backend_data *bed;
-
-         bed = get_elf_backend_data (info->output_bfd);
-         BFD_ASSERT (sizeof (elf_i386_got_plt_entry) == 8
-                     && (sizeof (elf_i386_got_plt_entry)
-                         == sizeof (elf_i386_pic_got_plt_entry)));
-         plt_got_align = 3;
-
-         if (htab->elf.dynobj == NULL)
-           htab->elf.dynobj = abfd;
-         htab->plt_got
-           = bfd_make_section_anyway_with_flags (htab->elf.dynobj,
-                                                 ".plt.got",
-                                                 (bed->dynamic_sec_flags
-                                                  | SEC_ALLOC
-                                                  | SEC_CODE
-                                                  | SEC_LOAD
-                                                  | SEC_READONLY));
-         if (htab->plt_got == NULL
-             || !bfd_set_section_alignment (htab->elf.dynobj,
-                                            htab->plt_got,
-                                            plt_got_align))
-           return FALSE;
+         /* Cache the section contents for elf_link_input_bfd if any
+            load is converted or --no-keep-memory isn't used.  */
+         elf_section_data (sec)->this_hdr.contents = contents;
        }
        }
-
-      if ((r_type == R_386_GOT32 || r_type == R_386_GOT32X)
-         && (h == NULL || h->type != STT_GNU_IFUNC))
-       sec->need_convert_load = 1;
     }
 
     }
 
-  return TRUE;
-}
+  /* Cache relocations if any load is converted.  */
+  if (elf_section_data (sec)->relocs != relocs && converted)
+    elf_section_data (sec)->relocs = (Elf_Internal_Rela *) relocs;
 
 
-/* Return the section that should be marked against GC for a given
-   relocation.  */
+  return TRUE;
 
 
-static asection *
-elf_i386_gc_mark_hook (asection *sec,
-                      struct bfd_link_info *info,
-                      Elf_Internal_Rela *rel,
-                      struct elf_link_hash_entry *h,
-                      Elf_Internal_Sym *sym)
-{
-  if (h != NULL)
-    switch (ELF32_R_TYPE (rel->r_info))
-      {
-      case R_386_GNU_VTINHERIT:
-      case R_386_GNU_VTENTRY:
-       return NULL;
-      }
-
-  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+error_return:
+  if (elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  sec->check_relocs_failed = 1;
+  return FALSE;
 }
 
 }
 
-/* Update the got entry reference counts for the section being removed.  */
+/* Set the correct type for an x86 ELF section.  We do this by the
+   section name, which is a hack, but ought to work.  */
 
 static bfd_boolean
 
 static bfd_boolean
-elf_i386_gc_sweep_hook (bfd *abfd,
-                       struct bfd_link_info *info,
-                       asection *sec,
-                       const Elf_Internal_Rela *relocs)
+elf_i386_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
+                       Elf_Internal_Shdr *hdr,
+                       asection *sec)
 {
 {
-  struct elf_i386_link_hash_table *htab;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_signed_vma *local_got_refcounts;
-  const Elf_Internal_Rela *rel, *relend;
-
-  if (bfd_link_relocatable (info))
-    return TRUE;
-
-  htab = elf_i386_hash_table (info);
-  if (htab == NULL)
-    return FALSE;
-
-  elf_section_data (sec)->local_dynrel = NULL;
-
-  symtab_hdr = &elf_symtab_hdr (abfd);
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_refcounts = elf_local_got_refcounts (abfd);
-
-  relend = relocs + sec->reloc_count;
-  for (rel = relocs; rel < relend; rel++)
-    {
-      unsigned long r_symndx;
-      unsigned int r_type;
-      struct elf_link_hash_entry *h = NULL;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      if (r_symndx >= symtab_hdr->sh_info)
-       {
-         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-         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;
-       }
-      else
-       {
-         /* A local symbol.  */
-         Elf_Internal_Sym *isym;
-
-         isym = bfd_sym_from_r_symndx (&htab->sym_cache,
-                                       abfd, r_symndx);
-
-         /* Check relocation against local STT_GNU_IFUNC symbol.  */
-         if (isym != NULL
-             && ELF32_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
-           {
-             h = elf_i386_get_local_sym_hash (htab, abfd, rel, FALSE);
-             if (h == NULL)
-               abort ();
-           }
-       }
-
-      if (h)
-       {
-         struct elf_i386_link_hash_entry *eh;
-         struct elf_dyn_relocs **pp;
-         struct elf_dyn_relocs *p;
-
-         eh = (struct elf_i386_link_hash_entry *) h;
-         for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
-           if (p->sec == sec)
-             {
-               /* Everything must go for SEC.  */
-               *pp = p->next;
-               break;
-             }
-       }
-
-      r_type = ELF32_R_TYPE (rel->r_info);
-      if (! elf_i386_tls_transition (info, abfd, sec, NULL,
-                                    symtab_hdr, sym_hashes,
-                                    &r_type, GOT_UNKNOWN,
-                                    rel, relend, h, r_symndx))
-       return FALSE;
+  const char *name;
 
 
-      switch (r_type)
-       {
-       case R_386_TLS_LDM:
-         if (htab->tls_ldm_got.refcount > 0)
-           htab->tls_ldm_got.refcount -= 1;
-         break;
-
-       case R_386_TLS_GD:
-       case R_386_TLS_GOTDESC:
-       case R_386_TLS_DESC_CALL:
-       case R_386_TLS_IE_32:
-       case R_386_TLS_IE:
-       case R_386_TLS_GOTIE:
-       case R_386_GOT32:
-       case R_386_GOT32X:
-         if (h != NULL)
-           {
-             if (h->got.refcount > 0)
-               h->got.refcount -= 1;
-             if (h->type == STT_GNU_IFUNC)
-               {
-                 if (h->plt.refcount > 0)
-                   h->plt.refcount -= 1;
-               }
-           }
-         else if (local_got_refcounts != NULL)
-           {
-             if (local_got_refcounts[r_symndx] > 0)
-               local_got_refcounts[r_symndx] -= 1;
-           }
-         break;
-
-       case R_386_32:
-       case R_386_PC32:
-       case R_386_SIZE32:
-         if (bfd_link_pic (info)
-             && (h == NULL || h->type != STT_GNU_IFUNC))
-           break;
-         /* Fall through */
-
-       case R_386_PLT32:
-         if (h != NULL)
-           {
-             if (h->plt.refcount > 0)
-               h->plt.refcount -= 1;
-             if (r_type == R_386_32
-                 && (sec->flags & SEC_READONLY) == 0)
-               {
-                 struct elf_i386_link_hash_entry *eh
-                   = (struct elf_i386_link_hash_entry *) h;
-                 if (eh->func_pointer_refcount > 0)
-                   eh->func_pointer_refcount -= 1;
-               }
-           }
-         break;
-
-       case R_386_GOTOFF:
-         if (h != NULL && h->type == STT_GNU_IFUNC)
-           {
-             if (h->got.refcount > 0)
-               h->got.refcount -= 1;
-             if (h->plt.refcount > 0)
-               h->plt.refcount -= 1;
-           }
-         break;
-
-       default:
-         break;
-       }
-    }
-
-  return TRUE;
-}
-
-/* Adjust a symbol defined by a dynamic object and referenced by a
-   regular object.  The current definition is in some section of the
-   dynamic object, but we're not including those sections.  We have to
-   change the definition to something the rest of the link can
-   understand.  */
-
-static bfd_boolean
-elf_i386_adjust_dynamic_symbol (struct bfd_link_info *info,
-                               struct elf_link_hash_entry *h)
-{
-  struct elf_i386_link_hash_table *htab;
-  asection *s;
-  struct elf_i386_link_hash_entry *eh;
-  struct elf_dyn_relocs *p;
-
-  /* STT_GNU_IFUNC symbol must go through PLT. */
-  if (h->type == STT_GNU_IFUNC)
-    {
-      /* All local STT_GNU_IFUNC references must be treate as local
-        calls via local PLT.  */
-      if (h->ref_regular
-         && SYMBOL_CALLS_LOCAL (info, h))
-       {
-         bfd_size_type pc_count = 0, count = 0;
-         struct elf_dyn_relocs **pp;
-
-         eh = (struct elf_i386_link_hash_entry *) h;
-         for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
-           {
-             pc_count += p->pc_count;
-             p->count -= p->pc_count;
-             p->pc_count = 0;
-             count += p->count;
-             if (p->count == 0)
-               *pp = p->next;
-             else
-               pp = &p->next;
-           }
-
-         if (pc_count || count)
-           {
-             h->needs_plt = 1;
-             h->non_got_ref = 1;
-             if (h->plt.refcount <= 0)
-               h->plt.refcount = 1;
-             else
-               h->plt.refcount += 1;
-           }
-       }
-
-      if (h->plt.refcount <= 0)
-       {
-         h->plt.offset = (bfd_vma) -1;
-         h->needs_plt = 0;
-       }
-      return TRUE;
-    }
-
-  /* If this is a function, put it in the procedure linkage table.  We
-     will fill in the contents of the procedure linkage table later,
-     when we know the address of the .got section.  */
-  if (h->type == STT_FUNC
-      || h->needs_plt)
-    {
-      if (h->plt.refcount <= 0
-         || SYMBOL_CALLS_LOCAL (info, h)
-         || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
-             && h->root.type == bfd_link_hash_undefweak))
-       {
-         /* This case can occur if we saw a PLT32 reloc in an input
-            file, but the symbol was never referred to by a dynamic
-            object, or if all references were garbage collected.  In
-            such a case, we don't actually need to build a procedure
-            linkage table, and we can just do a PC32 reloc instead.  */
-         h->plt.offset = (bfd_vma) -1;
-         h->needs_plt = 0;
-       }
-
-      return TRUE;
-    }
-  else
-    /* It's possible that we incorrectly decided a .plt reloc was
-       needed for an R_386_PC32 reloc to a non-function sym in
-       check_relocs.  We can't decide accurately between function and
-       non-function syms in check-relocs;  Objects loaded later in
-       the link may change h->type.  So fix it now.  */
-    h->plt.offset = (bfd_vma) -1;
-
-  /* If this is a weak symbol, and there is a real definition, the
-     processor independent code will have arranged for us to see the
-     real definition first, and we can just use the same value.  */
-  if (h->u.weakdef != NULL)
-    {
-      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
-                 || h->u.weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->u.weakdef->root.u.def.section;
-      h->root.u.def.value = h->u.weakdef->root.u.def.value;
-      if (ELIMINATE_COPY_RELOCS || info->nocopyreloc)
-       h->non_got_ref = h->u.weakdef->non_got_ref;
-      return TRUE;
-    }
-
-  /* This is a reference to a symbol defined by a dynamic object which
-     is not a function.  */
-
-  /* If we are creating a shared library, we must presume that the
-     only references to the symbol are via the global offset table.
-     For such cases we need not do anything here; the relocations will
-     be handled correctly by relocate_section.  */
-  if (!bfd_link_executable (info))
-    return TRUE;
-
-  /* If there are no references to this symbol that do not use the
-     GOT nor R_386_GOTOFF relocation, we don't need to generate a copy
-     reloc.  */
-  eh = (struct elf_i386_link_hash_entry *) h;
-  if (!h->non_got_ref && !eh->gotoff_ref)
-    return TRUE;
-
-  /* If -z nocopyreloc was given, we won't generate them either.  */
-  if (info->nocopyreloc)
-    {
-      h->non_got_ref = 0;
-      return TRUE;
-    }
-
-  htab = elf_i386_hash_table (info);
-  if (htab == NULL)
-    return FALSE;
-
-  /* If there aren't any dynamic relocs in read-only sections nor
-     R_386_GOTOFF relocation, then we can keep the dynamic relocs and
-     avoid the copy reloc.  This doesn't work on VxWorks, where we can
-     not have dynamic relocations (other than copy and jump slot
-     relocations) in an executable.  */
-  if (ELIMINATE_COPY_RELOCS
-      && !eh->gotoff_ref
-      && !get_elf_i386_backend_data (info->output_bfd)->is_vxworks)
-    {
-      for (p = eh->dyn_relocs; p != NULL; p = p->next)
-       {
-         s = p->sec->output_section;
-         if (s != NULL && (s->flags & SEC_READONLY) != 0)
-           break;
-       }
-
-      if (p == NULL)
-       {
-         h->non_got_ref = 0;
-         return TRUE;
-       }
-    }
-
-  /* We must allocate the symbol in our .dynbss section, which will
-     become part of the .bss section of the executable.  There will be
-     an entry for this symbol in the .dynsym section.  The dynamic
-     object will contain position independent code, so all references
-     from the dynamic object to this symbol will go through the global
-     offset table.  The dynamic linker will use the .dynsym entry to
-     determine the address it must put in the global offset table, so
-     both the dynamic object and the regular object will refer to the
-     same memory location for the variable.  */
-
-  /* We must generate a R_386_COPY reloc to tell the dynamic linker to
-     copy the initial value out of the dynamic object and into the
-     runtime process image.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
-    {
-      htab->srelbss->size += sizeof (Elf32_External_Rel);
-      h->needs_copy = 1;
-    }
-
-  s = htab->sdynbss;
-
-  return _bfd_elf_adjust_dynamic_copy (info, h, s);
-}
-
-/* Allocate space in .plt, .got and associated reloc sections for
-   dynamic relocs.  */
-
-static bfd_boolean
-elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
-{
-  struct bfd_link_info *info;
-  struct elf_i386_link_hash_table *htab;
-  struct elf_i386_link_hash_entry *eh;
-  struct elf_dyn_relocs *p;
-  unsigned plt_entry_size;
-
-  if (h->root.type == bfd_link_hash_indirect)
-    return TRUE;
-
-  eh = (struct elf_i386_link_hash_entry *) h;
-
-  info = (struct bfd_link_info *) inf;
-  htab = elf_i386_hash_table (info);
-  if (htab == NULL)
-    return FALSE;
-
-  plt_entry_size = GET_PLT_ENTRY_SIZE (info->output_bfd);
-
-  /* Clear the reference count of function pointer relocations if
-     symbol isn't a normal function.  */
-  if (h->type != STT_FUNC)
-    eh->func_pointer_refcount = 0;
-
-  /* We can't use the GOT PLT if pointer equality is needed since
-     finish_dynamic_symbol won't clear symbol value and the dynamic
-     linker won't update the GOT slot.  We will get into an infinite
-     loop at run-time.  */
-  if (htab->plt_got != NULL
-      && h->type != STT_GNU_IFUNC
-      && !h->pointer_equality_needed
-      && h->plt.refcount > 0
-      && h->got.refcount > 0)
-    {
-      /* Don't use the regular PLT if there are both GOT and GOTPLT
-         reloctions.  */
-      h->plt.offset = (bfd_vma) -1;
-
-      /* Use the GOT PLT.  */
-      eh->plt_got.refcount = 1;
-    }
-
-  /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
-     here if it is defined and referenced in a non-shared object.  */
-  if (h->type == STT_GNU_IFUNC
-      && h->def_regular)
-    return _bfd_elf_allocate_ifunc_dyn_relocs (info, h, &eh->dyn_relocs,
-                                               plt_entry_size,
-                                              plt_entry_size, 4);
-  /* Don't create the PLT entry if there are only function pointer
-     relocations which can be resolved at run-time.  */
-  else if (htab->elf.dynamic_sections_created
-          && (h->plt.refcount > eh->func_pointer_refcount
-              || eh->plt_got.refcount > 0))
-    {
-      bfd_boolean use_plt_got;
-
-      /* Clear the reference count of function pointer relocations
-        if PLT is used.  */
-      eh->func_pointer_refcount = 0;
-
-      if ((info->flags & DF_BIND_NOW) && !h->pointer_equality_needed)
-       {
-         /* Don't use the regular PLT for DF_BIND_NOW. */
-         h->plt.offset = (bfd_vma) -1;
-
-         /* Use the GOT PLT.  */
-         h->got.refcount = 1;
-         eh->plt_got.refcount = 1;
-       }
-
-      use_plt_got = eh->plt_got.refcount > 0;
-
-      /* Make sure this symbol is output as a dynamic symbol.
-        Undefined weak syms won't yet be marked as dynamic.  */
-      if (h->dynindx == -1
-         && !h->forced_local)
-       {
-         if (! bfd_elf_link_record_dynamic_symbol (info, h))
-           return FALSE;
-       }
-
-      if (bfd_link_pic (info)
-         || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))
-       {
-         asection *s = htab->elf.splt;
-         asection *got_s = htab->plt_got;
-
-         /* If this is the first .plt entry, make room for the special
-            first entry.  The .plt section is used by prelink to undo
-            prelinking for dynamic relocations.  */
-         if (s->size == 0)
-           s->size = plt_entry_size;
-
-         if (use_plt_got)
-           eh->plt_got.offset = got_s->size;
-         else
-           h->plt.offset = s->size;
-
-         /* If this symbol is not defined in a regular file, and we are
-            not generating a shared library, then set the symbol to this
-            location in the .plt.  This is required to make function
-            pointers compare as equal between the normal executable and
-            the shared library.  */
-         if (! bfd_link_pic (info)
-             && !h->def_regular)
-           {
-             if (use_plt_got)
-               {
-                 /* We need to make a call to the entry of the GOT PLT
-                    instead of regular PLT entry.  */
-                 h->root.u.def.section = got_s;
-                 h->root.u.def.value = eh->plt_got.offset;
-               }
-             else
-               {
-                 h->root.u.def.section = s;
-                 h->root.u.def.value = h->plt.offset;
-               }
-           }
-
-         /* Make room for this entry.  */
-         if (use_plt_got)
-           got_s->size += sizeof (elf_i386_got_plt_entry);
-         else
-           {
-             s->size += plt_entry_size;
-
-             /* We also need to make an entry in the .got.plt section,
-                which will be placed in the .got section by the linker
-                script.  */
-             htab->elf.sgotplt->size += 4;
-
-             /* We also need to make an entry in the .rel.plt section.  */
-             htab->elf.srelplt->size += sizeof (Elf32_External_Rel);
-             htab->elf.srelplt->reloc_count++;
-           }
-
-         if (get_elf_i386_backend_data (info->output_bfd)->is_vxworks
-              && !bfd_link_pic (info))
-           {
-             /* VxWorks has a second set of relocations for each PLT entry
-                in executables.  They go in a separate relocation section,
-                which is processed by the kernel loader.  */
-
-             /* There are two relocations for the initial PLT entry: an
-                R_386_32 relocation for _GLOBAL_OFFSET_TABLE_ + 4 and an
-                R_386_32 relocation for _GLOBAL_OFFSET_TABLE_ + 8.  */
-
-             if (h->plt.offset == plt_entry_size)
-               htab->srelplt2->size += (sizeof (Elf32_External_Rel) * 2);
-
-             /* There are two extra relocations for each subsequent PLT entry:
-                an R_386_32 relocation for the GOT entry, and an R_386_32
-                relocation for the PLT entry.  */
-
-             htab->srelplt2->size += (sizeof (Elf32_External_Rel) * 2);
-           }
-       }
-      else
-       {
-         h->plt.offset = (bfd_vma) -1;
-         h->needs_plt = 0;
-       }
-    }
-  else
-    {
-      h->plt.offset = (bfd_vma) -1;
-      h->needs_plt = 0;
-    }
-
-  eh->tlsdesc_got = (bfd_vma) -1;
-
-  /* If R_386_TLS_{IE_32,IE,GOTIE} symbol is now local to the binary,
-     make it a R_386_TLS_LE_32 requiring no TLS entry.  */
-  if (h->got.refcount > 0
-      && bfd_link_executable (info)
-      && h->dynindx == -1
-      && (elf_i386_hash_entry(h)->tls_type & GOT_TLS_IE))
-    h->got.offset = (bfd_vma) -1;
-  else if (h->got.refcount > 0)
-    {
-      asection *s;
-      bfd_boolean dyn;
-      int tls_type = elf_i386_hash_entry(h)->tls_type;
-
-      /* Make sure this symbol is output as a dynamic symbol.
-        Undefined weak syms won't yet be marked as dynamic.  */
-      if (h->dynindx == -1
-         && !h->forced_local)
-       {
-         if (! bfd_elf_link_record_dynamic_symbol (info, h))
-           return FALSE;
-       }
-
-      s = htab->elf.sgot;
-      if (GOT_TLS_GDESC_P (tls_type))
-       {
-         eh->tlsdesc_got = htab->elf.sgotplt->size
-           - elf_i386_compute_jump_table_size (htab);
-         htab->elf.sgotplt->size += 8;
-         h->got.offset = (bfd_vma) -2;
-       }
-      if (! GOT_TLS_GDESC_P (tls_type)
-         || GOT_TLS_GD_P (tls_type))
-       {
-         h->got.offset = s->size;
-         s->size += 4;
-         /* R_386_TLS_GD needs 2 consecutive GOT slots.  */
-         if (GOT_TLS_GD_P (tls_type) || tls_type == GOT_TLS_IE_BOTH)
-           s->size += 4;
-       }
-      dyn = htab->elf.dynamic_sections_created;
-      /* R_386_TLS_IE_32 needs one dynamic relocation,
-        R_386_TLS_IE resp. R_386_TLS_GOTIE needs one dynamic relocation,
-        (but if both R_386_TLS_IE_32 and R_386_TLS_IE is present, we
-        need two), R_386_TLS_GD needs one if local symbol and two if
-        global.  */
-      if (tls_type == GOT_TLS_IE_BOTH)
-       htab->elf.srelgot->size += 2 * sizeof (Elf32_External_Rel);
-      else if ((GOT_TLS_GD_P (tls_type) && h->dynindx == -1)
-              || (tls_type & GOT_TLS_IE))
-       htab->elf.srelgot->size += sizeof (Elf32_External_Rel);
-      else if (GOT_TLS_GD_P (tls_type))
-       htab->elf.srelgot->size += 2 * sizeof (Elf32_External_Rel);
-      else if (! GOT_TLS_GDESC_P (tls_type)
-              && (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
-                  || h->root.type != bfd_link_hash_undefweak)
-              && (bfd_link_pic (info)
-                  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
-       htab->elf.srelgot->size += sizeof (Elf32_External_Rel);
-      if (GOT_TLS_GDESC_P (tls_type))
-       htab->elf.srelplt->size += sizeof (Elf32_External_Rel);
-    }
-  else
-    h->got.offset = (bfd_vma) -1;
-
-  if (eh->dyn_relocs == NULL)
-    return TRUE;
-
-  /* In the shared -Bsymbolic case, discard space allocated for
-     dynamic pc-relative relocs against symbols which turn out to be
-     defined in regular objects.  For the normal shared case, discard
-     space for pc-relative relocs that have become local due to symbol
-     visibility changes.  */
-
-  if (bfd_link_pic (info))
-    {
-      /* The only reloc that uses pc_count is R_386_PC32, which will
-        appear on a call or on something like ".long foo - .".  We
-        want calls to protected symbols to resolve directly to the
-        function rather than going via the plt.  If people want
-        function pointer comparisons to work as expected then they
-        should avoid writing assembly like ".long foo - .".  */
-      if (SYMBOL_CALLS_LOCAL (info, h))
-       {
-         struct elf_dyn_relocs **pp;
-
-         for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
-           {
-             p->count -= p->pc_count;
-             p->pc_count = 0;
-             if (p->count == 0)
-               *pp = p->next;
-             else
-               pp = &p->next;
-           }
-       }
-
-      if (get_elf_i386_backend_data (info->output_bfd)->is_vxworks)
-       {
-         struct elf_dyn_relocs **pp;
-         for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
-           {
-             if (strcmp (p->sec->output_section->name, ".tls_vars") == 0)
-               *pp = p->next;
-             else
-               pp = &p->next;
-           }
-       }
-
-      /* Also discard relocs on undefined weak syms with non-default
-        visibility.  */
-      if (eh->dyn_relocs != NULL
-         && h->root.type == bfd_link_hash_undefweak)
-       {
-         if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
-           eh->dyn_relocs = NULL;
-
-         /* Make sure undefined weak symbols are output as a dynamic
-            symbol in PIEs.  */
-         else if (h->dynindx == -1
-                  && !h->forced_local)
-           {
-             if (! bfd_elf_link_record_dynamic_symbol (info, h))
-               return FALSE;
-           }
-       }
-    }
-  else if (ELIMINATE_COPY_RELOCS)
-    {
-      /* For the non-shared case, discard space for relocs against
-        symbols which turn out to need copy relocs or are not
-        dynamic.  Keep dynamic relocations for run-time function
-        pointer initialization.  */
-
-      if ((!h->non_got_ref || eh->func_pointer_refcount > 0)
-         && ((h->def_dynamic
-              && !h->def_regular)
-             || (htab->elf.dynamic_sections_created
-                 && (h->root.type == bfd_link_hash_undefweak
-                     || h->root.type == bfd_link_hash_undefined))))
-       {
-         /* Make sure this symbol is output as a dynamic symbol.
-            Undefined weak syms won't yet be marked as dynamic.  */
-         if (h->dynindx == -1
-             && !h->forced_local)
-           {
-             if (! bfd_elf_link_record_dynamic_symbol (info, h))
-               return FALSE;
-           }
-
-         /* If that succeeded, we know we'll be keeping all the
-            relocs.  */
-         if (h->dynindx != -1)
-           goto keep;
-       }
-
-      eh->dyn_relocs = NULL;
-      eh->func_pointer_refcount = 0;
-
-    keep: ;
-    }
-
-  /* Finally, allocate space.  */
-  for (p = eh->dyn_relocs; p != NULL; p = p->next)
-    {
-      asection *sreloc;
-
-      sreloc = elf_section_data (p->sec)->sreloc;
-
-      BFD_ASSERT (sreloc != NULL);
-      sreloc->size += p->count * sizeof (Elf32_External_Rel);
-    }
-
-  return TRUE;
-}
-
-/* Allocate space in .plt, .got and associated reloc sections for
-   local dynamic relocs.  */
-
-static bfd_boolean
-elf_i386_allocate_local_dynrelocs (void **slot, void *inf)
-{
-  struct elf_link_hash_entry *h
-    = (struct elf_link_hash_entry *) *slot;
-
-  if (h->type != STT_GNU_IFUNC
-      || !h->def_regular
-      || !h->ref_regular
-      || !h->forced_local
-      || h->root.type != bfd_link_hash_defined)
-    abort ();
-
-  return elf_i386_allocate_dynrelocs (h, inf);
-}
-
-/* Find any dynamic relocs that apply to read-only sections.  */
-
-static bfd_boolean
-elf_i386_readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf)
-{
-  struct elf_i386_link_hash_entry *eh;
-  struct elf_dyn_relocs *p;
-
-  /* Skip local IFUNC symbols. */
-  if (h->forced_local && h->type == STT_GNU_IFUNC)
-    return TRUE;
-
-  eh = (struct elf_i386_link_hash_entry *) h;
-  for (p = eh->dyn_relocs; p != NULL; p = p->next)
-    {
-      asection *s = p->sec->output_section;
-
-      if (s != NULL && (s->flags & SEC_READONLY) != 0)
-       {
-         struct bfd_link_info *info = (struct bfd_link_info *) inf;
-
-         info->flags |= DF_TEXTREL;
-
-         if ((info->warn_shared_textrel && bfd_link_pic (info))
-             || info->error_textrel)
-           info->callbacks->einfo (_("%P: %B: warning: relocation against `%s' in readonly section `%A'\n"),
-                                   p->sec->owner, h->root.root.string,
-                                   p->sec);
-
-         /* Not an error, just cut short the traversal.  */
-         return FALSE;
-       }
-    }
-  return TRUE;
-}
-
-/* With the local symbol, foo, we convert
-   mov foo@GOT[(%reg1)], %reg2
-   to
-   lea foo[@GOTOFF(%reg1)], %reg2
-   and convert
-   call/jmp *foo@GOT[(%reg)]
-   to
-   nop call foo/jmp foo nop
-   When PIC is false, convert
-   test %reg1, foo@GOT[(%reg2)]
-   to
-   test $foo, %reg1
-   and convert
-   binop foo@GOT[(%reg1)], %reg2
-   to
-   binop $foo, %reg2
-   where binop is one of adc, add, and, cmp, or, sbb, sub, xor
-   instructions.  */
-
-static bfd_boolean
-elf_i386_convert_load (bfd *abfd, asection *sec,
-                      struct bfd_link_info *link_info)
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Rela *internal_relocs;
-  Elf_Internal_Rela *irel, *irelend;
-  bfd_byte *contents;
-  struct elf_i386_link_hash_table *htab;
-  bfd_boolean changed_contents;
-  bfd_boolean changed_relocs;
-  bfd_signed_vma *local_got_refcounts;
-
-  /* Don't even try to convert non-ELF outputs.  */
-  if (!is_elf_hash_table (link_info->hash))
-    return FALSE;
-
-  /* Nothing to do if there is no need or no output.  */
-  if ((sec->flags & (SEC_CODE | SEC_RELOC)) != (SEC_CODE | SEC_RELOC)
-      || sec->need_convert_load == 0
-      || bfd_is_abs_section (sec->output_section))
-    return TRUE;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-
-  /* Load the relocations for this section.  */
-  internal_relocs = (_bfd_elf_link_read_relocs
-                    (abfd, sec, NULL, (Elf_Internal_Rela *) NULL,
-                     link_info->keep_memory));
-  if (internal_relocs == NULL)
-    return FALSE;
-
-  htab = elf_i386_hash_table (link_info);
-  changed_contents = FALSE;
-  changed_relocs = FALSE;
-  local_got_refcounts = elf_local_got_refcounts (abfd);
-
-  /* Get the section contents.  */
-  if (elf_section_data (sec)->this_hdr.contents != NULL)
-    contents = elf_section_data (sec)->this_hdr.contents;
-  else
-    {
-      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
-       goto error_return;
-    }
-
-  irelend = internal_relocs + sec->reloc_count;
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      unsigned int r_type = ELF32_R_TYPE (irel->r_info);
-      unsigned int r_symndx = ELF32_R_SYM (irel->r_info);
-      unsigned int indx;
-      struct elf_link_hash_entry *h;
-      unsigned int opcode;
-      unsigned int modrm;
-      bfd_vma roff;
-      bfd_boolean baseless;
-      Elf_Internal_Sym *isym;
-      unsigned int addend;
-      unsigned int nop;
-      bfd_vma nop_offset;
-
-      if (r_type != R_386_GOT32 && r_type != R_386_GOT32X)
-       continue;
-
-      roff = irel->r_offset;
-      if (roff < 2)
-       continue;
-
-      modrm = bfd_get_8 (abfd, contents + roff - 1);
-      baseless = (modrm & 0xc7) == 0x5;
-
-      if (r_type == R_386_GOT32X
-         && baseless
-         && bfd_link_pic (link_info))
-       {
-         /* For PIC, disallow R_386_GOT32X without a base register
-            since we don't know what the GOT base is.   Allow
-            R_386_GOT32 for existing object files.  */
-         const char *name;
-
-         if (r_symndx < symtab_hdr->sh_info)
-           {
-             isym = bfd_sym_from_r_symndx (&htab->sym_cache, abfd,
-                                           r_symndx);
-             name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL);
-           }
-         else
-           {
-             indx = r_symndx - symtab_hdr->sh_info;
-             h = elf_sym_hashes (abfd)[indx];
-             BFD_ASSERT (h != NULL);
-             name = h->root.root.string;
-           }
-
-         (*_bfd_error_handler)
-           (_("%B: direct GOT relocation R_386_GOT32X against `%s' without base register can not be used when making a shared object"),
-            abfd, name);
-         goto error_return;
-       }
-
-      opcode = bfd_get_8 (abfd, contents + roff - 2);
-
-      /* It is OK to convert mov to lea.  */
-      if (opcode != 0x8b)
-       {
-         /* Only convert R_386_GOT32X relocation for call, jmp or
-            one of adc, add, and, cmp, or, sbb, sub, test, xor
-            instructions.  */
-         if (r_type != R_386_GOT32X)
-           continue;
-
-         /* It is OK to convert indirect branch to direct branch.  It
-            is OK to convert adc, add, and, cmp, or, sbb, sub, test,
-            xor only when PIC is false.   */
-         if (opcode != 0xff && bfd_link_pic (link_info))
-           continue;
-       }
-
-      /* Try to convert R_386_GOT32 and R_386_GOT32X.  Get the symbol
-        referred to by the reloc.  */
-      if (r_symndx < symtab_hdr->sh_info)
-       {
-         isym = bfd_sym_from_r_symndx (&htab->sym_cache,
-                                       abfd, r_symndx);
-
-         /* STT_GNU_IFUNC must keep GOT32 relocations.  */
-         if (ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC)
-           continue;
-
-         h = NULL;
-         if (opcode == 0x0ff)
-           /* Convert "call/jmp *foo@GOT[(%reg)]".  */
-           goto convert_branch;
-         else
-           /* Convert "mov foo@GOT[(%reg1)], %reg2",
-              "test %reg1, foo@GOT(%reg2)" and
-              "binop foo@GOT[(%reg1)], %reg2". */
-           goto convert_load;
-       }
-
-      indx = r_symndx - symtab_hdr->sh_info;
-      h = elf_sym_hashes (abfd)[indx];
-      BFD_ASSERT (h != NULL);
-
-      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;
-
-      /* STT_GNU_IFUNC must keep GOT32 relocations.  */
-      if (h->type == STT_GNU_IFUNC)
-       continue;
-
-      if (opcode == 0xff)
-       {
-         /* We have "call/jmp *foo@GOT[(%reg)]".  */
-         if ((h->root.type == bfd_link_hash_defined
-              || h->root.type == bfd_link_hash_defweak)
-             && SYMBOL_REFERENCES_LOCAL (link_info, h))
-           {
-             /* The function is locally defined.   */
-convert_branch:
-             addend = bfd_get_32 (abfd, contents + roff);
-             /* Addend for R_386_GOT32X relocation must be 0.  */
-             if (addend != 0)
-               continue;
-
-             /* Convert R_386_GOT32X to R_386_PC32.  */
-             if (modrm == 0x15 || (modrm & 0xf8) == 0x90)
-               {
-                 /* Convert to "nop call foo".  ADDR_PREFIX_OPCODE
-                    is a nop prefix.  */
-                 modrm = 0xe8;
-                 nop = link_info->call_nop_byte;
-                 if (link_info->call_nop_as_suffix)
-                   {
-                     nop_offset = roff + 3;
-                     irel->r_offset -= 1;
-                   }
-                 else
-                   nop_offset = roff - 2;
-               }
-             else
-               {
-                 /* Convert to "jmp foo nop".  */
-                 modrm = 0xe9;
-                 nop = NOP_OPCODE;
-                 nop_offset = roff + 3;
-                 irel->r_offset -= 1;
-               }
-
-             bfd_put_8 (abfd, nop, contents + nop_offset);
-             bfd_put_8 (abfd, modrm, contents + irel->r_offset - 1);
-             /* When converting to PC-relative relocation, we
-                need to adjust addend by -4.  */
-             bfd_put_32 (abfd, -4, contents + irel->r_offset);
-             irel->r_info = ELF32_R_INFO (r_symndx, R_386_PC32);
-
-             if (h)
-               {
-                 if (h->got.refcount > 0)
-                   h->got.refcount -= 1;
-               }
-             else
-               {
-                 if (local_got_refcounts != NULL
-                     && local_got_refcounts[r_symndx] > 0)
-                   local_got_refcounts[r_symndx] -= 1;
-               }
-
-             changed_contents = TRUE;
-             changed_relocs = TRUE;
-           }
-       }
-      else
-       {
-         /* We have "mov foo@GOT[(%re1g)], %reg2",
-            "test %reg1, foo@GOT(%reg2)" and
-            "binop foo@GOT[(%reg1)], %reg2".
-
-            Avoid optimizing _DYNAMIC since ld.so may use its
-            link-time address.  */
-         if (h == htab->elf.hdynamic)
-           continue;
-
-         /* bfd_link_hash_new is set by an assignment in a linker
-            script in bfd_elf_record_link_assignment.  */
-         if ((h->root.type == bfd_link_hash_defined
-              || h->root.type == bfd_link_hash_defweak
-              || h->root.type == bfd_link_hash_new)
-             && SYMBOL_REFERENCES_LOCAL (link_info, h))
-           {
-convert_load:
-             if (opcode == 0x8b)
-               {
-                 /* Convert "mov foo@GOT(%reg1), %reg2" to
-                    "lea foo@GOTOFF(%reg1), %reg2".  */
-                 if (r_type == R_386_GOT32X
-                     && (baseless || !bfd_link_pic (link_info)))
-                   {
-                     r_type = R_386_32;
-                     /* For R_386_32, convert
-                        "lea foo@GOTOFF(%reg1), %reg2" to
-                        "lea foo@GOT, %reg2".  */
-                     if (!baseless)
-                       {
-                         modrm = 0x5 | (modrm & 0x38);
-                         bfd_put_8 (abfd, modrm, contents + roff - 1);
-                       }
-                   }
-                 else
-                   r_type = R_386_GOTOFF;
-                 opcode = 0x8d;
-               }
-             else
-               {
-                 /* Addend for R_386_GOT32X relocation must be 0.  */
-                 addend = bfd_get_32 (abfd, contents + roff);
-                 if (addend != 0)
-                   continue;
-
-                 if (opcode == 0x85)
-                   {
-                     /* Convert "test %reg1, foo@GOT(%reg2)" to
-                        "test $foo, %reg1".  */
-                     modrm = 0xc0 | (modrm & 0x38) >> 3;
-                     opcode = 0xf7;
-                   }
-                 else
-                   {
-                     /* Convert "binop foo@GOT(%reg1), %reg2" to
-                        "binop $foo, %reg2".  */
-                     modrm = (0xc0
-                              | (modrm & 0x38) >> 3
-                              | (opcode & 0x3c));
-                     opcode = 0x81;
-                   }
-                 bfd_put_8 (abfd, modrm, contents + roff - 1);
-                 r_type = R_386_32;
-               }
-
-             bfd_put_8 (abfd, opcode, contents + roff - 2);
-             irel->r_info = ELF32_R_INFO (r_symndx, r_type);
-
-             if (h)
-               {
-                 if (h->got.refcount > 0)
-                   h->got.refcount -= 1;
-               }
-             else
-               {
-                 if (local_got_refcounts != NULL
-                     && local_got_refcounts[r_symndx] > 0)
-                   local_got_refcounts[r_symndx] -= 1;
-               }
-
-             changed_contents = TRUE;
-             changed_relocs = TRUE;
-           }
-       }
-    }
-
-  if (contents != NULL
-      && elf_section_data (sec)->this_hdr.contents != contents)
-    {
-      if (!changed_contents && !link_info->keep_memory)
-       free (contents);
-      else
-       {
-         /* Cache the section contents for elf_link_input_bfd.  */
-         elf_section_data (sec)->this_hdr.contents = contents;
-       }
-    }
-
-  if (elf_section_data (sec)->relocs != internal_relocs)
-    {
-      if (!changed_relocs)
-       free (internal_relocs);
-      else
-       elf_section_data (sec)->relocs = internal_relocs;
-    }
-
-  return TRUE;
-
- error_return:
-  if (contents != NULL
-      && elf_section_data (sec)->this_hdr.contents != contents)
-    free (contents);
-  if (internal_relocs != NULL
-      && elf_section_data (sec)->relocs != internal_relocs)
-    free (internal_relocs);
-  return FALSE;
-}
-
-/* Set the sizes of the dynamic sections.  */
-
-static bfd_boolean
-elf_i386_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
-{
-  struct elf_i386_link_hash_table *htab;
-  bfd *dynobj;
-  asection *s;
-  bfd_boolean relocs;
-  bfd *ibfd;
-
-  htab = elf_i386_hash_table (info);
-  if (htab == NULL)
-    return FALSE;
-  dynobj = htab->elf.dynobj;
-  if (dynobj == NULL)
-    abort ();
-
-  if (htab->elf.dynamic_sections_created)
-    {
-      /* Set the contents of the .interp section to the interpreter.  */
-      if (bfd_link_executable (info) && !info->nointerp)
-       {
-         s = bfd_get_linker_section (dynobj, ".interp");
-         if (s == NULL)
-           abort ();
-         s->size = sizeof ELF_DYNAMIC_INTERPRETER;
-         s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
-       }
-    }
-
-  /* Set up .got offsets for local syms, and space for local dynamic
-     relocs.  */
-  for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link.next)
-    {
-      bfd_signed_vma *local_got;
-      bfd_signed_vma *end_local_got;
-      char *local_tls_type;
-      bfd_vma *local_tlsdesc_gotent;
-      bfd_size_type locsymcount;
-      Elf_Internal_Shdr *symtab_hdr;
-      asection *srel;
-
-      if (! is_i386_elf (ibfd))
-       continue;
-
-      for (s = ibfd->sections; s != NULL; s = s->next)
-       {
-         struct elf_dyn_relocs *p;
-
-         if (!elf_i386_convert_load (ibfd, s, info))
-           return FALSE;
-
-         for (p = ((struct elf_dyn_relocs *)
-                    elf_section_data (s)->local_dynrel);
-              p != NULL;
-              p = p->next)
-           {
-             if (!bfd_is_abs_section (p->sec)
-                 && bfd_is_abs_section (p->sec->output_section))
-               {
-                 /* Input section has been discarded, either because
-                    it is a copy of a linkonce section or due to
-                    linker script /DISCARD/, so we'll be discarding
-                    the relocs too.  */
-               }
-             else if (get_elf_i386_backend_data (output_bfd)->is_vxworks
-                      && strcmp (p->sec->output_section->name,
-                                 ".tls_vars") == 0)
-               {
-                 /* Relocations in vxworks .tls_vars sections are
-                    handled specially by the loader.  */
-               }
-             else if (p->count != 0)
-               {
-                 srel = elf_section_data (p->sec)->sreloc;
-                 srel->size += p->count * sizeof (Elf32_External_Rel);
-                 if ((p->sec->output_section->flags & SEC_READONLY) != 0
-                     && (info->flags & DF_TEXTREL) == 0)
-                   {
-                     info->flags |= DF_TEXTREL;
-                     if ((info->warn_shared_textrel && bfd_link_pic (info))
-                         || info->error_textrel)
-                       info->callbacks->einfo (_("%P: %B: warning: relocation in readonly section `%A'\n"),
-                                               p->sec->owner, p->sec);
-                   }
-               }
-           }
-       }
-
-      local_got = elf_local_got_refcounts (ibfd);
-      if (!local_got)
-       continue;
-
-      symtab_hdr = &elf_symtab_hdr (ibfd);
-      locsymcount = symtab_hdr->sh_info;
-      end_local_got = local_got + locsymcount;
-      local_tls_type = elf_i386_local_got_tls_type (ibfd);
-      local_tlsdesc_gotent = elf_i386_local_tlsdesc_gotent (ibfd);
-      s = htab->elf.sgot;
-      srel = htab->elf.srelgot;
-      for (; local_got < end_local_got;
-          ++local_got, ++local_tls_type, ++local_tlsdesc_gotent)
-       {
-         *local_tlsdesc_gotent = (bfd_vma) -1;
-         if (*local_got > 0)
-           {
-             if (GOT_TLS_GDESC_P (*local_tls_type))
-               {
-                 *local_tlsdesc_gotent = htab->elf.sgotplt->size
-                   - elf_i386_compute_jump_table_size (htab);
-                 htab->elf.sgotplt->size += 8;
-                 *local_got = (bfd_vma) -2;
-               }
-             if (! GOT_TLS_GDESC_P (*local_tls_type)
-                 || GOT_TLS_GD_P (*local_tls_type))
-               {
-                 *local_got = s->size;
-                 s->size += 4;
-                 if (GOT_TLS_GD_P (*local_tls_type)
-                     || *local_tls_type == GOT_TLS_IE_BOTH)
-                   s->size += 4;
-               }
-             if (bfd_link_pic (info)
-                 || GOT_TLS_GD_ANY_P (*local_tls_type)
-                 || (*local_tls_type & GOT_TLS_IE))
-               {
-                 if (*local_tls_type == GOT_TLS_IE_BOTH)
-                   srel->size += 2 * sizeof (Elf32_External_Rel);
-                 else if (GOT_TLS_GD_P (*local_tls_type)
-                          || ! GOT_TLS_GDESC_P (*local_tls_type))
-                   srel->size += sizeof (Elf32_External_Rel);
-                 if (GOT_TLS_GDESC_P (*local_tls_type))
-                   htab->elf.srelplt->size += sizeof (Elf32_External_Rel);
-               }
-           }
-         else
-           *local_got = (bfd_vma) -1;
-       }
-    }
-
-  if (htab->tls_ldm_got.refcount > 0)
-    {
-      /* Allocate 2 got entries and 1 dynamic reloc for R_386_TLS_LDM
-        relocs.  */
-      htab->tls_ldm_got.offset = htab->elf.sgot->size;
-      htab->elf.sgot->size += 8;
-      htab->elf.srelgot->size += sizeof (Elf32_External_Rel);
-    }
-  else
-    htab->tls_ldm_got.offset = -1;
-
-  /* Allocate global sym .plt and .got entries, and space for global
-     sym dynamic relocs.  */
-  elf_link_hash_traverse (&htab->elf, elf_i386_allocate_dynrelocs, info);
-
-  /* Allocate .plt and .got entries, and space for local symbols.  */
-  htab_traverse (htab->loc_hash_table,
-                elf_i386_allocate_local_dynrelocs,
-                info);
-
-  /* For every jump slot reserved in the sgotplt, reloc_count is
-     incremented.  However, when we reserve space for TLS descriptors,
-     it's not incremented, so in order to compute the space reserved
-     for them, it suffices to multiply the reloc count by the jump
-     slot size.
-
-     PR ld/13302: We start next_irelative_index at the end of .rela.plt
-     so that R_386_IRELATIVE entries come last.  */
-  if (htab->elf.srelplt)
-    {
-      htab->next_tls_desc_index = htab->elf.srelplt->reloc_count;
-      htab->sgotplt_jump_table_size = htab->next_tls_desc_index * 4;
-      htab->next_irelative_index = htab->elf.srelplt->reloc_count - 1;
-    }
-  else if (htab->elf.irelplt)
-    htab->next_irelative_index = htab->elf.irelplt->reloc_count - 1;
-
-
-  if (htab->elf.sgotplt)
-    {
-      /* Don't allocate .got.plt section if there are no GOT nor PLT
-         entries and there is no reference to _GLOBAL_OFFSET_TABLE_.  */
-      if ((htab->elf.hgot == NULL
-          || !htab->elf.hgot->ref_regular_nonweak)
-         && (htab->elf.sgotplt->size
-             == get_elf_backend_data (output_bfd)->got_header_size)
-         && (htab->elf.splt == NULL
-             || htab->elf.splt->size == 0)
-         && (htab->elf.sgot == NULL
-             || htab->elf.sgot->size == 0)
-         && (htab->elf.iplt == NULL
-             || htab->elf.iplt->size == 0)
-         && (htab->elf.igotplt == NULL
-             || htab->elf.igotplt->size == 0))
-       htab->elf.sgotplt->size = 0;
-    }
-
-
-  if (htab->plt_eh_frame != NULL
-      && htab->elf.splt != NULL
-      && htab->elf.splt->size != 0
-      && !bfd_is_abs_section (htab->elf.splt->output_section)
-      && _bfd_elf_eh_frame_present (info))
-    htab->plt_eh_frame->size = sizeof (elf_i386_eh_frame_plt);
-
-  /* We now have determined the sizes of the various dynamic sections.
-     Allocate memory for them.  */
-  relocs = FALSE;
-  for (s = dynobj->sections; s != NULL; s = s->next)
-    {
-      bfd_boolean strip_section = TRUE;
-
-      if ((s->flags & SEC_LINKER_CREATED) == 0)
-       continue;
-
-      if (s == htab->elf.splt
-         || s == htab->elf.sgot)
-       {
-         /* Strip this section if we don't need it; see the
-            comment below.  */
-         /* We'd like to strip these sections if they aren't needed, but if
-            we've exported dynamic symbols from them we must leave them.
-            It's too late to tell BFD to get rid of the symbols.  */
-
-         if (htab->elf.hplt != NULL)
-           strip_section = FALSE;
-       }
-      else if (s == htab->elf.sgotplt
-              || s == htab->elf.iplt
-              || s == htab->elf.igotplt
-              || s == htab->plt_got
-              || s == htab->plt_eh_frame
-              || s == htab->sdynbss)
-       {
-         /* Strip these too.  */
-       }
-      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rel"))
-       {
-         if (s->size != 0
-             && s != htab->elf.srelplt
-             && s != htab->srelplt2)
-           relocs = TRUE;
-
-         /* We use the reloc_count field as a counter if we need
-            to copy relocs into the output file.  */
-         s->reloc_count = 0;
-       }
-      else
-       {
-         /* It's not one of our sections, so don't allocate space.  */
-         continue;
-       }
-
-      if (s->size == 0)
-       {
-         /* If we don't need this section, strip it from the
-            output file.  This is mostly to handle .rel.bss and
-            .rel.plt.  We must create both sections in
-            create_dynamic_sections, because they must be created
-            before the linker maps input sections to output
-            sections.  The linker does that before
-            adjust_dynamic_symbol is called, and it is that
-            function which decides whether anything needs to go
-            into these sections.  */
-         if (strip_section)
-           s->flags |= SEC_EXCLUDE;
-         continue;
-       }
-
-      if ((s->flags & SEC_HAS_CONTENTS) == 0)
-       continue;
-
-      /* 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,
-        but this way if it does, we get a R_386_NONE reloc instead
-        of garbage.  */
-      s->contents = (unsigned char *) bfd_zalloc (dynobj, s->size);
-      if (s->contents == NULL)
-       return FALSE;
-    }
-
-  if (htab->plt_eh_frame != NULL
-      && htab->plt_eh_frame->contents != NULL)
-    {
-      memcpy (htab->plt_eh_frame->contents, elf_i386_eh_frame_plt,
-             sizeof (elf_i386_eh_frame_plt));
-      bfd_put_32 (dynobj, htab->elf.splt->size,
-                 htab->plt_eh_frame->contents + PLT_FDE_LEN_OFFSET);
-    }
-
-  if (htab->elf.dynamic_sections_created)
-    {
-      /* Add some entries to the .dynamic section.  We fill in the
-        values later, in elf_i386_finish_dynamic_sections, but we
-        must add the entries now so that we get the correct size for
-        the .dynamic section.  The DT_DEBUG entry is filled in by the
-        dynamic linker and used by the debugger.  */
-#define add_dynamic_entry(TAG, VAL) \
-  _bfd_elf_add_dynamic_entry (info, TAG, VAL)
-
-      if (bfd_link_executable (info))
-       {
-         if (!add_dynamic_entry (DT_DEBUG, 0))
-           return FALSE;
-       }
-
-      if (htab->elf.splt->size != 0)
-       {
-         /* DT_PLTGOT is used by prelink even if there is no PLT
-            relocation.  */
-         if (!add_dynamic_entry (DT_PLTGOT, 0))
-           return FALSE;
-
-         if (htab->elf.srelplt->size != 0)
-           {
-             if (!add_dynamic_entry (DT_PLTRELSZ, 0)
-                 || !add_dynamic_entry (DT_PLTREL, DT_REL)
-                 || !add_dynamic_entry (DT_JMPREL, 0))
-               return FALSE;
-           }
-       }
-
-      if (relocs)
-       {
-         if (!add_dynamic_entry (DT_REL, 0)
-             || !add_dynamic_entry (DT_RELSZ, 0)
-             || !add_dynamic_entry (DT_RELENT, sizeof (Elf32_External_Rel)))
-           return FALSE;
-
-         /* If any dynamic relocs apply to a read-only section,
-            then we need a DT_TEXTREL entry.  */
-         if ((info->flags & DF_TEXTREL) == 0)
-           elf_link_hash_traverse (&htab->elf,
-                                   elf_i386_readonly_dynrelocs, info);
-
-         if ((info->flags & DF_TEXTREL) != 0)
-           {
-             if ((elf_tdata (output_bfd)->has_gnu_symbols
-                  & elf_gnu_symbol_ifunc) == elf_gnu_symbol_ifunc)
-               {
-                 info->callbacks->einfo
-                   (_("%P%X: read-only segment has dynamic IFUNC relocations; recompile with -fPIC\n"));
-                 bfd_set_error (bfd_error_bad_value);
-                 return FALSE;
-               }
-
-             if (!add_dynamic_entry (DT_TEXTREL, 0))
-               return FALSE;
-           }
-       }
-      if (get_elf_i386_backend_data (output_bfd)->is_vxworks
-         && !elf_vxworks_add_dynamic_entries (output_bfd, info))
-       return FALSE;
-    }
-#undef add_dynamic_entry
-
-  return TRUE;
-}
-
-static bfd_boolean
-elf_i386_always_size_sections (bfd *output_bfd,
-                              struct bfd_link_info *info)
-{
-  asection *tls_sec = elf_hash_table (info)->tls_sec;
-
-  if (tls_sec)
-    {
-      struct elf_link_hash_entry *tlsbase;
-
-      tlsbase = elf_link_hash_lookup (elf_hash_table (info),
-                                     "_TLS_MODULE_BASE_",
-                                     FALSE, FALSE, FALSE);
-
-      if (tlsbase && tlsbase->type == STT_TLS)
-       {
-         struct elf_i386_link_hash_table *htab;
-         struct bfd_link_hash_entry *bh = NULL;
-         const struct elf_backend_data *bed
-           = get_elf_backend_data (output_bfd);
-
-         htab = elf_i386_hash_table (info);
-         if (htab == NULL)
-           return FALSE;
-
-         if (!(_bfd_generic_link_add_one_symbol
-               (info, output_bfd, "_TLS_MODULE_BASE_", BSF_LOCAL,
-                tls_sec, 0, NULL, FALSE,
-                bed->collect, &bh)))
-           return FALSE;
-
-         htab->tls_module_base = bh;
-
-         tlsbase = (struct elf_link_hash_entry *)bh;
-         tlsbase->def_regular = 1;
-         tlsbase->other = STV_HIDDEN;
-         tlsbase->root.linker_def = 1;
-         (*bed->elf_backend_hide_symbol) (info, tlsbase, TRUE);
-       }
-    }
-
-  return TRUE;
-}
-
-/* Set the correct type for an x86 ELF section.  We do this by the
-   section name, which is a hack, but ought to work.  */
-
-static bfd_boolean
-elf_i386_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
-                       Elf_Internal_Shdr *hdr,
-                       asection *sec)
-{
-  const char *name;
-
-  name = bfd_get_section_name (abfd, sec);
+  name = bfd_section_name (sec);
 
   /* This is an ugly, but unfortunately necessary hack that is
      needed when producing EFI binaries on x86. It tells
 
   /* This is an ugly, but unfortunately necessary hack that is
      needed when producing EFI binaries on x86. It tells
@@ -3518,48 +1966,10 @@ elf_i386_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
      the kind of ugly side-effects you get when detecting section
      types based on their names...  In practice, this limitation is
      unlikely to bite.  */
      the kind of ugly side-effects you get when detecting section
      types based on their names...  In practice, this limitation is
      unlikely to bite.  */
-  if (strcmp (name, ".reloc") == 0)
-    hdr->sh_type = SHT_PROGBITS;
-
-  return TRUE;
-}
-
-/* _TLS_MODULE_BASE_ needs to be treated especially when linking
-   executables.  Rather than setting it to the beginning of the TLS
-   section, we have to set it to the end.    This function may be called
-   multiple times, it is idempotent.  */
-
-static void
-elf_i386_set_tls_module_base (struct bfd_link_info *info)
-{
-  struct elf_i386_link_hash_table *htab;
-  struct bfd_link_hash_entry *base;
-
-  if (!bfd_link_executable (info))
-    return;
-
-  htab = elf_i386_hash_table (info);
-  if (htab == NULL)
-    return;
-
-  base = htab->tls_module_base;
-  if (base == NULL)
-    return;
-
-  base->u.def.value = htab->elf.tls_size;
-}
-
-/* Return the base VMA address which should be subtracted from real addresses
-   when resolving @dtpoff relocation.
-   This is PT_TLS segment p_vaddr.  */
-
-static bfd_vma
-elf_i386_dtpoff_base (struct bfd_link_info *info)
-{
-  /* If tls_sec is NULL, we should have signalled an error already.  */
-  if (elf_hash_table (info)->tls_sec == NULL)
-    return 0;
-  return elf_hash_table (info)->tls_sec->vma;
+  if (strcmp (name, ".reloc") == 0)
+    hdr->sh_type = SHT_PROGBITS;
+
+  return TRUE;
 }
 
 /* Return the relocation value for @tpoff relocation
 }
 
 /* Return the relocation value for @tpoff relocation
@@ -3593,45 +2003,55 @@ elf_i386_relocate_section (bfd *output_bfd,
                           Elf_Internal_Sym *local_syms,
                           asection **local_sections)
 {
                           Elf_Internal_Sym *local_syms,
                           asection **local_sections)
 {
-  struct elf_i386_link_hash_table *htab;
+  struct elf_x86_link_hash_table *htab;
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   bfd_vma *local_got_offsets;
   bfd_vma *local_tlsdesc_gotents;
   Elf_Internal_Rela *rel;
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   bfd_vma *local_got_offsets;
   bfd_vma *local_tlsdesc_gotents;
   Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *wrel;
   Elf_Internal_Rela *relend;
   bfd_boolean is_vxworks_tls;
   unsigned plt_entry_size;
 
   Elf_Internal_Rela *relend;
   bfd_boolean is_vxworks_tls;
   unsigned plt_entry_size;
 
-  BFD_ASSERT (is_i386_elf (input_bfd));
+  /* Skip if check_relocs failed.  */
+  if (input_section->check_relocs_failed)
+    return FALSE;
 
 
-  htab = elf_i386_hash_table (info);
+  htab = elf_x86_hash_table (info, I386_ELF_DATA);
   if (htab == NULL)
     return FALSE;
   if (htab == NULL)
     return FALSE;
+
+  if (!is_x86_elf (input_bfd, htab))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
+    }
+
   symtab_hdr = &elf_symtab_hdr (input_bfd);
   sym_hashes = elf_sym_hashes (input_bfd);
   local_got_offsets = elf_local_got_offsets (input_bfd);
   symtab_hdr = &elf_symtab_hdr (input_bfd);
   sym_hashes = elf_sym_hashes (input_bfd);
   local_got_offsets = elf_local_got_offsets (input_bfd);
-  local_tlsdesc_gotents = elf_i386_local_tlsdesc_gotent (input_bfd);
+  local_tlsdesc_gotents = elf_x86_local_tlsdesc_gotent (input_bfd);
   /* We have to handle relocations in vxworks .tls_vars sections
      specially, because the dynamic loader is 'weird'.  */
   /* We have to handle relocations in vxworks .tls_vars sections
      specially, because the dynamic loader is 'weird'.  */
-  is_vxworks_tls = (get_elf_i386_backend_data (output_bfd)->is_vxworks
-                    && bfd_link_pic (info)
+  is_vxworks_tls = (htab->target_os == is_vxworks
+                   && bfd_link_pic (info)
                    && !strcmp (input_section->output_section->name,
                                ".tls_vars"));
 
                    && !strcmp (input_section->output_section->name,
                                ".tls_vars"));
 
-  elf_i386_set_tls_module_base (info);
+  _bfd_x86_elf_set_tls_module_base (info);
 
 
-  plt_entry_size = GET_PLT_ENTRY_SIZE (output_bfd);
+  plt_entry_size = htab->plt.plt_entry_size;
 
 
-  rel = relocs;
+  rel = wrel = relocs;
   relend = relocs + input_section->reloc_count;
   relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
+  for (; rel < relend; wrel++, rel++)
     {
     {
-      unsigned int r_type;
+      unsigned int r_type, r_type_tls;
       reloc_howto_type *howto;
       unsigned long r_symndx;
       struct elf_link_hash_entry *h;
       reloc_howto_type *howto;
       unsigned long r_symndx;
       struct elf_link_hash_entry *h;
-      struct elf_i386_link_hash_entry *eh;
+      struct elf_x86_link_hash_entry *eh;
       Elf_Internal_Sym *sym;
       asection *sec;
       bfd_vma off, offplt, plt_offset;
       Elf_Internal_Sym *sym;
       asection *sec;
       bfd_vma off, offplt, plt_offset;
@@ -3642,25 +2062,21 @@ elf_i386_relocate_section (bfd *output_bfd,
       int tls_type;
       bfd_vma st_size;
       asection *resolved_plt;
       int tls_type;
       bfd_vma st_size;
       asection *resolved_plt;
+      bfd_boolean resolved_to_zero;
+      bfd_boolean relative_reloc;
 
       r_type = ELF32_R_TYPE (rel->r_info);
       if (r_type == R_386_GNU_VTINHERIT
          || r_type == R_386_GNU_VTENTRY)
 
       r_type = ELF32_R_TYPE (rel->r_info);
       if (r_type == R_386_GNU_VTINHERIT
          || r_type == R_386_GNU_VTENTRY)
-       continue;
-
-      if ((indx = r_type) >= R_386_standard
-         && ((indx = r_type - R_386_ext_offset) - R_386_standard
-             >= R_386_ext - R_386_standard)
-         && ((indx = r_type - R_386_tls_offset) - R_386_ext
-             >= R_386_ext2 - R_386_ext))
        {
        {
-         (*_bfd_error_handler)
-           (_("%B: unrecognized relocation (0x%x) in section `%A'"),
-            input_bfd, input_section, r_type);
-         bfd_set_error (bfd_error_bad_value);
-         return FALSE;
+         if (wrel != rel)
+           *wrel = *rel;
+         continue;
        }
        }
-      howto = elf_howto_table + indx;
+
+      howto = elf_i386_rtype_to_howto (r_type);
+      if (howto == NULL)
+       return _bfd_unrecognized_reloc (input_bfd, input_section, r_type);
 
       r_symndx = ELF32_R_SYM (rel->r_info);
       h = NULL;
 
       r_symndx = ELF32_R_SYM (rel->r_info);
       h = NULL;
@@ -3749,8 +2165,8 @@ elf_i386_relocate_section (bfd *output_bfd,
                   && ELF32_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
            {
              /* Relocate against local STT_GNU_IFUNC symbol.  */
                   && ELF32_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
            {
              /* Relocate against local STT_GNU_IFUNC symbol.  */
-             h = elf_i386_get_local_sym_hash (htab, input_bfd, rel,
-                                              FALSE);
+             h = _bfd_elf_x86_get_local_sym_hash (htab, input_bfd, rel,
+                                                  FALSE);
              if (h == NULL)
                abort ();
 
              if (h == NULL)
                abort ();
 
@@ -3772,11 +2188,31 @@ elf_i386_relocate_section (bfd *output_bfd,
        }
 
       if (sec != NULL && discarded_section (sec))
        }
 
       if (sec != NULL && discarded_section (sec))
-       RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
-                                        rel, 1, relend, howto, 0, contents);
+       {
+         _bfd_clear_contents (howto, input_bfd, input_section,
+                              contents, rel->r_offset);
+         wrel->r_offset = rel->r_offset;
+         wrel->r_info = 0;
+         wrel->r_addend = 0;
+
+         /* For ld -r, remove relocations in debug sections against
+            sections defined in discarded sections.  Not done for
+            eh_frame editing code expects to be present.  */
+          if (bfd_link_relocatable (info)
+              && (input_section->flags & SEC_DEBUGGING))
+            wrel--;
+
+          continue;
+       }
 
       if (bfd_link_relocatable (info))
 
       if (bfd_link_relocatable (info))
-       continue;
+       {
+         if (wrel != rel)
+           *wrel = *rel;
+         continue;
+       }
+
+      eh = (struct elf_x86_link_hash_entry *) h;
 
       /* Since STT_GNU_IFUNC symbol must go through PLT, we handle
         it here if it is defined in a non-shared object.  */
 
       /* Since STT_GNU_IFUNC symbol must go through PLT, we handle
         it here if it is defined in a non-shared object.  */
@@ -3784,12 +2220,16 @@ elf_i386_relocate_section (bfd *output_bfd,
          && h->type == STT_GNU_IFUNC
          && h->def_regular)
        {
          && h->type == STT_GNU_IFUNC
          && h->def_regular)
        {
-         asection *plt, *gotplt, *base_got;
+         asection *gotplt, *base_got;
          bfd_vma plt_index;
          const char *name;
 
          if ((input_section->flags & SEC_ALLOC) == 0)
            {
          bfd_vma plt_index;
          const char *name;
 
          if ((input_section->flags & SEC_ALLOC) == 0)
            {
+             /* If this is a SHT_NOTE section without SHF_ALLOC, treat
+                STT_GNU_IFUNC symbol as STT_FUNC.  */
+             if (elf_section_type (input_section) == SHT_NOTE)
+               goto skip_ifunc;
              /* Dynamic relocs are not propagated for SEC_DEBUGGING
                 sections because such sections are not SEC_ALLOC and
                 thus ld.so will not process them.  */
              /* Dynamic relocs are not propagated for SEC_DEBUGGING
                 sections because such sections are not SEC_ALLOC and
                 thus ld.so will not process them.  */
@@ -3797,92 +2237,33 @@ elf_i386_relocate_section (bfd *output_bfd,
                continue;
              abort ();
            }
                continue;
              abort ();
            }
-         else if (h->plt.offset == (bfd_vma) -1)
-           abort ();
 
          /* STT_GNU_IFUNC symbol must go through PLT.  */
          if (htab->elf.splt != NULL)
            {
 
          /* STT_GNU_IFUNC symbol must go through PLT.  */
          if (htab->elf.splt != NULL)
            {
-             plt = htab->elf.splt;
+             if (htab->plt_second != NULL)
+               {
+                 resolved_plt = htab->plt_second;
+                 plt_offset = eh->plt_second.offset;
+               }
+             else
+               {
+                 resolved_plt = htab->elf.splt;
+                 plt_offset = h->plt.offset;
+               }
              gotplt = htab->elf.sgotplt;
            }
          else
            {
              gotplt = htab->elf.sgotplt;
            }
          else
            {
-             plt = htab->elf.iplt;
+             resolved_plt = htab->elf.iplt;
+             plt_offset = h->plt.offset;
              gotplt = htab->elf.igotplt;
            }
 
              gotplt = htab->elf.igotplt;
            }
 
-         relocation = (plt->output_section->vma
-                       + plt->output_offset + h->plt.offset);
-
          switch (r_type)
            {
            default:
          switch (r_type)
            {
            default:
-             if (h->root.root.string)
-               name = h->root.root.string;
-             else
-               name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
-                                        NULL);
-             (*_bfd_error_handler)
-               (_("%B: relocation %s against STT_GNU_IFUNC "
-                  "symbol `%s' isn't handled by %s"), input_bfd,
-                elf_howto_table[r_type].name,
-                name, __FUNCTION__);
-             bfd_set_error (bfd_error_bad_value);
-             return FALSE;
-
-           case R_386_32:
-             /* Generate dynamic relcoation only when there is a
-                non-GOT reference in a shared object.  */
-             if (bfd_link_pic (info) && h->non_got_ref)
-               {
-                 Elf_Internal_Rela outrel;
-                 asection *sreloc;
-                 bfd_vma offset;
-
-                 /* Need a dynamic relocation to get the real function
-                    adddress.  */
-                 offset = _bfd_elf_section_offset (output_bfd,
-                                                   info,
-                                                   input_section,
-                                                   rel->r_offset);
-                 if (offset == (bfd_vma) -1
-                     || offset == (bfd_vma) -2)
-                   abort ();
-
-                 outrel.r_offset = (input_section->output_section->vma
-                                    + input_section->output_offset
-                                    + offset);
-
-                 if (h->dynindx == -1
-                     || h->forced_local
-                     || bfd_link_executable (info))
-                   {
-                     /* This symbol is resolved locally.  */
-                     outrel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);
-                     bfd_put_32 (output_bfd,
-                                 (h->root.u.def.value
-                                  + h->root.u.def.section->output_section->vma
-                                  + h->root.u.def.section->output_offset),
-                                 contents + offset);
-                   }
-                 else
-                   outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
-
-                 sreloc = htab->elf.irelifunc;
-                 elf_append_rel (output_bfd, sreloc, &outrel);
-
-                 /* If this reloc is against an external symbol, we
-                    do not want to fiddle with the addend.  Otherwise,
-                    we need to include the symbol value so that it
-                    becomes an addend for the dynamic reloc.  For an
-                    internal symbol, we have updated addend.  */
-                 continue;
-               }
-             /* FALLTHROUGH */
-           case R_386_PC32:
-           case R_386_PLT32:
-             goto do_relocation;
+             break;
 
            case R_386_GOT32:
            case R_386_GOT32X:
 
            case R_386_GOT32:
            case R_386_GOT32X:
@@ -3898,9 +2279,13 @@ elf_i386_relocate_section (bfd *output_bfd,
                     even just remember the offset, as finish_dynamic_symbol
                     would use that as offset into .got.  */
 
                     even just remember the offset, as finish_dynamic_symbol
                     would use that as offset into .got.  */
 
+                 if (h->plt.offset == (bfd_vma) -1)
+                   abort ();
+
                  if (htab->elf.splt != NULL)
                    {
                  if (htab->elf.splt != NULL)
                    {
-                     plt_index = h->plt.offset / plt_entry_size - 1;
+                     plt_index = (h->plt.offset / plt_entry_size
+                                  - htab->plt.has_plt0);
                      off = (plt_index + 3) * 4;
                      base_got = htab->elf.sgotplt;
                    }
                      off = (plt_index + 3) * 4;
                      base_got = htab->elf.sgotplt;
                    }
@@ -3935,116 +2320,158 @@ elf_i386_relocate_section (bfd *output_bfd,
                    }
 
                  relocation = off;
                    }
 
                  relocation = off;
-
-                 /* Adjust for static executables.  */
-                 if (htab->elf.splt == NULL)
-                   relocation += gotplt->output_offset;
                }
              else
                }
              else
+               relocation = (base_got->output_section->vma
+                             + base_got->output_offset + off
+                             - gotplt->output_section->vma
+                             - gotplt->output_offset);
+
+             if (rel->r_offset > 1
+                 && (*(contents + rel->r_offset - 1) & 0xc7) == 0x5
+                 && *(contents + rel->r_offset - 2) != 0x8d)
+               {
+                 if (bfd_link_pic (info))
+                   goto disallow_got32;
+
+                 /* Add the GOT base if there is no base register.  */
+                 relocation += (gotplt->output_section->vma
+                                + gotplt->output_offset);
+               }
+             else if (htab->elf.splt == NULL)
                {
                {
-                 relocation = (base_got->output_section->vma
-                               + base_got->output_offset + off
-                               - gotplt->output_section->vma
-                               - gotplt->output_offset);
                  /* Adjust for static executables.  */
                  /* Adjust for static executables.  */
-                 if (htab->elf.splt == NULL)
-                   relocation += gotplt->output_offset;
+                 relocation += gotplt->output_offset;
                }
 
              goto do_relocation;
                }
 
              goto do_relocation;
+           }
 
 
-           case R_386_GOTOFF:
-             relocation -= (gotplt->output_section->vma
-                            + gotplt->output_offset);
-             goto do_relocation;
+         if (h->plt.offset == (bfd_vma) -1)
+           {
+             /* Handle static pointers of STT_GNU_IFUNC symbols.  */
+             if (r_type == R_386_32
+                 && (input_section->flags & SEC_CODE) == 0)
+               goto do_ifunc_pointer;
+             goto bad_ifunc_reloc;
            }
            }
-       }
 
 
-      eh = (struct elf_i386_link_hash_entry *) h;
-      switch (r_type)
-       {
-       case R_386_GOT32X:
-         /* Avoid optimizing _DYNAMIC since ld.so may use its
-            link-time address.  */
-         if (h == htab->elf.hdynamic)
-           goto r_386_got32;
+         relocation = (resolved_plt->output_section->vma
+                       + resolved_plt->output_offset + plt_offset);
 
 
-         if (bfd_link_pic (info))
+         switch (r_type)
            {
            {
-             /* It is OK to convert mov to lea and convert indirect
-                branch to direct branch.  It is OK to convert adc,
-                add, and, cmp, or, sbb, sub, test, xor only when PIC
-                is false.   */
-             unsigned int opcode;
-             opcode = bfd_get_8 (abfd, contents + rel->r_offset - 2);
-             if (opcode != 0x8b && opcode != 0xff)
-               goto r_386_got32;
-           }
+           default:
+bad_ifunc_reloc:
+             if (h->root.root.string)
+               name = h->root.root.string;
+             else
+               name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
+                                        NULL);
+             _bfd_error_handler
+               /* xgettext:c-format */
+               (_("%pB: relocation %s against STT_GNU_IFUNC "
+                  "symbol `%s' isn't supported"), input_bfd,
+                howto->name, name);
+             bfd_set_error (bfd_error_bad_value);
+             return FALSE;
 
 
-         /* Resolve "mov GOT[(%reg)], %reg",
-            "call/jmp *GOT[(%reg)]", "test %reg, foo@GOT[(%reg)]"
-            and "binop foo@GOT[(%reg)], %reg".  */
-         if (h == NULL
-             || (h->plt.offset == (bfd_vma) -1
-                 && h->got.offset == (bfd_vma) -1)
-             || htab->elf.sgotplt == NULL)
-           abort ();
+           case R_386_32:
+             /* Generate dynamic relcoation only when there is a
+                non-GOT reference in a shared object.  */
+             if ((bfd_link_pic (info) && h->non_got_ref)
+                 || h->plt.offset == (bfd_vma) -1)
+               {
+                 Elf_Internal_Rela outrel;
+                 asection *sreloc;
+                 bfd_vma offset;
 
 
-         offplt = (htab->elf.sgotplt->output_section->vma
-                   + htab->elf.sgotplt->output_offset);
+do_ifunc_pointer:
+                 /* Need a dynamic relocation to get the real function
+                    adddress.  */
+                 offset = _bfd_elf_section_offset (output_bfd,
+                                                   info,
+                                                   input_section,
+                                                   rel->r_offset);
+                 if (offset == (bfd_vma) -1
+                     || offset == (bfd_vma) -2)
+                   abort ();
 
 
-         /* It is relative to .got.plt section.  */
-         if (h->got.offset != (bfd_vma) -1)
-           /* Use GOT entry.  */
-           relocation = (htab->elf.sgot->output_section->vma
-                         + htab->elf.sgot->output_offset
-                         + h->got.offset - offplt);
-         else
-           /* Use GOTPLT entry.  */
-           relocation = (h->plt.offset / plt_entry_size - 1 + 3) * 4;
+                 outrel.r_offset = (input_section->output_section->vma
+                                    + input_section->output_offset
+                                    + offset);
 
 
-         if (!bfd_link_pic (info))
-           {
-             /* If not PIC, add the .got.plt section address for
-                baseless addressing.  */
-             unsigned int modrm;
-             modrm = bfd_get_8 (abfd, contents + rel->r_offset - 1);
-             if ((modrm & 0xc7) == 0x5)
-               relocation += offplt;
+                 if (POINTER_LOCAL_IFUNC_P (info, h))
+                   {
+                     info->callbacks->minfo (_("Local IFUNC function `%s' in %pB\n"),
+                                             h->root.root.string,
+                                             h->root.u.def.section->owner);
+
+                     /* This symbol is resolved locally.  */
+                     outrel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);
+                     bfd_put_32 (output_bfd,
+                                 (h->root.u.def.value
+                                  + h->root.u.def.section->output_section->vma
+                                  + h->root.u.def.section->output_offset),
+                                 contents + offset);
+                   }
+                 else
+                   outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
+
+                 /* Dynamic relocations are stored in
+                    1. .rel.ifunc section in PIC object.
+                    2. .rel.got section in dynamic executable.
+                    3. .rel.iplt section in static executable.  */
+                 if (bfd_link_pic (info))
+                   sreloc = htab->elf.irelifunc;
+                 else if (htab->elf.splt != NULL)
+                   sreloc = htab->elf.srelgot;
+                 else
+                   sreloc = htab->elf.irelplt;
+                 elf_append_rel (output_bfd, sreloc, &outrel);
+
+                 /* If this reloc is against an external symbol, we
+                    do not want to fiddle with the addend.  Otherwise,
+                    we need to include the symbol value so that it
+                    becomes an addend for the dynamic reloc.  For an
+                    internal symbol, we have updated addend.  */
+                 continue;
+               }
+             /* FALLTHROUGH */
+           case R_386_PC32:
+           case R_386_PLT32:
+             goto do_relocation;
+
+           case R_386_GOTOFF:
+             relocation -= (gotplt->output_section->vma
+                            + gotplt->output_offset);
+             goto do_relocation;
            }
            }
+       }
 
 
-         unresolved_reloc = FALSE;
-         break;
+skip_ifunc:
+      resolved_to_zero = (eh != NULL
+                         && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh));
 
 
+      switch (r_type)
+       {
+       case R_386_GOT32X:
        case R_386_GOT32:
        case R_386_GOT32:
-r_386_got32:
          /* Relocation is to the entry for this symbol in the global
             offset table.  */
          if (htab->elf.sgot == NULL)
            abort ();
 
          /* Relocation is to the entry for this symbol in the global
             offset table.  */
          if (htab->elf.sgot == NULL)
            abort ();
 
+         relative_reloc = FALSE;
          if (h != NULL)
            {
          if (h != NULL)
            {
-             bfd_boolean dyn;
-
              off = h->got.offset;
              off = h->got.offset;
-             dyn = htab->elf.dynamic_sections_created;
-             if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn,
-                                                    bfd_link_pic (info),
-                                                    h)
-                 || (bfd_link_pic (info)
-                     && SYMBOL_REFERENCES_LOCAL (info, h))
-                 || (ELF_ST_VISIBILITY (h->other)
-                     && h->root.type == bfd_link_hash_undefweak))
+             if (RESOLVED_LOCALLY_P (info, h, htab))
                {
                {
-                 /* This is actually a static link, or it is a
-                    -Bsymbolic link and the symbol is defined
-                    locally, or the symbol was forced to be local
-                    because of a version file.  We must initialize
-                    this entry in the global offset table.  Since the
-                    offset must always be a multiple of 4, we use the
-                    least significant bit to record whether we have
-                    initialized it already.
+                 /* We must initialize this entry in the global offset
+                    table.  Since the offset must always be a multiple
+                    of 4, we use the least significant bit to record
+                    whether we have initialized it already.
 
                     When doing a dynamic link, we create a .rel.got
                     relocation entry to initialize the value.  This
 
                     When doing a dynamic link, we create a .rel.got
                     relocation entry to initialize the value.  This
@@ -4056,6 +2483,14 @@ r_386_got32:
                      bfd_put_32 (output_bfd, relocation,
                                  htab->elf.sgot->contents + off);
                      h->got.offset |= 1;
                      bfd_put_32 (output_bfd, relocation,
                                  htab->elf.sgot->contents + off);
                      h->got.offset |= 1;
+
+                     if (GENERATE_RELATIVE_RELOC_P (info, h))
+                       {
+                         /* PR ld/21402: If this symbol isn't dynamic
+                            in PIC, generate R_386_RELATIVE here.  */
+                         eh->no_finish_dynamic_symbol = 1;
+                         relative_reloc = TRUE;
+                       }
                    }
                }
              else
                    }
                }
              else
@@ -4077,34 +2512,70 @@ r_386_got32:
                {
                  bfd_put_32 (output_bfd, relocation,
                              htab->elf.sgot->contents + off);
                {
                  bfd_put_32 (output_bfd, relocation,
                              htab->elf.sgot->contents + off);
+                 local_got_offsets[r_symndx] |= 1;
 
                  if (bfd_link_pic (info))
 
                  if (bfd_link_pic (info))
-                   {
-                     asection *s;
-                     Elf_Internal_Rela outrel;
-
-                     s = htab->elf.srelgot;
-                     if (s == NULL)
-                       abort ();
-
-                     outrel.r_offset = (htab->elf.sgot->output_section->vma
-                                        + htab->elf.sgot->output_offset
-                                        + off);
-                     outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
-                     elf_append_rel (output_bfd, s, &outrel);
-                   }
-
-                 local_got_offsets[r_symndx] |= 1;
+                   relative_reloc = TRUE;
                }
            }
 
                }
            }
 
+         if (relative_reloc)
+           {
+             asection *s;
+             Elf_Internal_Rela outrel;
+
+             s = htab->elf.srelgot;
+             if (s == NULL)
+               abort ();
+
+             outrel.r_offset = (htab->elf.sgot->output_section->vma
+                                + htab->elf.sgot->output_offset
+                                + off);
+             outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
+             elf_append_rel (output_bfd, s, &outrel);
+           }
+
          if (off >= (bfd_vma) -2)
            abort ();
 
          if (off >= (bfd_vma) -2)
            abort ();
 
-         relocation = htab->elf.sgot->output_section->vma
-                      + htab->elf.sgot->output_offset + off
-                      - htab->elf.sgotplt->output_section->vma
-                      - htab->elf.sgotplt->output_offset;
+         relocation = (htab->elf.sgot->output_section->vma
+                       + htab->elf.sgot->output_offset + off);
+         if (rel->r_offset > 1
+             && (*(contents + rel->r_offset - 1) & 0xc7) == 0x5
+             && *(contents + rel->r_offset - 2) != 0x8d)
+           {
+             if (bfd_link_pic (info))
+               {
+                 /* For PIC, disallow R_386_GOT32 without a base
+                    register, except for "lea foo@GOT, %reg", since
+                    we don't know what the GOT base is.  */
+                 const char *name;
+
+disallow_got32:
+                 if (h == NULL || h->root.root.string == NULL)
+                   name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
+                                            NULL);
+                 else
+                   name = h->root.root.string;
+
+                 _bfd_error_handler
+                   /* xgettext:c-format */
+                   (_("%pB: direct GOT relocation %s against `%s'"
+                      " without base register can not be used"
+                      " when making a shared object"),
+                    input_bfd, howto->name, name);
+                 bfd_set_error (bfd_error_bad_value);
+                 return FALSE;
+               }
+           }
+         else
+           {
+             /* Subtract the .got.plt section address only with a base
+                register.  */
+             relocation -= (htab->elf.sgotplt->output_section->vma
+                            + htab->elf.sgotplt->output_offset);
+           }
+
          break;
 
        case R_386_GOTOFF:
          break;
 
        case R_386_GOTOFF:
@@ -4137,19 +2608,23 @@ r_386_got32:
                      break;
                    }
 
                      break;
                    }
 
-                 (*_bfd_error_handler)
-                   (_("%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"),
+                 _bfd_error_handler
+                   /* xgettext:c-format */
+                   (_("%pB: relocation R_386_GOTOFF against undefined %s"
+                      " `%s' can not be used when making a shared object"),
                     input_bfd, v, h->root.root.string);
                  bfd_set_error (bfd_error_bad_value);
                  return FALSE;
                }
                     input_bfd, v, h->root.root.string);
                  bfd_set_error (bfd_error_bad_value);
                  return FALSE;
                }
-             else if (!SYMBOL_REFERENCES_LOCAL (info, h)
+             else if (!SYMBOL_REFERENCES_LOCAL_P (info, h)
                       && (h->type == STT_FUNC
                           || h->type == STT_OBJECT)
                       && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
                {
                       && (h->type == STT_FUNC
                           || h->type == STT_OBJECT)
                       && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
                {
-                 (*_bfd_error_handler)
-                   (_("%B: relocation R_386_GOTOFF against protected %s `%s' can not be used when making a shared object"),
+                 _bfd_error_handler
+                   /* xgettext:c-format */
+                   (_("%pB: relocation R_386_GOTOFF against protected %s"
+                      " `%s' can not be used when making a shared object"),
                     input_bfd,
                     h->type == STT_FUNC ? "function" : "data",
                     h->root.root.string);
                     input_bfd,
                     h->type == STT_FUNC ? "function" : "data",
                     h->root.root.string);
@@ -4195,8 +2670,16 @@ r_386_got32:
 
          if (h->plt.offset != (bfd_vma) -1)
            {
 
          if (h->plt.offset != (bfd_vma) -1)
            {
-             resolved_plt = htab->elf.splt;
-             plt_offset = h->plt.offset;
+             if (htab->plt_second != NULL)
+               {
+                 resolved_plt = htab->plt_second;
+                 plt_offset = eh->plt_second.offset;
+               }
+             else
+               {
+                 resolved_plt = htab->elf.splt;
+                 plt_offset = h->plt.offset;
+               }
            }
          else
            {
            }
          else
            {
@@ -4221,22 +2704,9 @@ r_386_got32:
              || is_vxworks_tls)
            break;
 
              || is_vxworks_tls)
            break;
 
-         /* Copy dynamic function pointer relocations.  */
-         if ((bfd_link_pic (info)
-              && (h == NULL
-                  || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
-                  || h->root.type != bfd_link_hash_undefweak)
-              && ((r_type != R_386_PC32 && r_type != R_386_SIZE32)
-                  || !SYMBOL_CALLS_LOCAL (info, h)))
-             || (ELIMINATE_COPY_RELOCS
-                 && !bfd_link_pic (info)
-                 && h != NULL
-                 && h->dynindx != -1
-                 && (!h->non_got_ref || eh->func_pointer_refcount > 0)
-                 && ((h->def_dynamic
-                      && !h->def_regular)
-                     || h->root.type == bfd_link_hash_undefweak
-                     || h->root.type == bfd_link_hash_undefined)))
+         if (GENERATE_DYNAMIC_RELOCATION_P (info, eh, r_type,
+                                            FALSE, resolved_to_zero,
+                                            (r_type == R_386_PC32)))
            {
              Elf_Internal_Rela outrel;
              bfd_boolean skip, relocate;
            {
              Elf_Internal_Rela outrel;
              bfd_boolean skip, relocate;
@@ -4261,12 +2731,7 @@ r_386_got32:
 
              if (skip)
                memset (&outrel, 0, sizeof outrel);
 
              if (skip)
                memset (&outrel, 0, sizeof outrel);
-             else if (h != NULL
-                      && h->dynindx != -1
-                      && (r_type == R_386_PC32
-                          || !bfd_link_pic (info)
-                          || !SYMBOLIC_BIND (info, h)
-                          || !h->def_regular))
+             else if (COPY_INPUT_RELOC_P (info, h, r_type))
                outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
              else
                {
                outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
              else
                {
@@ -4318,56 +2783,67 @@ r_386_got32:
        case R_386_TLS_GOTIE:
          tls_type = GOT_UNKNOWN;
          if (h == NULL && local_got_offsets)
        case R_386_TLS_GOTIE:
          tls_type = GOT_UNKNOWN;
          if (h == NULL && local_got_offsets)
-           tls_type = elf_i386_local_got_tls_type (input_bfd) [r_symndx];
+           tls_type = elf_x86_local_got_tls_type (input_bfd) [r_symndx];
          else if (h != NULL)
          else if (h != NULL)
-           tls_type = elf_i386_hash_entry(h)->tls_type;
+           tls_type = elf_x86_hash_entry(h)->tls_type;
          if (tls_type == GOT_TLS_IE)
            tls_type = GOT_TLS_IE_NEG;
 
          if (tls_type == GOT_TLS_IE)
            tls_type = GOT_TLS_IE_NEG;
 
+          r_type_tls = r_type;
          if (! elf_i386_tls_transition (info, input_bfd,
                                         input_section, contents,
                                         symtab_hdr, sym_hashes,
          if (! elf_i386_tls_transition (info, input_bfd,
                                         input_section, contents,
                                         symtab_hdr, sym_hashes,
-                                        &r_type, tls_type, rel,
-                                        relend, h, r_symndx))
+                                        &r_type_tls, tls_type, rel,
+                                        relend, h, r_symndx, TRUE))
            return FALSE;
 
            return FALSE;
 
-         if (r_type == R_386_TLS_LE_32)
+         if (r_type_tls == R_386_TLS_LE_32)
            {
              BFD_ASSERT (! unresolved_reloc);
            {
              BFD_ASSERT (! unresolved_reloc);
-             if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GD)
+             if (r_type == R_386_TLS_GD)
                {
                  unsigned int type;
                  bfd_vma roff;
 
                  /* GD->LE transition.  */
                {
                  unsigned int type;
                  bfd_vma roff;
 
                  /* GD->LE transition.  */
-                 type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
+                 type = *(contents + rel->r_offset - 2);
                  if (type == 0x04)
                    {
                  if (type == 0x04)
                    {
-                     /* leal foo(,%reg,1), %eax; call ___tls_get_addr
-                        Change it into:
-                        movl %gs:0, %eax; subl $foo@tpoff, %eax
+                     /* Change
+                               leal foo@tlsgd(,%ebx,1), %eax
+                               call ___tls_get_addr@PLT
+                        into:
+                               movl %gs:0, %eax
+                               subl $foo@tpoff, %eax
                         (6 byte form of subl).  */
                         (6 byte form of subl).  */
-                     memcpy (contents + rel->r_offset - 3,
-                             "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12);
                      roff = rel->r_offset + 5;
                    }
                  else
                    {
                      roff = rel->r_offset + 5;
                    }
                  else
                    {
-                     /* leal foo(%reg), %eax; call ___tls_get_addr; nop
-                        Change it into:
-                        movl %gs:0, %eax; subl $foo@tpoff, %eax
+                     /* Change
+                               leal foo@tlsgd(%ebx), %eax
+                               call ___tls_get_addr@PLT
+                               nop
+                        or
+                               leal foo@tlsgd(%reg), %eax
+                               call *___tls_get_addr@GOT(%reg)
+                               which may be converted to
+                               addr32 call ___tls_get_addr
+                        into:
+                               movl %gs:0, %eax; subl $foo@tpoff, %eax
                         (6 byte form of subl).  */
                         (6 byte form of subl).  */
-                     memcpy (contents + rel->r_offset - 2,
-                             "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12);
                      roff = rel->r_offset + 6;
                    }
                      roff = rel->r_offset + 6;
                    }
+                 memcpy (contents + roff - 8,
+                         "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12);
                  bfd_put_32 (output_bfd, elf_i386_tpoff (info, relocation),
                              contents + roff);
                  bfd_put_32 (output_bfd, elf_i386_tpoff (info, relocation),
                              contents + roff);
-                 /* Skip R_386_PC32/R_386_PLT32.  */
+                 /* Skip R_386_PC32, R_386_PLT32 and R_386_GOT32X.  */
                  rel++;
                  rel++;
+                 wrel++;
                  continue;
                }
                  continue;
                }
-             else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GOTDESC)
+             else if (r_type == R_386_TLS_GOTDESC)
                {
                  /* GDesc -> LE transition.
                     It's originally something like:
                {
                  /* GDesc -> LE transition.
                     It's originally something like:
@@ -4392,7 +2868,7 @@ r_386_got32:
                              contents + roff);
                  continue;
                }
                              contents + roff);
                  continue;
                }
-             else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_DESC_CALL)
+             else if (r_type == R_386_TLS_DESC_CALL)
                {
                  /* GDesc -> LE transition.
                     It's originally:
                {
                  /* GDesc -> LE transition.
                     It's originally:
@@ -4407,7 +2883,7 @@ r_386_got32:
                  bfd_put_8 (output_bfd, 0x90, contents + roff + 1);
                  continue;
                }
                  bfd_put_8 (output_bfd, 0x90, contents + roff + 1);
                  continue;
                }
-             else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_IE)
+             else if (r_type == R_386_TLS_IE)
                {
                  unsigned int val;
 
                {
                  unsigned int val;
 
@@ -4501,7 +2977,7 @@ r_386_got32:
                    }
                  else
                    BFD_FAIL ();
                    }
                  else
                    BFD_FAIL ();
-                 if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GOTIE)
+                 if (r_type == R_386_TLS_GOTIE)
                    bfd_put_32 (output_bfd, -elf_i386_tpoff (info, relocation),
                                contents + rel->r_offset);
                  else
                    bfd_put_32 (output_bfd, -elf_i386_tpoff (info, relocation),
                                contents + rel->r_offset);
                  else
@@ -4517,7 +2993,7 @@ r_386_got32:
          if (h != NULL)
            {
              off = h->got.offset;
          if (h != NULL)
            {
              off = h->got.offset;
-             offplt = elf_i386_hash_entry (h)->tlsdesc_got;
+             offplt = elf_x86_hash_entry (h)->tlsdesc_got;
            }
          else
            {
            }
          else
            {
@@ -4562,7 +3038,7 @@ r_386_got32:
                    {
                      BFD_ASSERT (! unresolved_reloc);
                      bfd_put_32 (output_bfd,
                    {
                      BFD_ASSERT (! unresolved_reloc);
                      bfd_put_32 (output_bfd,
-                                 relocation - elf_i386_dtpoff_base (info),
+                                 relocation - _bfd_x86_elf_dtpoff_base (info),
                                  htab->elf.sgotplt->contents + offplt
                                  + htab->sgotplt_jump_table_size + 4);
                    }
                                  htab->elf.sgotplt->contents + offplt
                                  + htab->sgotplt_jump_table_size + 4);
                    }
@@ -4590,11 +3066,11 @@ r_386_got32:
 
              if (dr_type == R_386_TLS_TPOFF && indx == 0)
                bfd_put_32 (output_bfd,
 
              if (dr_type == R_386_TLS_TPOFF && indx == 0)
                bfd_put_32 (output_bfd,
-                           relocation - elf_i386_dtpoff_base (info),
+                           relocation - _bfd_x86_elf_dtpoff_base (info),
                            htab->elf.sgot->contents + off);
              else if (dr_type == R_386_TLS_TPOFF32 && indx == 0)
                bfd_put_32 (output_bfd,
                            htab->elf.sgot->contents + off);
              else if (dr_type == R_386_TLS_TPOFF32 && indx == 0)
                bfd_put_32 (output_bfd,
-                           elf_i386_dtpoff_base (info) - relocation,
+                           _bfd_x86_elf_dtpoff_base (info) - relocation,
                            htab->elf.sgot->contents + off);
              else if (dr_type != R_386_TLS_DESC)
                bfd_put_32 (output_bfd, 0,
                            htab->elf.sgot->contents + off);
              else if (dr_type != R_386_TLS_DESC)
                bfd_put_32 (output_bfd, 0,
@@ -4607,9 +3083,9 @@ r_386_got32:
                {
                  if (indx == 0)
                    {
                {
                  if (indx == 0)
                    {
-                     BFD_ASSERT (! unresolved_reloc);
+                     BFD_ASSERT (! unresolved_reloc);
                      bfd_put_32 (output_bfd,
                      bfd_put_32 (output_bfd,
-                                 relocation - elf_i386_dtpoff_base (info),
+                                 relocation - _bfd_x86_elf_dtpoff_base (info),
                                  htab->elf.sgot->contents + off + 4);
                    }
                  else
                                  htab->elf.sgot->contents + off + 4);
                    }
                  else
@@ -4626,7 +3102,7 @@ r_386_got32:
                {
                  bfd_put_32 (output_bfd,
                              (indx == 0
                {
                  bfd_put_32 (output_bfd,
                              (indx == 0
-                              ? relocation - elf_i386_dtpoff_base (info)
+                              ? relocation - _bfd_x86_elf_dtpoff_base (info)
                               : 0),
                              htab->elf.sgot->contents + off + 4);
                  outrel.r_info = ELF32_R_INFO (indx, R_386_TLS_TPOFF);
                               : 0),
                              htab->elf.sgot->contents + off + 4);
                  outrel.r_info = ELF32_R_INFO (indx, R_386_TLS_TPOFF);
@@ -4644,13 +3120,13 @@ r_386_got32:
          if (off >= (bfd_vma) -2
              && ! GOT_TLS_GDESC_P (tls_type))
            abort ();
          if (off >= (bfd_vma) -2
              && ! GOT_TLS_GDESC_P (tls_type))
            abort ();
-         if (r_type == R_386_TLS_GOTDESC
-             || r_type == R_386_TLS_DESC_CALL)
+         if (r_type_tls == R_386_TLS_GOTDESC
+             || r_type_tls == R_386_TLS_DESC_CALL)
            {
              relocation = htab->sgotplt_jump_table_size + offplt;
              unresolved_reloc = FALSE;
            }
            {
              relocation = htab->sgotplt_jump_table_size + offplt;
              unresolved_reloc = FALSE;
            }
-         else if (r_type == ELF32_R_TYPE (rel->r_info))
+         else if (r_type_tls == r_type)
            {
              bfd_vma g_o_t = htab->elf.sgotplt->output_section->vma
                              + htab->elf.sgotplt->output_offset;
            {
              bfd_vma g_o_t = htab->elf.sgotplt->output_section->vma
                              + htab->elf.sgotplt->output_offset;
@@ -4663,27 +3139,39 @@ r_386_got32:
                relocation += g_o_t;
              unresolved_reloc = FALSE;
            }
                relocation += g_o_t;
              unresolved_reloc = FALSE;
            }
-         else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GD)
+         else if (r_type == R_386_TLS_GD)
            {
              unsigned int val, type;
              bfd_vma roff;
 
              /* GD->IE transition.  */
            {
              unsigned int val, type;
              bfd_vma roff;
 
              /* GD->IE transition.  */
-             type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
-             val = bfd_get_8 (input_bfd, contents + rel->r_offset - 1);
+             type = *(contents + rel->r_offset - 2);
+             val = *(contents + rel->r_offset - 1);
              if (type == 0x04)
                {
              if (type == 0x04)
                {
-                 /* leal foo(,%reg,1), %eax; call ___tls_get_addr
-                    Change it into:
-                    movl %gs:0, %eax; subl $foo@gottpoff(%reg), %eax.  */
+                 /* Change
+                       leal foo@tlsgd(,%ebx,1), %eax
+                       call ___tls_get_addr@PLT
+                    into:
+                       movl %gs:0, %eax
+                       subl $foo@gottpoff(%ebx), %eax.  */
                  val >>= 3;
                  roff = rel->r_offset - 3;
                }
              else
                {
                  val >>= 3;
                  roff = rel->r_offset - 3;
                }
              else
                {
-                 /* leal foo(%reg), %eax; call ___tls_get_addr; nop
-                    Change it into:
-                    movl %gs:0, %eax; subl $foo@gottpoff(%reg), %eax.  */
+                 /* Change
+                       leal foo@tlsgd(%ebx), %eax
+                       call ___tls_get_addr@PLT
+                       nop
+                    or
+                       leal foo@tlsgd(%reg), %eax
+                       call *___tls_get_addr@GOT(%reg)
+                       which may be converted to
+                       addr32 call ___tls_get_addr
+                    into:
+                       movl %gs:0, %eax;
+                       subl $foo@gottpoff(%reg), %eax.  */
                  roff = rel->r_offset - 2;
                }
              memcpy (contents + roff,
                  roff = rel->r_offset - 2;
                }
              memcpy (contents + roff,
@@ -4702,11 +3190,12 @@ r_386_got32:
                          - htab->elf.sgotplt->output_section->vma
                          - htab->elf.sgotplt->output_offset,
                          contents + roff + 8);
                          - htab->elf.sgotplt->output_section->vma
                          - htab->elf.sgotplt->output_offset,
                          contents + roff + 8);
-             /* Skip R_386_PLT32.  */
+             /* Skip R_386_PLT32 and R_386_GOT32X.  */
              rel++;
              rel++;
+             wrel++;
              continue;
            }
              continue;
            }
-         else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GOTDESC)
+         else if (r_type == R_386_TLS_GOTDESC)
            {
              /* GDesc -> IE transition.
                 It's originally something like:
            {
              /* GDesc -> IE transition.
                 It's originally something like:
@@ -4745,7 +3234,7 @@ r_386_got32:
                          contents + roff);
              continue;
            }
                          contents + roff);
              continue;
            }
-         else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_DESC_CALL)
+         else if (r_type == R_386_TLS_DESC_CALL)
            {
              /* GDesc -> IE transition.
                 It's originally:
            {
              /* GDesc -> IE transition.
                 It's originally:
@@ -4787,27 +3276,44 @@ r_386_got32:
                                         input_section, contents,
                                         symtab_hdr, sym_hashes,
                                         &r_type, GOT_UNKNOWN, rel,
                                         input_section, contents,
                                         symtab_hdr, sym_hashes,
                                         &r_type, GOT_UNKNOWN, rel,
-                                        relend, h, r_symndx))
+                                        relend, h, r_symndx, TRUE))
            return FALSE;
 
          if (r_type != R_386_TLS_LDM)
            {
            return FALSE;
 
          if (r_type != R_386_TLS_LDM)
            {
-             /* LD->LE transition:
-                leal foo(%reg), %eax; call ___tls_get_addr.
-                We change it into:
-                movl %gs:0, %eax; nop; leal 0(%esi,1), %esi.  */
+             /* LD->LE transition.  Change
+                       leal foo@tlsldm(%ebx) %eax
+                       call ___tls_get_addr@PLT
+                into:
+                       movl %gs:0, %eax
+                       nop
+                       leal 0(%esi,1), %esi
+                or change
+                       leal foo@tlsldm(%reg) %eax
+                       call *___tls_get_addr@GOT(%reg)
+                       which may be converted to
+                       addr32 call ___tls_get_addr
+                into:
+                       movl %gs:0, %eax
+                       leal 0(%esi), %esi  */
              BFD_ASSERT (r_type == R_386_TLS_LE_32);
              BFD_ASSERT (r_type == R_386_TLS_LE_32);
-             memcpy (contents + rel->r_offset - 2,
-                     "\x65\xa1\0\0\0\0\x90\x8d\x74\x26", 11);
+             if (*(contents + rel->r_offset + 4) == 0xff
+                 || *(contents + rel->r_offset + 4) == 0x67)
+               memcpy (contents + rel->r_offset - 2,
+                       "\x65\xa1\0\0\0\0\x8d\xb6\0\0\0", 12);
+             else
+               memcpy (contents + rel->r_offset - 2,
+                       "\x65\xa1\0\0\0\0\x90\x8d\x74\x26", 11);
              /* Skip R_386_PC32/R_386_PLT32.  */
              rel++;
              /* Skip R_386_PC32/R_386_PLT32.  */
              rel++;
+             wrel++;
              continue;
            }
 
          if (htab->elf.sgot == NULL)
            abort ();
 
              continue;
            }
 
          if (htab->elf.sgot == NULL)
            abort ();
 
-         off = htab->tls_ldm_got.offset;
+         off = htab->tls_ld_or_ldm_got.offset;
          if (off & 1)
            off &= ~1;
          else
          if (off & 1)
            off &= ~1;
          else
@@ -4826,7 +3332,7 @@ r_386_got32:
                          htab->elf.sgot->contents + off + 4);
              outrel.r_info = ELF32_R_INFO (0, R_386_TLS_DTPMOD32);
              elf_append_rel (output_bfd, htab->elf.srelgot, &outrel);
                          htab->elf.sgot->contents + off + 4);
              outrel.r_info = ELF32_R_INFO (0, R_386_TLS_DTPMOD32);
              elf_append_rel (output_bfd, htab->elf.srelgot, &outrel);
-             htab->tls_ldm_got.offset |= 1;
+             htab->tls_ld_or_ldm_got.offset |= 1;
            }
          relocation = htab->elf.sgot->output_section->vma
                       + htab->elf.sgot->output_offset + off
            }
          relocation = htab->elf.sgot->output_section->vma
                       + htab->elf.sgot->output_offset + off
@@ -4838,7 +3344,7 @@ r_386_got32:
        case R_386_TLS_LDO_32:
          if (!bfd_link_executable (info)
              || (input_section->flags & SEC_CODE) == 0)
        case R_386_TLS_LDO_32:
          if (!bfd_link_executable (info)
              || (input_section->flags & SEC_CODE) == 0)
-           relocation -= elf_i386_dtpoff_base (info);
+           relocation -= _bfd_x86_elf_dtpoff_base (info);
          else
            /* When converting LDO to LE, we must negate.  */
            relocation = -elf_i386_tpoff (info, relocation);
          else
            /* When converting LDO to LE, we must negate.  */
            relocation = -elf_i386_tpoff (info, relocation);
@@ -4869,9 +3375,9 @@ r_386_got32:
              if (indx)
                continue;
              else if (r_type == R_386_TLS_LE_32)
              if (indx)
                continue;
              else if (r_type == R_386_TLS_LE_32)
-               relocation = elf_i386_dtpoff_base (info) - relocation;
+               relocation = _bfd_x86_elf_dtpoff_base (info) - relocation;
              else
              else
-               relocation -= elf_i386_dtpoff_base (info);
+               relocation -= _bfd_x86_elf_dtpoff_base (info);
            }
          else if (r_type == R_386_TLS_LE_32)
            relocation = elf_i386_tpoff (info, relocation);
            }
          else if (r_type == R_386_TLS_LE_32)
            relocation = elf_i386_tpoff (info, relocation);
@@ -4892,11 +3398,12 @@ r_386_got32:
          && _bfd_elf_section_offset (output_bfd, info, input_section,
                                      rel->r_offset) != (bfd_vma) -1)
        {
          && _bfd_elf_section_offset (output_bfd, info, input_section,
                                      rel->r_offset) != (bfd_vma) -1)
        {
-         (*_bfd_error_handler)
-           (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+         _bfd_error_handler
+           /* xgettext:c-format */
+           (_("%pB(%pA+%#" PRIx64 "): unresolvable %s relocation against symbol `%s'"),
             input_bfd,
             input_section,
             input_bfd,
             input_section,
-            (long) rel->r_offset,
+            (uint64_t) rel->r_offset,
             howto->name,
             h->root.root.string);
          return FALSE;
             howto->name,
             h->root.root.string);
          return FALSE;
@@ -4922,26 +3429,46 @@ check_relocation_error:
              if (name == NULL)
                return FALSE;
              if (*name == '\0')
              if (name == NULL)
                return FALSE;
              if (*name == '\0')
-               name = bfd_section_name (input_bfd, sec);
+               name = bfd_section_name (sec);
            }
 
          if (r == bfd_reloc_overflow)
            }
 
          if (r == bfd_reloc_overflow)
-           {
-             if (! ((*info->callbacks->reloc_overflow)
-                    (info, (h ? &h->root : NULL), name, howto->name,
-                     (bfd_vma) 0, input_bfd, input_section,
-                     rel->r_offset)))
-               return FALSE;
-           }
+           (*info->callbacks->reloc_overflow)
+             (info, (h ? &h->root : NULL), name, howto->name,
+              (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
          else
            {
          else
            {
-             (*_bfd_error_handler)
-               (_("%B(%A+0x%lx): reloc against `%s': error %d"),
+             _bfd_error_handler
+               /* xgettext:c-format */
+               (_("%pB(%pA+%#" PRIx64 "): reloc against `%s': error %d"),
                 input_bfd, input_section,
                 input_bfd, input_section,
-                (long) rel->r_offset, name, (int) r);
+                (uint64_t) rel->r_offset, name, (int) r);
              return FALSE;
            }
        }
              return FALSE;
            }
        }
+
+      if (wrel != rel)
+       *wrel = *rel;
+    }
+
+  if (wrel != rel)
+    {
+      Elf_Internal_Shdr *rel_hdr;
+      size_t deleted = rel - wrel;
+
+      rel_hdr = _bfd_elf_single_rel_hdr (input_section->output_section);
+      rel_hdr->sh_size -= rel_hdr->sh_entsize * deleted;
+      if (rel_hdr->sh_size == 0)
+       {
+         /* It is too late to remove an empty reloc section.  Leave
+            one NONE reloc.
+            ??? What is wrong with an empty section???  */
+         rel_hdr->sh_size = rel_hdr->sh_entsize;
+         deleted -= 1;
+       }
+      rel_hdr = _bfd_elf_single_rel_hdr (input_section);
+      rel_hdr->sh_size -= rel_hdr->sh_entsize * deleted;
+      input_section->reloc_count -= deleted;
     }
 
   return TRUE;
     }
 
   return TRUE;
@@ -4956,27 +3483,37 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
                                struct elf_link_hash_entry *h,
                                Elf_Internal_Sym *sym)
 {
                                struct elf_link_hash_entry *h,
                                Elf_Internal_Sym *sym)
 {
-  struct elf_i386_link_hash_table *htab;
+  struct elf_x86_link_hash_table *htab;
   unsigned plt_entry_size;
   unsigned plt_entry_size;
-  const struct elf_i386_backend_data *abed;
-  struct elf_i386_link_hash_entry *eh;
+  struct elf_x86_link_hash_entry *eh;
+  bfd_boolean local_undefweak;
+  bfd_boolean use_plt_second;
 
 
-  htab = elf_i386_hash_table (info);
+  htab = elf_x86_hash_table (info, I386_ELF_DATA);
   if (htab == NULL)
     return FALSE;
 
   if (htab == NULL)
     return FALSE;
 
-  abed = get_elf_i386_backend_data (output_bfd);
-  plt_entry_size = GET_PLT_ENTRY_SIZE (output_bfd);
+  plt_entry_size = htab->plt.plt_entry_size;
+
+  /* Use the second PLT section only if there is .plt section.  */
+  use_plt_second = htab->elf.splt != NULL && htab->plt_second != NULL;
 
 
-  eh = (struct elf_i386_link_hash_entry *) h;
+  eh = (struct elf_x86_link_hash_entry *) h;
+  if (eh->no_finish_dynamic_symbol)
+    abort ();
+
+  /* We keep PLT/GOT entries without dynamic PLT/GOT relocations for
+     resolved undefined weak symbols in executable so that their
+     references have value 0 at run-time.  */
+  local_undefweak = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
 
   if (h->plt.offset != (bfd_vma) -1)
     {
 
   if (h->plt.offset != (bfd_vma) -1)
     {
-      bfd_vma plt_index;
+      bfd_vma plt_index, plt_offset;
       bfd_vma got_offset;
       Elf_Internal_Rela rel;
       bfd_byte *loc;
       bfd_vma got_offset;
       Elf_Internal_Rela rel;
       bfd_byte *loc;
-      asection *plt, *gotplt, *relplt;
+      asection *plt, *resolved_plt, *gotplt, *relplt;
 
       /* When building a static executable, use .iplt, .igot.plt and
         .rel.iplt sections for STT_GNU_IFUNC symbols.  */
 
       /* When building a static executable, use .iplt, .igot.plt and
         .rel.iplt sections for STT_GNU_IFUNC symbols.  */
@@ -4993,17 +3530,7 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
          relplt = htab->elf.irelplt;
        }
 
          relplt = htab->elf.irelplt;
        }
 
-      /* This symbol has an entry in the procedure linkage table.  Set
-        it up.  */
-
-      if ((h->dynindx == -1
-          && !((h->forced_local || bfd_link_executable (info))
-               && h->def_regular
-               && h->type == STT_GNU_IFUNC))
-         || plt == NULL
-         || gotplt == NULL
-         || relplt == NULL)
-       abort ();
+      VERIFY_PLT_ENTRY (info, h, plt, gotplt, relplt, local_undefweak)
 
       /* Get the index in the procedure linkage table which
         corresponds to this symbol.  This is the index of this symbol
 
       /* Get the index in the procedure linkage table which
         corresponds to this symbol.  This is the index of this symbol
@@ -5016,30 +3543,52 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
 
         For static executables, we don't reserve anything.  */
 
 
         For static executables, we don't reserve anything.  */
 
-      if (plt == htab->elf.splt)
+      if (plt == htab->elf.splt)
+       {
+         got_offset = (h->plt.offset / plt_entry_size
+                       - htab->plt.has_plt0);
+         got_offset = (got_offset + 3) * 4;
+       }
+      else
+       {
+         got_offset = h->plt.offset / plt_entry_size;
+         got_offset = got_offset * 4;
+       }
+
+      /* Fill in the entry in the procedure linkage table and update
+        the first slot.  */
+      memcpy (plt->contents + h->plt.offset, htab->plt.plt_entry,
+             plt_entry_size);
+
+      if (use_plt_second)
        {
        {
-         got_offset = h->plt.offset / plt_entry_size - 1;
-         got_offset = (got_offset + 3) * 4;
+         const bfd_byte *plt_entry;
+         if (bfd_link_pic (info))
+           plt_entry = htab->non_lazy_plt->pic_plt_entry;
+         else
+           plt_entry = htab->non_lazy_plt->plt_entry;
+         memcpy (htab->plt_second->contents + eh->plt_second.offset,
+                 plt_entry, htab->non_lazy_plt->plt_entry_size);
+
+         resolved_plt = htab->plt_second;
+         plt_offset = eh->plt_second.offset;
        }
       else
        {
        }
       else
        {
-         got_offset = h->plt.offset / plt_entry_size;
-         got_offset = got_offset * 4;
+         resolved_plt = plt;
+         plt_offset = h->plt.offset;
        }
 
        }
 
-      /* Fill in the entry in the procedure linkage table.  */
       if (! bfd_link_pic (info))
        {
       if (! bfd_link_pic (info))
        {
-         memcpy (plt->contents + h->plt.offset, abed->plt->plt_entry,
-                 abed->plt->plt_entry_size);
          bfd_put_32 (output_bfd,
                      (gotplt->output_section->vma
                       + gotplt->output_offset
                       + got_offset),
          bfd_put_32 (output_bfd,
                      (gotplt->output_section->vma
                       + gotplt->output_offset
                       + got_offset),
-                     plt->contents + h->plt.offset
-                      + abed->plt->plt_got_offset);
+                     resolved_plt->contents + plt_offset
+                     + htab->plt.plt_got_offset);
 
 
-         if (abed->is_vxworks)
+         if (htab->target_os == is_vxworks)
            {
              int s, k, reloc_index;
 
            {
              int s, k, reloc_index;
 
@@ -5047,8 +3596,8 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
                 for this PLT entry.  */
 
              /* S: Current slot number (zero-based).  */
                 for this PLT entry.  */
 
              /* S: Current slot number (zero-based).  */
-             s = ((h->plt.offset - abed->plt->plt_entry_size)
-                   / abed->plt->plt_entry_size);
+             s = ((h->plt.offset - htab->plt.plt_entry_size)
+                  / htab->plt.plt_entry_size);
              /* K: Number of relocations for PLTResolve. */
              if (bfd_link_pic (info))
                k = PLTRESOLVE_RELOCS_SHLIB;
              /* K: Number of relocations for PLTResolve. */
              if (bfd_link_pic (info))
                k = PLTRESOLVE_RELOCS_SHLIB;
@@ -5060,8 +3609,8 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
              loc = (htab->srelplt2->contents + reloc_index
                     * sizeof (Elf32_External_Rel));
 
              loc = (htab->srelplt2->contents + reloc_index
                     * sizeof (Elf32_External_Rel));
 
-             rel.r_offset = (htab->elf.splt->output_section->vma
-                             + htab->elf.splt->output_offset
+             rel.r_offset = (plt->output_section->vma
+                             + plt->output_offset
                              + h->plt.offset + 2),
              rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_386_32);
              bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
                              + h->plt.offset + 2),
              rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_386_32);
              bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
@@ -5078,61 +3627,69 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
        }
       else
        {
        }
       else
        {
-         memcpy (plt->contents + h->plt.offset, abed->plt->pic_plt_entry,
-                 abed->plt->plt_entry_size);
          bfd_put_32 (output_bfd, got_offset,
          bfd_put_32 (output_bfd, got_offset,
-                     plt->contents + h->plt.offset
-                      + abed->plt->plt_got_offset);
+                     resolved_plt->contents + plt_offset
+                     + htab->plt.plt_got_offset);
        }
 
        }
 
-      /* Fill in the entry in the global offset table.  */
-      bfd_put_32 (output_bfd,
-                 (plt->output_section->vma
-                  + plt->output_offset
-                  + h->plt.offset
-                  + abed->plt->plt_lazy_offset),
-                 gotplt->contents + got_offset);
-
-      /* Fill in the entry in the .rel.plt section.  */
-      rel.r_offset = (gotplt->output_section->vma
-                     + gotplt->output_offset
-                     + got_offset);
-      if (h->dynindx == -1
-         || ((bfd_link_executable (info)
-              || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
-             && h->def_regular
-              && h->type == STT_GNU_IFUNC))
-       {
-         /* If an STT_GNU_IFUNC symbol is locally defined, generate
-            R_386_IRELATIVE instead of R_386_JUMP_SLOT.  Store addend
-            in the .got.plt section.  */
-         bfd_put_32 (output_bfd,
-                     (h->root.u.def.value
-                      + h->root.u.def.section->output_section->vma
-                      + h->root.u.def.section->output_offset),
-                     gotplt->contents + got_offset);
-         rel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);
-         /* R_386_IRELATIVE comes last.  */
-         plt_index = htab->next_irelative_index--;
-       }
-      else
+      /* Fill in the entry in the global offset table.  Leave the entry
+        as zero for undefined weak symbol in PIE.  No PLT relocation
+        against undefined weak symbol in PIE.  */
+      if (!local_undefweak)
        {
        {
-         rel.r_info = ELF32_R_INFO (h->dynindx, R_386_JUMP_SLOT);
-         plt_index = htab->next_jump_slot_index++;
-       }
-      loc = relplt->contents + plt_index * sizeof (Elf32_External_Rel);
-      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+         if (htab->plt.has_plt0)
+           bfd_put_32 (output_bfd,
+                       (plt->output_section->vma
+                        + plt->output_offset
+                        + h->plt.offset
+                        + htab->lazy_plt->plt_lazy_offset),
+                       gotplt->contents + got_offset);
+
+         /* Fill in the entry in the .rel.plt section.  */
+         rel.r_offset = (gotplt->output_section->vma
+                         + gotplt->output_offset
+                         + got_offset);
+         if (PLT_LOCAL_IFUNC_P (info, h))
+           {
+             info->callbacks->minfo (_("Local IFUNC function `%s' in %pB\n"),
+                                     h->root.root.string,
+                                     h->root.u.def.section->owner);
 
 
-      /* Don't fill PLT entry for static executables.  */
-      if (plt == htab->elf.splt)
-       {
-         bfd_put_32 (output_bfd, plt_index * sizeof (Elf32_External_Rel),
-                     plt->contents + h->plt.offset
-                      + abed->plt->plt_reloc_offset);
-         bfd_put_32 (output_bfd, - (h->plt.offset
-                                     + abed->plt->plt_plt_offset + 4),
-                     plt->contents + h->plt.offset
-                      + abed->plt->plt_plt_offset);
+             /* If an STT_GNU_IFUNC symbol is locally defined, generate
+                R_386_IRELATIVE instead of R_386_JUMP_SLOT.  Store addend
+                in the .got.plt section.  */
+             bfd_put_32 (output_bfd,
+                         (h->root.u.def.value
+                          + h->root.u.def.section->output_section->vma
+                          + h->root.u.def.section->output_offset),
+                         gotplt->contents + got_offset);
+             rel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);
+             /* R_386_IRELATIVE comes last.  */
+             plt_index = htab->next_irelative_index--;
+           }
+         else
+           {
+             rel.r_info = ELF32_R_INFO (h->dynindx, R_386_JUMP_SLOT);
+             plt_index = htab->next_jump_slot_index++;
+           }
+
+         loc = relplt->contents + plt_index * sizeof (Elf32_External_Rel);
+         bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);
+
+         /* Don't fill the second and third slots in PLT entry for
+            static executables nor without PLT0.  */
+         if (plt == htab->elf.splt && htab->plt.has_plt0)
+           {
+             bfd_put_32 (output_bfd,
+                         plt_index * sizeof (Elf32_External_Rel),
+                         plt->contents + h->plt.offset
+                         + htab->lazy_plt->plt_reloc_offset);
+             bfd_put_32 (output_bfd,
+                         - (h->plt.offset
+                            + htab->lazy_plt->plt_plt_offset + 4),
+                         (plt->contents + h->plt.offset
+                          + htab->lazy_plt->plt_plt_offset));
+           }
        }
     }
   else if (eh->plt_got.offset != (bfd_vma) -1)
        }
     }
   else if (eh->plt_got.offset != (bfd_vma) -1)
@@ -5141,9 +3698,6 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
       asection *plt, *got, *gotplt;
       const bfd_byte *got_plt_entry;
 
       asection *plt, *got, *gotplt;
       const bfd_byte *got_plt_entry;
 
-      /* Offset of displacement of the indirect jump.  */
-      bfd_vma plt_got_offset = 2;
-
       /* Set the entry in the GOT procedure linkage table.  */
       plt = htab->plt_got;
       got = htab->elf.sgot;
       /* Set the entry in the GOT procedure linkage table.  */
       plt = htab->plt_got;
       got = htab->elf.sgot;
@@ -5159,12 +3713,12 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
       /* Fill in the entry in the GOT procedure linkage table.  */
       if (! bfd_link_pic (info))
        {
       /* Fill in the entry in the GOT procedure linkage table.  */
       if (! bfd_link_pic (info))
        {
-         got_plt_entry = elf_i386_got_plt_entry;
+         got_plt_entry = htab->non_lazy_plt->plt_entry;
          got_offset += got->output_section->vma + got->output_offset;
        }
       else
        {
          got_offset += got->output_section->vma + got->output_offset;
        }
       else
        {
-         got_plt_entry = elf_i386_pic_got_plt_entry;
+         got_plt_entry = htab->non_lazy_plt->pic_plt_entry;
          got_offset += (got->output_section->vma
                         + got->output_offset
                         - gotplt->output_section->vma
          got_offset += (got->output_section->vma
                         + got->output_offset
                         - gotplt->output_section->vma
@@ -5173,12 +3727,14 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
 
       plt_offset = eh->plt_got.offset;
       memcpy (plt->contents + plt_offset, got_plt_entry,
 
       plt_offset = eh->plt_got.offset;
       memcpy (plt->contents + plt_offset, got_plt_entry,
-             sizeof (elf_i386_got_plt_entry));
+             htab->non_lazy_plt->plt_entry_size);
       bfd_put_32 (output_bfd, got_offset,
       bfd_put_32 (output_bfd, got_offset,
-                 plt->contents + plt_offset + plt_got_offset);
+                 (plt->contents + plt_offset
+                  + htab->non_lazy_plt->plt_got_offset));
     }
 
     }
 
-  if (!h->def_regular
+  if (!local_undefweak
+      && !h->def_regular
       && (h->plt.offset != (bfd_vma) -1
          || eh->plt_got.offset != (bfd_vma) -1))
     {
       && (h->plt.offset != (bfd_vma) -1
          || eh->plt_got.offset != (bfd_vma) -1))
     {
@@ -5195,11 +3751,17 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
        sym->st_value = 0;
     }
 
        sym->st_value = 0;
     }
 
+  _bfd_x86_elf_link_fixup_ifunc_symbol (info, htab, h, sym);
+
+  /* Don't generate dynamic GOT relocation against undefined weak
+     symbol in executable.  */
   if (h->got.offset != (bfd_vma) -1
   if (h->got.offset != (bfd_vma) -1
-      && ! GOT_TLS_GD_ANY_P (elf_i386_hash_entry(h)->tls_type)
-      && (elf_i386_hash_entry(h)->tls_type & GOT_TLS_IE) == 0)
+      && ! GOT_TLS_GD_ANY_P (elf_x86_hash_entry(h)->tls_type)
+      && (elf_x86_hash_entry(h)->tls_type & GOT_TLS_IE) == 0
+      && !local_undefweak)
     {
       Elf_Internal_Rela rel;
     {
       Elf_Internal_Rela rel;
+      asection *relgot = htab->elf.srelgot;
 
       /* This symbol has an entry in the global offset table.  Set it
         up.  */
 
       /* This symbol has an entry in the global offset table.  Set it
         up.  */
@@ -5219,7 +3781,32 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
       if (h->def_regular
          && h->type == STT_GNU_IFUNC)
        {
       if (h->def_regular
          && h->type == STT_GNU_IFUNC)
        {
-         if (bfd_link_pic (info))
+         if (h->plt.offset == (bfd_vma) -1)
+           {
+             /* STT_GNU_IFUNC is referenced without PLT.  */
+             if (htab->elf.splt == NULL)
+               {
+                 /* use .rel[a].iplt section to store .got relocations
+                    in static executable.  */
+                 relgot = htab->elf.irelplt;
+               }
+             if (SYMBOL_REFERENCES_LOCAL_P (info, h))
+               {
+                 info->callbacks->minfo (_("Local IFUNC function `%s' in %pB\n"),
+                                         h->root.root.string,
+                                         h->root.u.def.section->owner);
+
+                 bfd_put_32 (output_bfd,
+                             (h->root.u.def.value
+                              + h->root.u.def.section->output_section->vma
+                              + h->root.u.def.section->output_offset),
+                             htab->elf.sgot->contents + h->got.offset);
+                 rel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);
+               }
+             else
+               goto do_glob_dat;
+           }
+         else if (bfd_link_pic (info))
            {
              /* Generate R_386_GLOB_DAT.  */
              goto do_glob_dat;
            {
              /* Generate R_386_GLOB_DAT.  */
              goto do_glob_dat;
@@ -5227,6 +3814,7 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
          else
            {
              asection *plt;
          else
            {
              asection *plt;
+             bfd_vma plt_offset;
 
              if (!h->pointer_equality_needed)
                abort ();
 
              if (!h->pointer_equality_needed)
                abort ();
@@ -5234,16 +3822,25 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
              /* For non-shared object, we can't use .got.plt, which
                 contains the real function addres if we need pointer
                 equality.  We load the GOT entry with the PLT entry.  */
              /* For non-shared object, we can't use .got.plt, which
                 contains the real function addres if we need pointer
                 equality.  We load the GOT entry with the PLT entry.  */
-             plt = htab->elf.splt ? htab->elf.splt : htab->elf.iplt;
+             if (htab->plt_second != NULL)
+               {
+                 plt = htab->plt_second;
+                 plt_offset = eh->plt_second.offset;
+               }
+             else
+               {
+                 plt = htab->elf.splt ? htab->elf.splt : htab->elf.iplt;
+                 plt_offset = h->plt.offset;
+               }
              bfd_put_32 (output_bfd,
                          (plt->output_section->vma
              bfd_put_32 (output_bfd,
                          (plt->output_section->vma
-                          + plt->output_offset + h->plt.offset),
+                          + plt->output_offset + plt_offset),
                          htab->elf.sgot->contents + h->got.offset);
              return TRUE;
            }
        }
       else if (bfd_link_pic (info)
                          htab->elf.sgot->contents + h->got.offset);
              return TRUE;
            }
        }
       else if (bfd_link_pic (info)
-              && SYMBOL_REFERENCES_LOCAL (info, h))
+              && SYMBOL_REFERENCES_LOCAL_P (info, h))
        {
          BFD_ASSERT((h->got.offset & 1) != 0);
          rel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
        {
          BFD_ASSERT((h->got.offset & 1) != 0);
          rel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
@@ -5257,26 +3854,26 @@ do_glob_dat:
          rel.r_info = ELF32_R_INFO (h->dynindx, R_386_GLOB_DAT);
        }
 
          rel.r_info = ELF32_R_INFO (h->dynindx, R_386_GLOB_DAT);
        }
 
-      elf_append_rel (output_bfd, htab->elf.srelgot, &rel);
+      elf_append_rel (output_bfd, relgot, &rel);
     }
 
   if (h->needs_copy)
     {
       Elf_Internal_Rela rel;
     }
 
   if (h->needs_copy)
     {
       Elf_Internal_Rela rel;
+      asection *s;
 
       /* This symbol needs a copy reloc.  Set it up.  */
 
       /* This symbol needs a copy reloc.  Set it up.  */
-
-      if (h->dynindx == -1
-         || (h->root.type != bfd_link_hash_defined
-             && h->root.type != bfd_link_hash_defweak)
-         || htab->srelbss == NULL)
-       abort ();
+      VERIFY_COPY_RELOC (h, htab)
 
       rel.r_offset = (h->root.u.def.value
                      + h->root.u.def.section->output_section->vma
                      + h->root.u.def.section->output_offset);
       rel.r_info = ELF32_R_INFO (h->dynindx, R_386_COPY);
 
       rel.r_offset = (h->root.u.def.value
                      + h->root.u.def.section->output_section->vma
                      + h->root.u.def.section->output_offset);
       rel.r_info = ELF32_R_INFO (h->dynindx, R_386_COPY);
-      elf_append_rel (output_bfd, htab->srelbss, &rel);
+      if (h->root.u.def.section == htab->elf.sdynrelro)
+       s = htab->elf.sreldynrelro;
+      else
+       s = htab->elf.srelbss;
+      elf_append_rel (output_bfd, s, &rel);
     }
 
   return TRUE;
     }
 
   return TRUE;
@@ -5297,6 +3894,25 @@ elf_i386_finish_local_dynamic_symbol (void **slot, void *inf)
                                         h, NULL);
 }
 
                                         h, NULL);
 }
 
+/* Finish up undefined weak symbol handling in PIE.  Fill its PLT entry
+   here since undefined weak symbol may not be dynamic and may not be
+   called for elf_i386_finish_dynamic_symbol.  */
+
+static bfd_boolean
+elf_i386_pie_finish_undefweak_symbol (struct bfd_hash_entry *bh,
+                                     void *inf)
+{
+  struct elf_link_hash_entry *h = (struct elf_link_hash_entry *) bh;
+  struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+  if (h->root.type != bfd_link_hash_undefweak
+      || h->dynindx != -1)
+    return TRUE;
+
+  return elf_i386_finish_dynamic_symbol (info->output_bfd,
+                                        info, h, NULL);
+}
+
 /* Used to decide how to sort relocs in an optimal manner for the
    dynamic linker, before writing them out.  */
 
 /* Used to decide how to sort relocs in an optimal manner for the
    dynamic linker, before writing them out.  */
 
@@ -5308,22 +3924,31 @@ elf_i386_reloc_type_class (const struct bfd_link_info *info,
   bfd *abfd = info->output_bfd;
   const struct elf_backend_data *bed = get_elf_backend_data (abfd);
   struct elf_link_hash_table *htab = elf_hash_table (info);
   bfd *abfd = info->output_bfd;
   const struct elf_backend_data *bed = get_elf_backend_data (abfd);
   struct elf_link_hash_table *htab = elf_hash_table (info);
-  unsigned long r_symndx = ELF32_R_SYM (rela->r_info);
-  Elf_Internal_Sym sym;
-
-  if (htab->dynsym == NULL
-      || !bed->s->swap_symbol_in (abfd,
-                                 (htab->dynsym->contents
-                                  + r_symndx * sizeof (Elf32_External_Sym)),
-                                 0, &sym))
-    abort ();
 
 
-  /* Check relocation against STT_GNU_IFUNC symbol.  */
-  if (ELF32_ST_TYPE (sym.st_info) == STT_GNU_IFUNC)
-    return reloc_class_ifunc;
+  if (htab->dynsym != NULL
+      && htab->dynsym->contents != NULL)
+    {
+      /* Check relocation against STT_GNU_IFUNC symbol if there are
+        dynamic symbols.  */
+      unsigned long r_symndx = ELF32_R_SYM (rela->r_info);
+      if (r_symndx != STN_UNDEF)
+       {
+         Elf_Internal_Sym sym;
+         if (!bed->s->swap_symbol_in (abfd,
+                                      (htab->dynsym->contents
+                                       + r_symndx * sizeof (Elf32_External_Sym)),
+                                      0, &sym))
+           abort ();
+
+         if (ELF32_ST_TYPE (sym.st_info) == STT_GNU_IFUNC)
+           return reloc_class_ifunc;
+       }
+    }
 
   switch (ELF32_R_TYPE (rela->r_info))
     {
 
   switch (ELF32_R_TYPE (rela->r_info))
     {
+    case R_386_IRELATIVE:
+      return reloc_class_ifunc;
     case R_386_RELATIVE:
       return reloc_class_relative;
     case R_386_JUMP_SLOT:
     case R_386_RELATIVE:
       return reloc_class_relative;
     case R_386_JUMP_SLOT:
@@ -5341,230 +3966,128 @@ static bfd_boolean
 elf_i386_finish_dynamic_sections (bfd *output_bfd,
                                  struct bfd_link_info *info)
 {
 elf_i386_finish_dynamic_sections (bfd *output_bfd,
                                  struct bfd_link_info *info)
 {
-  struct elf_i386_link_hash_table *htab;
-  bfd *dynobj;
-  asection *sdyn;
-  const struct elf_i386_backend_data *abed;
+  struct elf_x86_link_hash_table *htab;
 
 
-  htab = elf_i386_hash_table (info);
+  htab = _bfd_x86_elf_finish_dynamic_sections (output_bfd, info);
   if (htab == NULL)
     return FALSE;
 
   if (htab == NULL)
     return FALSE;
 
-  dynobj = htab->elf.dynobj;
-  sdyn = bfd_get_linker_section (dynobj, ".dynamic");
-  abed = get_elf_i386_backend_data (output_bfd);
+  if (!htab->elf.dynamic_sections_created)
+    return TRUE;
 
 
-  if (htab->elf.dynamic_sections_created)
+  if (htab->elf.splt && htab->elf.splt->size > 0)
     {
     {
-      Elf32_External_Dyn *dyncon, *dynconend;
+      /* UnixWare sets the entsize of .plt to 4, although that doesn't
+        really seem like the right value.  */
+      elf_section_data (htab->elf.splt->output_section)
+       ->this_hdr.sh_entsize = 4;
 
 
-      if (sdyn == NULL || htab->elf.sgot == NULL)
-       abort ();
-
-      dyncon = (Elf32_External_Dyn *) sdyn->contents;
-      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size);
-      for (; dyncon < dynconend; dyncon++)
-       {
-         Elf_Internal_Dyn dyn;
-         asection *s;
-
-         bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
-
-         switch (dyn.d_tag)
-           {
-           default:
-             if (abed->is_vxworks
-                  && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn))
-               break;
-             continue;
-
-           case DT_PLTGOT:
-             s = htab->elf.sgotplt;
-             dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
-             break;
-
-           case DT_JMPREL:
-             s = htab->elf.srelplt;
-             dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
-             break;
-
-           case DT_PLTRELSZ:
-             s = htab->elf.srelplt;
-             dyn.d_un.d_val = s->size;
-             break;
-
-           case DT_RELSZ:
-             /* My reading of the SVR4 ABI indicates that the
-                procedure linkage table relocs (DT_JMPREL) should be
-                included in the overall relocs (DT_REL).  This is
-                what Solaris does.  However, UnixWare can not handle
-                that case.  Therefore, we override the DT_RELSZ entry
-                here to make it not include the JMPREL relocs.  */
-             s = htab->elf.srelplt;
-             if (s == NULL)
-               continue;
-             dyn.d_un.d_val -= s->size;
-             break;
-
-           case DT_REL:
-             /* We may not be using the standard ELF linker script.
-                If .rel.plt is the first .rel section, we adjust
-                DT_REL to not include it.  */
-             s = htab->elf.srelplt;
-             if (s == NULL)
-               continue;
-             if (dyn.d_un.d_ptr != s->output_section->vma + s->output_offset)
-               continue;
-             dyn.d_un.d_ptr += s->size;
-             break;
-           }
-
-         bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-       }
-
-      /* Fill in the first entry in the procedure linkage table.  */
-      if (htab->elf.splt && htab->elf.splt->size > 0)
+      if (htab->plt.has_plt0)
        {
        {
-         if (bfd_link_pic (info))
-           {
-             memcpy (htab->elf.splt->contents, abed->plt->pic_plt0_entry,
-                     abed->plt->plt0_entry_size);
-             memset (htab->elf.splt->contents + abed->plt->plt0_entry_size,
-                     abed->plt0_pad_byte,
-                     abed->plt->plt_entry_size - abed->plt->plt0_entry_size);
-           }
-         else
+         /* Fill in the special first entry in the procedure linkage
+            table.  */
+         memcpy (htab->elf.splt->contents, htab->plt.plt0_entry,
+                 htab->lazy_plt->plt0_entry_size);
+         memset (htab->elf.splt->contents + htab->lazy_plt->plt0_entry_size,
+                 htab->plt0_pad_byte,
+                 htab->plt.plt_entry_size - htab->lazy_plt->plt0_entry_size);
+         if (!bfd_link_pic (info))
            {
            {
-             memcpy (htab->elf.splt->contents, abed->plt->plt0_entry,
-                     abed->plt->plt0_entry_size);
-             memset (htab->elf.splt->contents + abed->plt->plt0_entry_size,
-                     abed->plt0_pad_byte,
-                     abed->plt->plt_entry_size - abed->plt->plt0_entry_size);
              bfd_put_32 (output_bfd,
                          (htab->elf.sgotplt->output_section->vma
                           + htab->elf.sgotplt->output_offset
                           + 4),
                          htab->elf.splt->contents
              bfd_put_32 (output_bfd,
                          (htab->elf.sgotplt->output_section->vma
                           + htab->elf.sgotplt->output_offset
                           + 4),
                          htab->elf.splt->contents
-                          + abed->plt->plt0_got1_offset);
+                         + htab->lazy_plt->plt0_got1_offset);
              bfd_put_32 (output_bfd,
                          (htab->elf.sgotplt->output_section->vma
                           + htab->elf.sgotplt->output_offset
                           + 8),
                          htab->elf.splt->contents
              bfd_put_32 (output_bfd,
                          (htab->elf.sgotplt->output_section->vma
                           + htab->elf.sgotplt->output_offset
                           + 8),
                          htab->elf.splt->contents
-                          + abed->plt->plt0_got2_offset);
+                         + htab->lazy_plt->plt0_got2_offset);
 
 
-             if (abed->is_vxworks)
+             if (htab->target_os == is_vxworks)
                {
                  Elf_Internal_Rela rel;
                {
                  Elf_Internal_Rela rel;
-
-                 /* Generate a relocation for _GLOBAL_OFFSET_TABLE_ + 4.
-                    On IA32 we use REL relocations so the addend goes in
-                    the PLT directly.  */
+                 int num_plts = (htab->elf.splt->size
+                                 / htab->plt.plt_entry_size) - 1;
+                 unsigned char *p;
+                 asection *srelplt2 = htab->srelplt2;
+
+                 /* Generate a relocation for _GLOBAL_OFFSET_TABLE_
+                    + 4.  On IA32 we use REL relocations so the
+                    addend goes in the PLT directly.  */
                  rel.r_offset = (htab->elf.splt->output_section->vma
                                  + htab->elf.splt->output_offset
                  rel.r_offset = (htab->elf.splt->output_section->vma
                                  + htab->elf.splt->output_offset
-                                 + abed->plt->plt0_got1_offset);
-                 rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_386_32);
+                                 + htab->lazy_plt->plt0_got1_offset);
+                 rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx,
+                                            R_386_32);
                  bfd_elf32_swap_reloc_out (output_bfd, &rel,
                  bfd_elf32_swap_reloc_out (output_bfd, &rel,
-                                           htab->srelplt2->contents);
-                 /* Generate a relocation for _GLOBAL_OFFSET_TABLE_ + 8.  */
+                                           srelplt2->contents);
+                 /* Generate a relocation for _GLOBAL_OFFSET_TABLE_
+                    + 8.  */
                  rel.r_offset = (htab->elf.splt->output_section->vma
                                  + htab->elf.splt->output_offset
                  rel.r_offset = (htab->elf.splt->output_section->vma
                                  + htab->elf.splt->output_offset
-                                 + abed->plt->plt0_got2_offset);
-                 rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_386_32);
+                                 + htab->lazy_plt->plt0_got2_offset);
+                 rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx,
+                                            R_386_32);
                  bfd_elf32_swap_reloc_out (output_bfd, &rel,
                  bfd_elf32_swap_reloc_out (output_bfd, &rel,
-                                           htab->srelplt2->contents +
+                                           srelplt2->contents +
                                            sizeof (Elf32_External_Rel));
                                            sizeof (Elf32_External_Rel));
-               }
-           }
-
-         /* UnixWare sets the entsize of .plt to 4, although that doesn't
-            really seem like the right value.  */
-         elf_section_data (htab->elf.splt->output_section)
-           ->this_hdr.sh_entsize = 4;
-
-         /* Correct the .rel.plt.unloaded relocations.  */
-         if (abed->is_vxworks && !bfd_link_pic (info))
-           {
-             int num_plts = (htab->elf.splt->size
-                              / abed->plt->plt_entry_size) - 1;
-             unsigned char *p;
-
-             p = htab->srelplt2->contents;
-             if (bfd_link_pic (info))
-               p += PLTRESOLVE_RELOCS_SHLIB * sizeof (Elf32_External_Rel);
-             else
-               p += PLTRESOLVE_RELOCS * sizeof (Elf32_External_Rel);
+                 /* Correct the .rel.plt.unloaded relocations.  */
+                 p = srelplt2->contents;
+                 if (bfd_link_pic (info))
+                   p += PLTRESOLVE_RELOCS_SHLIB * sizeof (Elf32_External_Rel);
+                 else
+                   p += PLTRESOLVE_RELOCS * sizeof (Elf32_External_Rel);
 
 
-             for (; num_plts; num_plts--)
-               {
-                 Elf_Internal_Rela rel;
-                 bfd_elf32_swap_reloc_in (output_bfd, p, &rel);
-                 rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_386_32);
-                 bfd_elf32_swap_reloc_out (output_bfd, &rel, p);
-                 p += sizeof (Elf32_External_Rel);
-
-                 bfd_elf32_swap_reloc_in (output_bfd, p, &rel);
-                 rel.r_info = ELF32_R_INFO (htab->elf.hplt->indx, R_386_32);
-                 bfd_elf32_swap_reloc_out (output_bfd, &rel, p);
-                 p += sizeof (Elf32_External_Rel);
+                 for (; num_plts; num_plts--)
+                   {
+                     bfd_elf32_swap_reloc_in (output_bfd, p, &rel);
+                     rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx,
+                                                R_386_32);
+                     bfd_elf32_swap_reloc_out (output_bfd, &rel, p);
+                     p += sizeof (Elf32_External_Rel);
+
+                     bfd_elf32_swap_reloc_in (output_bfd, p, &rel);
+                     rel.r_info = ELF32_R_INFO (htab->elf.hplt->indx,
+                                                R_386_32);
+                     bfd_elf32_swap_reloc_out (output_bfd, &rel, p);
+                     p += sizeof (Elf32_External_Rel);
+                   }
                }
            }
        }
     }
 
                }
            }
        }
     }
 
-  if (htab->elf.sgotplt)
-    {
-      if (bfd_is_abs_section (htab->elf.sgotplt->output_section))
-       {
-         (*_bfd_error_handler)
-           (_("discarded output section: `%A'"), htab->elf.sgotplt);
-         return FALSE;
-       }
-
-      /* Fill in the first three entries in the global offset table.  */
-      if (htab->elf.sgotplt->size > 0)
-       {
-         bfd_put_32 (output_bfd,
-                     (sdyn == NULL ? 0
-                      : sdyn->output_section->vma + sdyn->output_offset),
-                     htab->elf.sgotplt->contents);
-         bfd_put_32 (output_bfd, 0, htab->elf.sgotplt->contents + 4);
-         bfd_put_32 (output_bfd, 0, htab->elf.sgotplt->contents + 8);
-       }
+  /* Fill PLT entries for undefined weak symbols in PIE.  */
+  if (bfd_link_pie (info))
+    bfd_hash_traverse (&info->hash->table,
+                      elf_i386_pie_finish_undefweak_symbol,
+                      info);
 
 
-      elf_section_data (htab->elf.sgotplt->output_section)->this_hdr.sh_entsize = 4;
-    }
+  return TRUE;
+}
 
 
-  /* Adjust .eh_frame for .plt section.  */
-  if (htab->plt_eh_frame != NULL
-      && htab->plt_eh_frame->contents != NULL)
-    {
-      if (htab->elf.splt != NULL
-         && htab->elf.splt->size != 0
-         && (htab->elf.splt->flags & SEC_EXCLUDE) == 0
-         && htab->elf.splt->output_section != NULL
-         && htab->plt_eh_frame->output_section != NULL)
-       {
-         bfd_vma plt_start = htab->elf.splt->output_section->vma;
-         bfd_vma eh_frame_start = htab->plt_eh_frame->output_section->vma
-                                  + htab->plt_eh_frame->output_offset
-                                  + PLT_FDE_START_OFFSET;
-         bfd_put_signed_32 (dynobj, plt_start - eh_frame_start,
-                            htab->plt_eh_frame->contents
-                            + PLT_FDE_START_OFFSET);
-       }
-      if (htab->plt_eh_frame->sec_info_type
-         == SEC_INFO_TYPE_EH_FRAME)
-       {
-         if (! _bfd_elf_write_section_eh_frame (output_bfd, info,
-                                                htab->plt_eh_frame,
-                                                htab->plt_eh_frame->contents))
-           return FALSE;
-       }
-    }
+/* Fill PLT/GOT entries and allocate dynamic relocations for local
+   STT_GNU_IFUNC symbols, which aren't in the ELF linker hash table.
+   It has to be done before elf_link_sort_relocs is called so that
+   dynamic relocations are properly sorted.  */
 
 
-  if (htab->elf.sgot && htab->elf.sgot->size > 0)
-    elf_section_data (htab->elf.sgot->output_section)->this_hdr.sh_entsize = 4;
+static bfd_boolean
+elf_i386_output_arch_local_syms
+  (bfd *output_bfd ATTRIBUTE_UNUSED,
+   struct bfd_link_info *info,
+   void *flaginfo ATTRIBUTE_UNUSED,
+   int (*func) (void *, const char *,
+               Elf_Internal_Sym *,
+               asection *,
+               struct elf_link_hash_entry *) ATTRIBUTE_UNUSED)
+{
+  struct elf_x86_link_hash_table *htab
+    = elf_x86_hash_table (info, I386_ELF_DATA);
+  if (htab == NULL)
+    return FALSE;
 
   /* Fill PLT and GOT entries for local STT_GNU_IFUNC symbols.  */
   htab_traverse (htab->loc_hash_table,
 
   /* Fill PLT and GOT entries for local STT_GNU_IFUNC symbols.  */
   htab_traverse (htab->loc_hash_table,
@@ -5574,130 +4097,246 @@ elf_i386_finish_dynamic_sections (bfd *output_bfd,
   return TRUE;
 }
 
   return TRUE;
 }
 
-/* Return an array of PLT entry symbol values.  */
+/* Forward declaration.  */
+static const struct elf_x86_lazy_plt_layout elf_i386_nacl_plt;
+
+/* Similar to _bfd_elf_get_synthetic_symtab.  Support PLTs with all
+   dynamic relocations.   */
 
 
-static bfd_vma *
-elf_i386_get_plt_sym_val (bfd *abfd, asymbol **dynsyms, asection *plt,
-                         asection *relplt)
+static long
+elf_i386_get_synthetic_symtab (bfd *abfd,
+                              long symcount ATTRIBUTE_UNUSED,
+                              asymbol **syms ATTRIBUTE_UNUSED,
+                              long dynsymcount,
+                              asymbol **dynsyms,
+                              asymbol **ret)
 {
 {
-  bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean);
-  arelent *p;
-  long count, i;
-  bfd_vma *plt_sym_val;
-  bfd_vma plt_offset;
+  long count, i, n;
+  int j;
   bfd_byte *plt_contents;
   bfd_byte *plt_contents;
-  const struct elf_i386_backend_data *bed
-    = get_elf_i386_backend_data (abfd);
-  Elf_Internal_Shdr *hdr;
-
-  /* Get the .plt section contents.  */
-  plt_contents = (bfd_byte *) bfd_malloc (plt->size);
-  if (plt_contents == NULL)
-    return NULL;
-  if (!bfd_get_section_contents (abfd, (asection *) plt,
-                                plt_contents, 0, plt->size))
+  long relsize;
+  const struct elf_x86_lazy_plt_layout *lazy_plt;
+  const struct elf_x86_non_lazy_plt_layout *non_lazy_plt;
+  const struct elf_x86_lazy_plt_layout *lazy_ibt_plt;
+  const struct elf_x86_non_lazy_plt_layout *non_lazy_ibt_plt;
+  asection *plt;
+  bfd_vma got_addr;
+  enum elf_x86_plt_type plt_type;
+  struct elf_x86_plt plts[] =
     {
     {
-bad_return:
-      free (plt_contents);
-      return NULL;
-    }
+      { ".plt", NULL, NULL, plt_unknown, 0, 0, 0, 0 },
+      { ".plt.got", NULL, NULL, plt_non_lazy, 0, 0, 0, 0 },
+      { ".plt.sec", NULL, NULL, plt_second, 0, 0, 0, 0 },
+      { NULL, NULL, NULL, plt_non_lazy, 0, 0, 0, 0 }
+    };
 
 
-  slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
-  if (! (*slurp_relocs) (abfd, relplt, dynsyms, TRUE))
-    goto bad_return;
+  *ret = NULL;
 
 
-  hdr = &elf_section_data (relplt)->this_hdr;
-  count = relplt->size / hdr->sh_entsize;
+  if ((abfd->flags & (DYNAMIC | EXEC_P)) == 0)
+    return 0;
 
 
-  plt_sym_val = (bfd_vma *) bfd_malloc (sizeof (bfd_vma) * count);
-  if (plt_sym_val == NULL)
-    goto bad_return;
+  if (dynsymcount <= 0)
+    return 0;
 
 
-  for (i = 0; i < count; i++)
-    plt_sym_val[i] = -1;
+  relsize = bfd_get_dynamic_reloc_upper_bound (abfd);
+  if (relsize <= 0)
+    return -1;
 
 
-  plt_offset = bed->plt->plt_entry_size;
-  p = relplt->relocation;
-  for (i = 0; i < count; i++, p++)
+  non_lazy_plt = NULL;
+  /* Silence GCC 6.  */
+  lazy_plt = NULL;
+  non_lazy_ibt_plt = NULL;
+  lazy_ibt_plt = NULL;
+  switch (get_elf_x86_backend_data (abfd)->target_os)
     {
     {
-      long reloc_index;
+    case is_normal:
+    case is_solaris:
+      non_lazy_plt = &elf_i386_non_lazy_plt;
+      lazy_ibt_plt = &elf_i386_lazy_ibt_plt;
+      non_lazy_ibt_plt = &elf_i386_non_lazy_ibt_plt;
+      /* Fall through */
+    case is_vxworks:
+      lazy_plt = &elf_i386_lazy_plt;
+      break;
+    case is_nacl:
+      lazy_plt = &elf_i386_nacl_plt;
+      break;
+    }
 
 
-      /* Skip unknown relocation.  PR 17512: file: bc9d6cf5.  */
-      if (p->howto == NULL)
-       continue;
+  got_addr = 0;
 
 
-      if (p->howto->type != R_386_JUMP_SLOT
-         && p->howto->type != R_386_IRELATIVE)
+  count = 0;
+  for (j = 0; plts[j].name != NULL; j++)
+    {
+      plt = bfd_get_section_by_name (abfd, plts[j].name);
+      if (plt == NULL || plt->size == 0)
        continue;
 
        continue;
 
-      reloc_index = H_GET_32 (abfd, (plt_contents + plt_offset
-                                    + bed->plt->plt_reloc_offset));
-      reloc_index /= sizeof (Elf32_External_Rel);
-      if (reloc_index >= count)
-       abort ();
-      plt_sym_val[reloc_index] = plt->vma + plt_offset;
-      plt_offset += bed->plt->plt_entry_size;
-
-      /* PR binutils/18437: Skip extra relocations in the .rel.plt
-        section.  */
-      if (plt_offset >= plt->size)
+      /* Get the PLT section contents.  */
+      plt_contents = (bfd_byte *) bfd_malloc (plt->size);
+      if (plt_contents == NULL)
        break;
        break;
-    }
+      if (!bfd_get_section_contents (abfd, (asection *) plt,
+                                    plt_contents, 0, plt->size))
+       {
+         free (plt_contents);
+         break;
+       }
 
 
-  free (plt_contents);
+      /* Check what kind of PLT it is.  */
+      plt_type = plt_unknown;
+      if (plts[j].type == plt_unknown
+         && (plt->size >= (lazy_plt->plt0_entry_size
+                           + lazy_plt->plt_entry_size)))
+       {
+         /* Match lazy PLT first.  */
+         if (memcmp (plt_contents, lazy_plt->plt0_entry,
+                     lazy_plt->plt0_got1_offset) == 0)
+           {
+             /* The fist entry in the lazy IBT PLT is the same as the
+                normal lazy PLT.  */
+             if (lazy_ibt_plt != NULL
+                 && (memcmp (plt_contents + lazy_ibt_plt->plt0_entry_size,
+                             lazy_ibt_plt->plt_entry,
+                             lazy_ibt_plt->plt_got_offset) == 0))
+               plt_type = plt_lazy | plt_second;
+             else
+               plt_type = plt_lazy;
+           }
+         else if (memcmp (plt_contents, lazy_plt->pic_plt0_entry,
+                          lazy_plt->plt0_got1_offset) == 0)
+           {
+             /* The fist entry in the PIC lazy IBT PLT is the same as
+                the normal PIC lazy PLT.  */
+             if (lazy_ibt_plt != NULL
+                 && (memcmp (plt_contents + lazy_ibt_plt->plt0_entry_size,
+                             lazy_ibt_plt->pic_plt_entry,
+                             lazy_ibt_plt->plt_got_offset) == 0))
+               plt_type = plt_lazy | plt_pic | plt_second;
+             else
+               plt_type = plt_lazy | plt_pic;
+           }
+       }
 
 
-  return plt_sym_val;
-}
+      if (non_lazy_plt != NULL
+         && (plt_type == plt_unknown || plt_type == plt_non_lazy)
+         && plt->size >= non_lazy_plt->plt_entry_size)
+       {
+         /* Match non-lazy PLT.  */
+         if (memcmp (plt_contents, non_lazy_plt->plt_entry,
+                     non_lazy_plt->plt_got_offset) == 0)
+           plt_type = plt_non_lazy;
+         else if (memcmp (plt_contents, non_lazy_plt->pic_plt_entry,
+                          non_lazy_plt->plt_got_offset) == 0)
+           plt_type = plt_pic;
+       }
 
 
-/* Similar to _bfd_elf_get_synthetic_symtab.  */
+      if ((non_lazy_ibt_plt != NULL)
+         && (plt_type == plt_unknown || plt_type == plt_second)
+         && plt->size >= non_lazy_ibt_plt->plt_entry_size)
+       {
+         if (memcmp (plt_contents,
+                     non_lazy_ibt_plt->plt_entry,
+                     non_lazy_ibt_plt->plt_got_offset) == 0)
+           {
+             /* Match IBT PLT.  */
+             plt_type = plt_second;
+             non_lazy_plt = non_lazy_ibt_plt;
+           }
+         else if (memcmp (plt_contents,
+                          non_lazy_ibt_plt->pic_plt_entry,
+                          non_lazy_ibt_plt->plt_got_offset) == 0)
+           {
+             /* Match PIC IBT PLT.  */
+             plt_type = plt_second | plt_pic;
+             non_lazy_plt = non_lazy_ibt_plt;
+           }
+       }
 
 
-static long
-elf_i386_get_synthetic_symtab (bfd *abfd,
-                              long symcount,
-                              asymbol **syms,
-                              long dynsymcount,
-                              asymbol **dynsyms,
-                              asymbol **ret)
-{
-  asection *plt = bfd_get_section_by_name (abfd, ".plt");
-  return _bfd_elf_ifunc_get_synthetic_symtab (abfd, symcount, syms,
-                                             dynsymcount, dynsyms, ret,
-                                             plt,
-                                             elf_i386_get_plt_sym_val);
-}
+      if (plt_type == plt_unknown)
+       {
+         free (plt_contents);
+         continue;
+       }
 
 
-/* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+      plts[j].sec = plt;
+      plts[j].type = plt_type;
 
 
-static bfd_boolean
-elf_i386_hash_symbol (struct elf_link_hash_entry *h)
-{
-  if (h->plt.offset != (bfd_vma) -1
-      && !h->def_regular
-      && !h->pointer_equality_needed)
-    return FALSE;
+      if ((plt_type & plt_lazy))
+       {
+         plts[j].plt_got_offset = lazy_plt->plt_got_offset;
+         plts[j].plt_entry_size = lazy_plt->plt_entry_size;
+         /* Skip PLT0 in lazy PLT.  */
+         i = 1;
+       }
+      else
+       {
+         plts[j].plt_got_offset = non_lazy_plt->plt_got_offset;
+         plts[j].plt_entry_size = non_lazy_plt->plt_entry_size;
+         i = 0;
+       }
+
+      /* Skip lazy PLT when the second PLT is used.  */
+      if ((plt_type & (plt_lazy | plt_second))
+         == (plt_lazy | plt_second))
+       plts[j].count = 0;
+      else
+       {
+         n = plt->size / plts[j].plt_entry_size;
+         plts[j].count = n;
+         count += n - i;
+       }
+
+      plts[j].contents = plt_contents;
+
+      /* The _GLOBAL_OFFSET_TABLE_ address is needed.  */
+      if ((plt_type & plt_pic))
+       got_addr = (bfd_vma) -1;
+    }
 
 
-  return _bfd_elf_hash_symbol (h);
+  return _bfd_x86_elf_get_synthetic_symtab (abfd, count, relsize,
+                                           got_addr, plts, dynsyms,
+                                           ret);
 }
 
 }
 
-/* Hook called by the linker routine which adds symbols from an object
-   file.  */
+/* Set up i386 GNU properties.  Return the first relocatable ELF input
+   with GNU properties if found.  Otherwise, return NULL.  */
 
 
-static bfd_boolean
-elf_i386_add_symbol_hook (bfd * abfd,
-                         struct bfd_link_info * info,
-                         Elf_Internal_Sym * sym,
-                         const char ** namep ATTRIBUTE_UNUSED,
-                         flagword * flagsp ATTRIBUTE_UNUSED,
-                         asection ** secp ATTRIBUTE_UNUSED,
-                         bfd_vma * valp ATTRIBUTE_UNUSED)
+static bfd *
+elf_i386_link_setup_gnu_properties (struct bfd_link_info *info)
 {
 {
-  if (ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE
-      && (abfd->flags & DYNAMIC) == 0
-      && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour)
-    elf_tdata (info->output_bfd)->has_gnu_symbols
-      |= elf_gnu_symbol_unique;
+  struct elf_x86_init_table init_table;
 
 
-  return TRUE;
+  switch (get_elf_x86_backend_data (info->output_bfd)->target_os)
+    {
+    case is_normal:
+    case is_solaris:
+      init_table.plt0_pad_byte = 0x0;
+      init_table.lazy_plt = &elf_i386_lazy_plt;
+      init_table.non_lazy_plt = &elf_i386_non_lazy_plt;
+      init_table.lazy_ibt_plt = &elf_i386_lazy_ibt_plt;
+      init_table.non_lazy_ibt_plt = &elf_i386_non_lazy_ibt_plt;
+      break;
+    case is_vxworks:
+      init_table.plt0_pad_byte = 0x90;
+      init_table.lazy_plt = &elf_i386_lazy_plt;
+      init_table.non_lazy_plt = NULL;
+      init_table.lazy_ibt_plt = NULL;
+      init_table.non_lazy_ibt_plt = NULL;
+      break;
+    case is_nacl:
+      init_table.plt0_pad_byte = 0x90;
+      init_table.lazy_plt = &elf_i386_nacl_plt;
+      init_table.non_lazy_plt = NULL;
+      init_table.lazy_ibt_plt = NULL;
+      init_table.non_lazy_ibt_plt = NULL;
+      break;
+    }
+
+  init_table.r_info = elf32_r_info;
+  init_table.r_sym = elf32_r_sym;
+
+  return _bfd_x86_elf_link_setup_gnu_properties (info, &init_table);
 }
 
 #define TARGET_LITTLE_SYM              i386_elf32_vec
 }
 
 #define TARGET_LITTLE_SYM              i386_elf32_vec
@@ -5714,40 +4353,37 @@ elf_i386_add_symbol_hook (bfd * abfd,
 #define elf_backend_want_plt_sym       0
 #define elf_backend_got_header_size    12
 #define elf_backend_plt_alignment      4
 #define elf_backend_want_plt_sym       0
 #define elf_backend_got_header_size    12
 #define elf_backend_plt_alignment      4
+#define elf_backend_dtrel_excludes_plt 1
 #define elf_backend_extern_protected_data 1
 #define elf_backend_extern_protected_data 1
+#define elf_backend_caches_rawsize     1
+#define elf_backend_want_dynrelro      1
 
 /* Support RELA for objdump of prelink objects.  */
 #define elf_info_to_howto                    elf_i386_info_to_howto_rel
 #define elf_info_to_howto_rel                elf_i386_info_to_howto_rel
 
 
 /* Support RELA for objdump of prelink objects.  */
 #define elf_info_to_howto                    elf_i386_info_to_howto_rel
 #define elf_info_to_howto_rel                elf_i386_info_to_howto_rel
 
-#define bfd_elf32_mkobject                   elf_i386_mkobject
-
 #define bfd_elf32_bfd_is_local_label_name     elf_i386_is_local_label_name
 #define bfd_elf32_bfd_is_local_label_name     elf_i386_is_local_label_name
-#define bfd_elf32_bfd_link_hash_table_create  elf_i386_link_hash_table_create
 #define bfd_elf32_bfd_reloc_type_lookup              elf_i386_reloc_type_lookup
 #define bfd_elf32_bfd_reloc_name_lookup              elf_i386_reloc_name_lookup
 #define bfd_elf32_get_synthetic_symtab       elf_i386_get_synthetic_symtab
 
 #define bfd_elf32_bfd_reloc_type_lookup              elf_i386_reloc_type_lookup
 #define bfd_elf32_bfd_reloc_name_lookup              elf_i386_reloc_name_lookup
 #define bfd_elf32_get_synthetic_symtab       elf_i386_get_synthetic_symtab
 
-#define elf_backend_adjust_dynamic_symbol     elf_i386_adjust_dynamic_symbol
 #define elf_backend_relocs_compatible        _bfd_elf_relocs_compatible
 #define elf_backend_check_relocs             elf_i386_check_relocs
 #define elf_backend_relocs_compatible        _bfd_elf_relocs_compatible
 #define elf_backend_check_relocs             elf_i386_check_relocs
-#define elf_backend_copy_indirect_symbol      elf_i386_copy_indirect_symbol
-#define elf_backend_create_dynamic_sections   elf_i386_create_dynamic_sections
+#define elf_backend_create_dynamic_sections   _bfd_elf_create_dynamic_sections
 #define elf_backend_fake_sections            elf_i386_fake_sections
 #define elf_backend_finish_dynamic_sections   elf_i386_finish_dynamic_sections
 #define elf_backend_finish_dynamic_symbol     elf_i386_finish_dynamic_symbol
 #define elf_backend_fake_sections            elf_i386_fake_sections
 #define elf_backend_finish_dynamic_sections   elf_i386_finish_dynamic_sections
 #define elf_backend_finish_dynamic_symbol     elf_i386_finish_dynamic_symbol
-#define elf_backend_gc_mark_hook             elf_i386_gc_mark_hook
-#define elf_backend_gc_sweep_hook            elf_i386_gc_sweep_hook
+#define elf_backend_output_arch_local_syms     elf_i386_output_arch_local_syms
 #define elf_backend_grok_prstatus            elf_i386_grok_prstatus
 #define elf_backend_grok_psinfo                      elf_i386_grok_psinfo
 #define elf_backend_reloc_type_class         elf_i386_reloc_type_class
 #define elf_backend_relocate_section         elf_i386_relocate_section
 #define elf_backend_grok_prstatus            elf_i386_grok_prstatus
 #define elf_backend_grok_psinfo                      elf_i386_grok_psinfo
 #define elf_backend_reloc_type_class         elf_i386_reloc_type_class
 #define elf_backend_relocate_section         elf_i386_relocate_section
-#define elf_backend_size_dynamic_sections     elf_i386_size_dynamic_sections
-#define elf_backend_always_size_sections      elf_i386_always_size_sections
-#define elf_backend_omit_section_dynsym \
-  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
-#define elf_backend_hash_symbol                      elf_i386_hash_symbol
-#define elf_backend_add_symbol_hook           elf_i386_add_symbol_hook
+#define elf_backend_setup_gnu_properties      elf_i386_link_setup_gnu_properties
+#define elf_backend_hide_symbol                      _bfd_x86_elf_hide_symbol
+
+#define elf_backend_linux_prpsinfo32_ugid16    TRUE
+
+#define        elf32_bed                             elf32_i386_bed
 
 #include "elf32-target.h"
 
 
 #include "elf32-target.h"
 
@@ -5764,10 +4400,11 @@ elf_i386_add_symbol_hook (bfd * abfd,
    "FreeBSD" label in the ELF header.  So we put this label on all
    executables and (for simplicity) also all other object files.  */
 
    "FreeBSD" label in the ELF header.  So we put this label on all
    executables and (for simplicity) also all other object files.  */
 
-static void
-elf_i386_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
+static bfd_boolean
+elf_i386_fbsd_init_file_header (bfd *abfd, struct bfd_link_info *info)
 {
 {
-  _bfd_elf_post_process_headers (abfd, info);
+  if (!_bfd_elf_init_file_header (abfd, info))
+    return FALSE;
 
 #ifdef OLD_FREEBSD_ABI_LABEL
   {
 
 #ifdef OLD_FREEBSD_ABI_LABEL
   {
@@ -5776,10 +4413,11 @@ elf_i386_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
     memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8);
   }
 #endif
     memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8);
   }
 #endif
+  return TRUE;
 }
 
 }
 
-#undef elf_backend_post_process_headers
-#define        elf_backend_post_process_headers        elf_i386_fbsd_post_process_headers
+#undef elf_backend_init_file_header
+#define        elf_backend_init_file_header    elf_i386_fbsd_init_file_header
 #undef elf32_bed
 #define        elf32_bed                               elf32_i386_fbsd_bed
 
 #undef elf32_bed
 #define        elf32_bed                               elf32_i386_fbsd_bed
 
@@ -5787,6 +4425,8 @@ elf_i386_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
 
 #include "elf32-target.h"
 
 
 #include "elf32-target.h"
 
+#undef elf_backend_init_file_header
+
 /* Solaris 2.  */
 
 #undef TARGET_LITTLE_SYM
 /* Solaris 2.  */
 
 #undef TARGET_LITTLE_SYM
@@ -5794,7 +4434,13 @@ elf_i386_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
 #undef TARGET_LITTLE_NAME
 #define        TARGET_LITTLE_NAME              "elf32-i386-sol2"
 
 #undef TARGET_LITTLE_NAME
 #define        TARGET_LITTLE_NAME              "elf32-i386-sol2"
 
-#undef elf_backend_post_process_headers
+static const struct elf_x86_backend_data elf_i386_solaris_arch_bed =
+  {
+    is_solaris                         /* os */
+  };
+
+#undef elf_backend_arch_data
+#define        elf_backend_arch_data           &elf_i386_solaris_arch_bed
 
 /* Restore default: we cannot use ELFOSABI_SOLARIS, otherwise ELFOSABI_NONE
    objects won't be recognized.  */
 
 /* Restore default: we cannot use ELFOSABI_SOLARIS, otherwise ELFOSABI_NONE
    objects won't be recognized.  */
@@ -5805,16 +4451,99 @@ elf_i386_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
 
 /* The 32-bit static TLS arena size is rounded to the nearest 8-byte
    boundary.  */
 
 /* The 32-bit static TLS arena size is rounded to the nearest 8-byte
    boundary.  */
-#undef elf_backend_static_tls_alignment
+#undef  elf_backend_static_tls_alignment
 #define elf_backend_static_tls_alignment 8
 
 /* The Solaris 2 ABI requires a plt symbol on all platforms.
 
    Cf. Linker and Libraries Guide, Ch. 2, Link-Editor, Generating the Output
    File, p.63.  */
 #define elf_backend_static_tls_alignment 8
 
 /* The Solaris 2 ABI requires a plt symbol on all platforms.
 
    Cf. Linker and Libraries Guide, Ch. 2, Link-Editor, Generating the Output
    File, p.63.  */
-#undef elf_backend_want_plt_sym
+#undef  elf_backend_want_plt_sym
 #define elf_backend_want_plt_sym       1
 
 #define elf_backend_want_plt_sym       1
 
+#undef  elf_backend_strtab_flags
+#define elf_backend_strtab_flags       SHF_STRINGS
+
+/* Called to set the sh_flags, sh_link and sh_info fields of OSECTION which
+   has a type >= SHT_LOOS.  Returns TRUE if these fields were initialised
+   FALSE otherwise.  ISECTION is the best guess matching section from the
+   input bfd IBFD, but it might be NULL.  */
+
+static bfd_boolean
+elf32_i386_copy_solaris_special_section_fields (const bfd *ibfd ATTRIBUTE_UNUSED,
+                                               bfd *obfd ATTRIBUTE_UNUSED,
+                                               const Elf_Internal_Shdr *isection ATTRIBUTE_UNUSED,
+                                               Elf_Internal_Shdr *osection ATTRIBUTE_UNUSED)
+{
+  /* PR 19938: FIXME: Need to add code for setting the sh_info
+     and sh_link fields of Solaris specific section types.  */
+  return FALSE;
+
+  /* Based upon Oracle Solaris 11.3 Linkers and Libraries Guide, Ch. 13,
+     Object File Format, Table 13-9  ELF sh_link and sh_info Interpretation:
+
+http://docs.oracle.com/cd/E53394_01/html/E54813/chapter6-94076.html#scrolltoc
+
+     The following values should be set:
+
+Type                Link                           Info
+-----------------------------------------------------------------------------
+SHT_SUNW_ancillary   The section header index of    0
+ [0x6fffffee]       the associated string table.
+
+SHT_SUNW_capinfo     The section header index of    For a dynamic object, the
+ [0x6ffffff0]       the associated symbol table.   section header index of
+                                                   the associated
+                                                   SHT_SUNW_capchain table,
+                                                   otherwise 0.
+
+SHT_SUNW_symsort     The section header index of    0
+ [0x6ffffff1]       the associated symbol table.
+
+SHT_SUNW_tlssort     The section header index of    0
+ [0x6ffffff2]       the associated symbol table.
+
+SHT_SUNW_LDYNSYM     The section header index of    One greater than the
+ [0x6ffffff3]       the associated string table.   symbol table index of the
+                    This index is the same string  last local symbol,
+                    table used by the SHT_DYNSYM   STB_LOCAL. Since
+                    section.                       SHT_SUNW_LDYNSYM only
+                                                   contains local symbols,
+                                                   sh_info is equivalent to
+                                                   the number of symbols in
+                                                   the table.
+
+SHT_SUNW_cap        If symbol capabilities exist,  If any capabilities refer
+ [0x6ffffff5]       the section header index of    to named strings, the
+                    the associated                 section header index of
+                    SHT_SUNW_capinfo table,        the associated string
+                         otherwise 0.              table, otherwise 0.
+
+SHT_SUNW_move       The section header index of    0
+ [0x6ffffffa]       the associated symbol table.
+
+SHT_SUNW_COMDAT             0                              0
+ [0x6ffffffb]
+
+SHT_SUNW_syminfo     The section header index of    The section header index
+ [0x6ffffffc]       the associated symbol table.   of the associated
+                                                   .dynamic section.
+
+SHT_SUNW_verdef             The section header index of    The number of version
+ [0x6ffffffd]       the associated string table.   definitions within the
+                                                   section.
+
+SHT_SUNW_verneed     The section header index of    The number of version
+ [0x6ffffffe]       the associated string table.   dependencies within the
+                                                   section.
+
+SHT_SUNW_versym             The section header index of    0
+ [0x6fffffff]       the associated symbol table.  */
+}
+
+#undef  elf_backend_copy_special_section_fields
+#define elf_backend_copy_special_section_fields elf32_i386_copy_solaris_special_section_fields
+
 #include "elf32-target.h"
 
 /* Intel MCU support.  */
 #include "elf32-target.h"
 
 /* Intel MCU support.  */
@@ -5831,12 +4560,15 @@ elf32_iamcu_elf_object_p (bfd *abfd)
 #define TARGET_LITTLE_SYM              iamcu_elf32_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME             "elf32-iamcu"
 #define TARGET_LITTLE_SYM              iamcu_elf32_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME             "elf32-iamcu"
-#undef ELF_ARCH
+#undef  ELF_ARCH
 #define ELF_ARCH                       bfd_arch_iamcu
 
 #undef ELF_MACHINE_CODE
 #define        ELF_MACHINE_CODE                EM_IAMCU
 
 #define ELF_ARCH                       bfd_arch_iamcu
 
 #undef ELF_MACHINE_CODE
 #define        ELF_MACHINE_CODE                EM_IAMCU
 
+#undef elf_backend_arch_data
+#define        elf_backend_arch_data           &elf_i386_arch_bed
+
 #undef ELF_OSABI
 
 #undef  elf32_bed
 #undef ELF_OSABI
 
 #undef  elf32_bed
@@ -5848,7 +4580,10 @@ elf32_iamcu_elf_object_p (bfd *abfd)
 #undef elf_backend_static_tls_alignment
 
 #undef elf_backend_want_plt_sym
 #undef elf_backend_static_tls_alignment
 
 #undef elf_backend_want_plt_sym
-#define elf_backend_want_plt_sym           0
+#define elf_backend_want_plt_sym       0
+
+#undef  elf_backend_strtab_flags
+#undef  elf_backend_copy_special_section_fields
 
 #include "elf32-target.h"
 
 
 #include "elf32-target.h"
 
@@ -5874,7 +4609,6 @@ elf32_iamcu_elf_object_p (bfd *abfd)
 #undef ELF_OSABI
 #undef elf_backend_want_plt_sym
 #define elf_backend_want_plt_sym       0
 #undef ELF_OSABI
 #undef elf_backend_want_plt_sym
 #define elf_backend_want_plt_sym       0
-#undef elf_backend_post_process_headers
 #undef elf_backend_static_tls_alignment
 
 /* NaCl uses substantially different PLT entries for the same effects.  */
 #undef elf_backend_static_tls_alignment
 
 /* NaCl uses substantially different PLT entries for the same effects.  */
@@ -5887,9 +4621,9 @@ elf32_iamcu_elf_object_p (bfd *abfd)
 static const bfd_byte elf_i386_nacl_plt0_entry[] =
   {
     0xff, 0x35,                          /* pushl contents of address */
 static const bfd_byte elf_i386_nacl_plt0_entry[] =
   {
     0xff, 0x35,                          /* pushl contents of address */
-    0, 0, 0, 0,                          /* replaced with address of .got + 4.  */
-    0x8b, 0x0d,                   /* movl contents of address, %ecx */
-    0, 0, 0, 0,                          /* replaced with address of .got + 8.  */
+    0, 0, 0, 0,                          /* replaced with address of .got + 4.  */
+    0x8b, 0x0d,                          /* movl contents of address, %ecx */
+    0, 0, 0, 0,                          /* replaced with address of .got + 8.  */
     0x83, 0xe1, NACLMASK,        /* andl $NACLMASK, %ecx */
     0xff, 0xe1                   /* jmp *%ecx */
   };
     0x83, 0xe1, NACLMASK,        /* andl $NACLMASK, %ecx */
     0xff, 0xe1                   /* jmp *%ecx */
   };
@@ -5901,7 +4635,7 @@ static const bfd_byte elf_i386_nacl_plt_entry[NACL_PLT_ENTRY_SIZE] =
     0x83, 0xe1, NACLMASK,              /* andl $NACLMASK, %ecx */
     0xff, 0xe1,                                /* jmp *%ecx */
 
     0x83, 0xe1, NACLMASK,              /* andl $NACLMASK, %ecx */
     0xff, 0xe1,                                /* jmp *%ecx */
 
-    /* Pad to the next 32-byte boundary with nop instructions. */
+    /* Pad to the next 32-byte boundary with nop instructions.  */
     0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
@@ -5910,9 +4644,9 @@ static const bfd_byte elf_i386_nacl_plt_entry[NACL_PLT_ENTRY_SIZE] =
     0x68,                             /* pushl immediate */
     0, 0, 0, 0,                               /* replaced with reloc offset.  */
     0xe9,                             /* jmp relative */
     0x68,                             /* pushl immediate */
     0, 0, 0, 0,                               /* replaced with reloc offset.  */
     0xe9,                             /* jmp relative */
-    0, 0, 0, 0,                               /* replaced with offset to .plt.  */
+    0, 0, 0, 0,                               /* replaced with offset to .plt.  */
 
 
-    /* Pad to the next 32-byte boundary with nop instructions. */
+    /* Pad to the next 32-byte boundary with nop instructions.  */
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90
@@ -5933,23 +4667,23 @@ elf_i386_nacl_pic_plt0_entry[sizeof (elf_i386_nacl_plt0_entry)] =
 
 static const bfd_byte elf_i386_nacl_pic_plt_entry[NACL_PLT_ENTRY_SIZE] =
   {
 
 static const bfd_byte elf_i386_nacl_pic_plt_entry[NACL_PLT_ENTRY_SIZE] =
   {
-    0x8b, 0x8b,          /* movl offset(%ebx), %ecx */
-    0, 0, 0, 0,          /* replaced with offset of this symbol in .got.  */
-    0x83, 0xe1, 0xe0,    /* andl $NACLMASK, %ecx */
-    0xff, 0xe1,          /* jmp *%ecx */
+    0x8b, 0x8b,                 /* movl offset(%ebx), %ecx */
+    0, 0, 0, 0,                 /* replaced with offset of this symbol in .got.  */
+    0x83, 0xe1, 0xe0,   /* andl $NACLMASK, %ecx */
+    0xff, 0xe1,                 /* jmp *%ecx */
 
 
-    /* Pad to the next 32-byte boundary with nop instructions. */
+    /* Pad to the next 32-byte boundary with nop instructions.  */
     0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
 
     /* Lazy GOT entries point here (32-byte aligned).  */
     0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
 
     /* Lazy GOT entries point here (32-byte aligned).  */
-    0x68,                /* pushl immediate */
-    0, 0, 0, 0,          /* replaced with offset into relocation table.  */
-    0xe9,                /* jmp relative */
-    0, 0, 0, 0,          /* replaced with offset to start of .plt.  */
+    0x68,               /* pushl immediate */
+    0, 0, 0, 0,                 /* replaced with offset into relocation table.  */
+    0xe9,               /* jmp relative */
+    0, 0, 0, 0,                 /* replaced with offset to start of .plt.  */
 
 
-    /* Pad to the next 32-byte boundary with nop instructions. */
+    /* Pad to the next 32-byte boundary with nop instructions.  */
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
     0x90, 0x90
@@ -5957,66 +4691,73 @@ static const bfd_byte elf_i386_nacl_pic_plt_entry[NACL_PLT_ENTRY_SIZE] =
 
 static const bfd_byte elf_i386_nacl_eh_frame_plt[] =
   {
 
 static const bfd_byte elf_i386_nacl_eh_frame_plt[] =
   {
-#if (PLT_CIE_LENGTH != 20                               \
-     || PLT_FDE_LENGTH != 36                            \
-     || PLT_FDE_START_OFFSET != 4 + PLT_CIE_LENGTH + 8  \
+#if (PLT_CIE_LENGTH != 20                              \
+     || PLT_FDE_LENGTH != 36                           \
+     || PLT_FDE_START_OFFSET != 4 + PLT_CIE_LENGTH + 8 \
      || PLT_FDE_LEN_OFFSET != 4 + PLT_CIE_LENGTH + 12)
      || PLT_FDE_LEN_OFFSET != 4 + PLT_CIE_LENGTH + 12)
-# error "Need elf_i386_backend_data parameters for eh_frame_plt offsets!"
+# error "Need elf_x86_backend_data parameters for eh_frame_plt offsets!"
 #endif
     PLT_CIE_LENGTH, 0, 0, 0,           /* CIE length */
 #endif
     PLT_CIE_LENGTH, 0, 0, 0,           /* CIE length */
-    0, 0, 0, 0,                         /* CIE ID */
-    1,                                  /* CIE version */
-    'z', 'R', 0,                        /* Augmentation string */
-    1,                                  /* Code alignment factor */
-    0x7c,                               /* Data alignment factor: -4 */
-    8,                                  /* Return address column */
+    0, 0, 0, 0,                                /* CIE ID */
+    1,                                 /* CIE version */
+    'z', 'R', 0,                       /* Augmentation string */
+    1,                                 /* Code alignment factor */
+    0x7c,                              /* Data alignment factor: -4 */
+    8,                                 /* Return address column */
     1,                                 /* Augmentation size */
     DW_EH_PE_pcrel | DW_EH_PE_sdata4,  /* FDE encoding */
     DW_CFA_def_cfa, 4, 4,              /* DW_CFA_def_cfa: r4 (esp) ofs 4 */
     DW_CFA_offset + 8, 1,              /* DW_CFA_offset: r8 (eip) at cfa-4 */
     DW_CFA_nop, DW_CFA_nop,
 
     1,                                 /* Augmentation size */
     DW_EH_PE_pcrel | DW_EH_PE_sdata4,  /* FDE encoding */
     DW_CFA_def_cfa, 4, 4,              /* DW_CFA_def_cfa: r4 (esp) ofs 4 */
     DW_CFA_offset + 8, 1,              /* DW_CFA_offset: r8 (eip) at cfa-4 */
     DW_CFA_nop, DW_CFA_nop,
 
-    PLT_FDE_LENGTH, 0, 0, 0,     /* FDE length */
+    PLT_FDE_LENGTH, 0, 0, 0,    /* FDE length */
     PLT_CIE_LENGTH + 8, 0, 0, 0, /* CIE pointer */
     PLT_CIE_LENGTH + 8, 0, 0, 0, /* CIE pointer */
-    0, 0, 0, 0,                  /* R_386_PC32 .plt goes here */
-    0, 0, 0, 0,                  /* .plt size goes here */
-    0,                           /* Augmentation size */
-    DW_CFA_def_cfa_offset, 8,    /* DW_CFA_def_cfa_offset: 8 */
-    DW_CFA_advance_loc + 6,      /* DW_CFA_advance_loc: 6 to __PLT__+6 */
-    DW_CFA_def_cfa_offset, 12,   /* DW_CFA_def_cfa_offset: 12 */
-    DW_CFA_advance_loc + 58,     /* DW_CFA_advance_loc: 58 to __PLT__+64 */
-    DW_CFA_def_cfa_expression,   /* DW_CFA_def_cfa_expression */
-    13,                          /* Block length */
-    DW_OP_breg4, 4,              /* DW_OP_breg4 (esp): 4 */
-    DW_OP_breg8, 0,              /* DW_OP_breg8 (eip): 0 */
+    0, 0, 0, 0,                         /* R_386_PC32 .plt goes here */
+    0, 0, 0, 0,                         /* .plt size goes here */
+    0,                          /* Augmentation size */
+    DW_CFA_def_cfa_offset, 8,   /* DW_CFA_def_cfa_offset: 8 */
+    DW_CFA_advance_loc + 6,     /* DW_CFA_advance_loc: 6 to __PLT__+6 */
+    DW_CFA_def_cfa_offset, 12,  /* DW_CFA_def_cfa_offset: 12 */
+    DW_CFA_advance_loc + 58,    /* DW_CFA_advance_loc: 58 to __PLT__+64 */
+    DW_CFA_def_cfa_expression,  /* DW_CFA_def_cfa_expression */
+    13,                                 /* Block length */
+    DW_OP_breg4, 4,             /* DW_OP_breg4 (esp): 4 */
+    DW_OP_breg8, 0,             /* DW_OP_breg8 (eip): 0 */
     DW_OP_const1u, 63, DW_OP_and, DW_OP_const1u, 37, DW_OP_ge,
     DW_OP_lit2, DW_OP_shl, DW_OP_plus,
     DW_CFA_nop, DW_CFA_nop
   };
 
     DW_OP_const1u, 63, DW_OP_and, DW_OP_const1u, 37, DW_OP_ge,
     DW_OP_lit2, DW_OP_shl, DW_OP_plus,
     DW_CFA_nop, DW_CFA_nop
   };
 
-static const struct elf_i386_plt_layout elf_i386_nacl_plt =
+static const struct elf_x86_lazy_plt_layout elf_i386_nacl_plt =
   {
     elf_i386_nacl_plt0_entry,          /* plt0_entry */
     sizeof (elf_i386_nacl_plt0_entry), /* plt0_entry_size */
   {
     elf_i386_nacl_plt0_entry,          /* plt0_entry */
     sizeof (elf_i386_nacl_plt0_entry), /* plt0_entry_size */
-    2,                                 /* plt0_got1_offset */
-    8,                                 /* plt0_got2_offset */
     elf_i386_nacl_plt_entry,           /* plt_entry */
     NACL_PLT_ENTRY_SIZE,               /* plt_entry_size */
     elf_i386_nacl_plt_entry,           /* plt_entry */
     NACL_PLT_ENTRY_SIZE,               /* plt_entry_size */
+    NULL,                              /* plt_tlsdesc_entry */
+    0,                                 /* plt_tlsdesc_entry_size*/
+    0,                                 /* plt_tlsdesc_got1_offset */
+    0,                                 /* plt_tlsdesc_got2_offset */
+    0,                                 /* plt_tlsdesc_got1_insn_end */
+    0,                                 /* plt_tlsdesc_got2_insn_end */
+    2,                                 /* plt0_got1_offset */
+    8,                                 /* plt0_got2_offset */
+    0,                                 /* plt0_got2_insn_end */
     2,                                 /* plt_got_offset */
     33,                                        /* plt_reloc_offset */
     38,                                        /* plt_plt_offset */
     2,                                 /* plt_got_offset */
     33,                                        /* plt_reloc_offset */
     38,                                        /* plt_plt_offset */
+    0,                                 /* plt_got_insn_size */
+    0,                                 /* plt_plt_insn_end */
     32,                                        /* plt_lazy_offset */
     elf_i386_nacl_pic_plt0_entry,      /* pic_plt0_entry */
     elf_i386_nacl_pic_plt_entry,       /* pic_plt_entry */
     elf_i386_nacl_eh_frame_plt,                /* eh_frame_plt */
     32,                                        /* plt_lazy_offset */
     elf_i386_nacl_pic_plt0_entry,      /* pic_plt0_entry */
     elf_i386_nacl_pic_plt_entry,       /* pic_plt_entry */
     elf_i386_nacl_eh_frame_plt,                /* eh_frame_plt */
-    sizeof (elf_i386_nacl_eh_frame_plt),/* eh_frame_plt_size */
+    sizeof (elf_i386_nacl_eh_frame_plt) /* eh_frame_plt_size */
   };
 
   };
 
-static const struct elf_i386_backend_data elf_i386_nacl_arch_bed =
+static const struct elf_x86_backend_data elf_i386_nacl_arch_bed =
   {
   {
-    &elf_i386_nacl_plt,                      /* plt */
-    0x90,                              /* plt0_pad_byte: nop insn */
-    0,                                  /* is_vxworks */
+    is_nacl                            /* os */
   };
 
 static bfd_boolean
   };
 
 static bfd_boolean
@@ -6034,8 +4775,8 @@ elf32_i386_nacl_elf_object_p (bfd *abfd)
 #define elf_backend_object_p                   elf32_i386_nacl_elf_object_p
 #undef elf_backend_modify_segment_map
 #define        elf_backend_modify_segment_map          nacl_modify_segment_map
 #define elf_backend_object_p                   elf32_i386_nacl_elf_object_p
 #undef elf_backend_modify_segment_map
 #define        elf_backend_modify_segment_map          nacl_modify_segment_map
-#undef elf_backend_modify_program_headers
-#define        elf_backend_modify_program_headers      nacl_modify_program_headers
+#undef elf_backend_modify_headers
+#define        elf_backend_modify_headers              nacl_modify_headers
 #undef elf_backend_final_write_processing
 #define elf_backend_final_write_processing     nacl_final_write_processing
 
 #undef elf_backend_final_write_processing
 #define elf_backend_final_write_processing     nacl_final_write_processing
 
@@ -6044,7 +4785,7 @@ elf32_i386_nacl_elf_object_p (bfd *abfd)
 /* Restore defaults.  */
 #undef elf_backend_object_p
 #undef elf_backend_modify_segment_map
 /* Restore defaults.  */
 #undef elf_backend_object_p
 #undef elf_backend_modify_segment_map
-#undef elf_backend_modify_program_headers
+#undef elf_backend_modify_headers
 #undef elf_backend_final_write_processing
 
 /* VxWorks support.  */
 #undef elf_backend_final_write_processing
 
 /* VxWorks support.  */
@@ -6054,14 +4795,14 @@ elf32_i386_nacl_elf_object_p (bfd *abfd)
 #undef TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME             "elf32-i386-vxworks"
 #undef ELF_OSABI
 #undef TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME             "elf32-i386-vxworks"
 #undef ELF_OSABI
+#undef ELF_MAXPAGESIZE
+#define ELF_MAXPAGESIZE                        0x1000
 #undef elf_backend_plt_alignment
 #define elf_backend_plt_alignment      4
 
 #undef elf_backend_plt_alignment
 #define elf_backend_plt_alignment      4
 
-static const struct elf_i386_backend_data elf_i386_vxworks_arch_bed =
+static const struct elf_x86_backend_data elf_i386_vxworks_arch_bed =
   {
   {
-    &elf_i386_plt,                      /* plt */
-    0x90,                               /* plt0_pad_byte */
-    1,                                  /* is_vxworks */
+    is_vxworks                         /* os */
   };
 
 #undef elf_backend_arch_data
   };
 
 #undef elf_backend_arch_data
This page took 0.099542 seconds and 4 git commands to generate.