Revert commit 240d6706c6a2

[binutils-gdb.git] / bfd / elf32-i386.c

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 2f994bf969e286486416cc1d04d594176925e3ae..fb5ed161f50c4cde39e8d7b24fe843fe18aaad09 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -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-2020 Free Software Foundation, Inc.
+   Copyright (C) 1993-2022 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.
 


@@ -19,7 +19,6 @@
    MA 02110-1301, USA.  */
 
 #include "elfxx-x86.h"
    MA 02110-1301, USA.  */
 
 #include "elfxx-x86.h"

-#include "elf-nacl.h"

 #include "elf-vxworks.h"
 #include "dwarf2.h"
 #include "opcode/i386.h"
 #include "elf-vxworks.h"
 #include "dwarf2.h"
 #include "opcode/i386.h"


@@ -27,43 +26,41 @@
 /* 386 uses REL relocations instead of RELA.  */
 #define USE_REL        1
 
 /* 386 uses REL relocations instead of RELA.  */
 #define USE_REL        1
 

-#include "elf/i386.h"
-

 static reloc_howto_type elf_howto_table[]=
 {
 static reloc_howto_type elf_howto_table[]=
 {

-  HOWTO(R_386_NONE, 0, 3, 0, FALSE, 0, complain_overflow_dont,
+  HOWTO(R_386_NONE, 0, 3, 0, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_NONE",
        bfd_elf_generic_reloc, "R_386_NONE",

-       TRUE, 0x00000000, 0x00000000, FALSE),
-  HOWTO(R_386_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0x00000000, 0x00000000, false),
+  HOWTO(R_386_32, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_32",
        bfd_elf_generic_reloc, "R_386_32",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_PC32, 0, 2, 32, TRUE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_PC32, 0, 2, 32, true, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_PC32",
        bfd_elf_generic_reloc, "R_386_PC32",

-       TRUE, 0xffffffff, 0xffffffff, TRUE),
-  HOWTO(R_386_GOT32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, true),
+  HOWTO(R_386_GOT32, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_GOT32",
        bfd_elf_generic_reloc, "R_386_GOT32",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_PLT32, 0, 2, 32, TRUE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_PLT32, 0, 2, 32, true, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_PLT32",
        bfd_elf_generic_reloc, "R_386_PLT32",

-       TRUE, 0xffffffff, 0xffffffff, TRUE),
-  HOWTO(R_386_COPY, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, true),
+  HOWTO(R_386_COPY, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_COPY",
        bfd_elf_generic_reloc, "R_386_COPY",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_GLOB_DAT, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_GLOB_DAT, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_GLOB_DAT",
        bfd_elf_generic_reloc, "R_386_GLOB_DAT",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_JUMP_SLOT, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_JUMP_SLOT, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_JUMP_SLOT",
        bfd_elf_generic_reloc, "R_386_JUMP_SLOT",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_RELATIVE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_RELATIVE, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_RELATIVE",
        bfd_elf_generic_reloc, "R_386_RELATIVE",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_GOTOFF, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_GOTOFF, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_GOTOFF",
        bfd_elf_generic_reloc, "R_386_GOTOFF",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_GOTPC, 0, 2, 32, TRUE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_GOTPC, 0, 2, 32, true, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_GOTPC",
        bfd_elf_generic_reloc, "R_386_GOTPC",

-       TRUE, 0xffffffff, 0xffffffff, TRUE),
+       true, 0xffffffff, 0xffffffff, true),

 
   /* We have a gap in the reloc numbers here.
      R_386_standard counts the number up to this point, and
 
   /* We have a gap in the reloc numbers here.
      R_386_standard counts the number up to this point, and


@@ -73,76 +70,76 @@ static reloc_howto_type elf_howto_table[]=
 #define R_386_ext_offset (R_386_TLS_TPOFF - R_386_standard)
 
   /* These relocs are a GNU extension.  */
 #define R_386_ext_offset (R_386_TLS_TPOFF - R_386_standard)
 
   /* These relocs are a GNU extension.  */

-  HOWTO(R_386_TLS_TPOFF, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+  HOWTO(R_386_TLS_TPOFF, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_TPOFF",
        bfd_elf_generic_reloc, "R_386_TLS_TPOFF",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_IE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_IE, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_IE",
        bfd_elf_generic_reloc, "R_386_TLS_IE",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_GOTIE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_GOTIE, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_GOTIE",
        bfd_elf_generic_reloc, "R_386_TLS_GOTIE",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_LE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_LE, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_LE",
        bfd_elf_generic_reloc, "R_386_TLS_LE",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_GD, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_GD, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_GD",
        bfd_elf_generic_reloc, "R_386_TLS_GD",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_LDM, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_LDM, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_LDM",
        bfd_elf_generic_reloc, "R_386_TLS_LDM",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_16, 0, 1, 16, false, 0, complain_overflow_bitfield,

        bfd_elf_generic_reloc, "R_386_16",
        bfd_elf_generic_reloc, "R_386_16",

-       TRUE, 0xffff, 0xffff, FALSE),
-  HOWTO(R_386_PC16, 0, 1, 16, TRUE, 0, complain_overflow_bitfield,
+       true, 0xffff, 0xffff, false),
+  HOWTO(R_386_PC16, 0, 1, 16, true, 0, complain_overflow_bitfield,

        bfd_elf_generic_reloc, "R_386_PC16",
        bfd_elf_generic_reloc, "R_386_PC16",

-       TRUE, 0xffff, 0xffff, TRUE),
-  HOWTO(R_386_8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffff, 0xffff, true),
+  HOWTO(R_386_8, 0, 0, 8, false, 0, complain_overflow_bitfield,

        bfd_elf_generic_reloc, "R_386_8",
        bfd_elf_generic_reloc, "R_386_8",

-       TRUE, 0xff, 0xff, FALSE),
-  HOWTO(R_386_PC8, 0, 0, 8, TRUE, 0, complain_overflow_signed,
+       true, 0xff, 0xff, false),
+  HOWTO(R_386_PC8, 0, 0, 8, true, 0, complain_overflow_signed,

        bfd_elf_generic_reloc, "R_386_PC8",
        bfd_elf_generic_reloc, "R_386_PC8",

-       TRUE, 0xff, 0xff, TRUE),
+       true, 0xff, 0xff, true),

 
 #define R_386_ext (R_386_PC8 + 1 - R_386_ext_offset)
 #define R_386_tls_offset (R_386_TLS_LDO_32 - R_386_ext)
   /* These are common with Solaris TLS implementation.  */
 
 #define R_386_ext (R_386_PC8 + 1 - R_386_ext_offset)
 #define R_386_tls_offset (R_386_TLS_LDO_32 - R_386_ext)
   /* These are common with Solaris TLS implementation.  */

-  HOWTO(R_386_TLS_LDO_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+  HOWTO(R_386_TLS_LDO_32, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_LDO_32",
        bfd_elf_generic_reloc, "R_386_TLS_LDO_32",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_IE_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_IE_32, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_IE_32",
        bfd_elf_generic_reloc, "R_386_TLS_IE_32",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_LE_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_LE_32, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_LE_32",
        bfd_elf_generic_reloc, "R_386_TLS_LE_32",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_DTPMOD32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_DTPMOD32, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_DTPMOD32",
        bfd_elf_generic_reloc, "R_386_TLS_DTPMOD32",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_DTPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_DTPOFF32, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_DTPOFF32",
        bfd_elf_generic_reloc, "R_386_TLS_DTPOFF32",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_TPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_TPOFF32, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_TPOFF32",
        bfd_elf_generic_reloc, "R_386_TLS_TPOFF32",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_SIZE32, 0, 2, 32, FALSE, 0, complain_overflow_unsigned,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_SIZE32, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_SIZE32",
        bfd_elf_generic_reloc, "R_386_SIZE32",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_GOTDESC, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_GOTDESC, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_GOTDESC",
        bfd_elf_generic_reloc, "R_386_TLS_GOTDESC",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_TLS_DESC_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_TLS_DESC_CALL, 0, 3, 0, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_DESC_CALL",
        bfd_elf_generic_reloc, "R_386_TLS_DESC_CALL",

-       FALSE, 0, 0, FALSE),
-  HOWTO(R_386_TLS_DESC, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       false, 0, 0, false),
+  HOWTO(R_386_TLS_DESC, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_TLS_DESC",
        bfd_elf_generic_reloc, "R_386_TLS_DESC",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_IRELATIVE, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_IRELATIVE, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_IRELATIVE",
        bfd_elf_generic_reloc, "R_386_IRELATIVE",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
-  HOWTO(R_386_GOT32X, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       true, 0xffffffff, 0xffffffff, false),
+  HOWTO(R_386_GOT32X, 0, 2, 32, false, 0, complain_overflow_dont,

        bfd_elf_generic_reloc, "R_386_GOT32X",
        bfd_elf_generic_reloc, "R_386_GOT32X",

-       TRUE, 0xffffffff, 0xffffffff, FALSE),
+       true, 0xffffffff, 0xffffffff, false),

 
   /* Another gap.  */
 #define R_386_ext2 (R_386_GOT32X + 1 - R_386_tls_offset)
 
   /* Another gap.  */
 #define R_386_ext2 (R_386_GOT32X + 1 - R_386_tls_offset)


@@ -153,39 +150,35 @@ static reloc_howto_type elf_howto_table[]=
         0,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         0,                     /* bitsize */
         0,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         0,                     /* bitsize */

-        FALSE,                 /* pc_relative */
+        false,                 /* pc_relative */

         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         NULL,                  /* special_function */
         "R_386_GNU_VTINHERIT", /* name */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         NULL,                  /* special_function */
         "R_386_GNU_VTINHERIT", /* name */

-        FALSE,                 /* partial_inplace */
+        false,                 /* partial_inplace */

         0,                     /* src_mask */
         0,                     /* dst_mask */
         0,                     /* src_mask */
         0,                     /* dst_mask */

-        FALSE),                /* pcrel_offset */
+        false),                /* pcrel_offset */

 
 /* GNU extension to record C++ vtable member usage.  */
   HOWTO (R_386_GNU_VTENTRY,    /* type */
         0,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         0,                     /* bitsize */
 
 /* GNU extension to record C++ vtable member usage.  */
   HOWTO (R_386_GNU_VTENTRY,    /* type */
         0,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         0,                     /* bitsize */

-        FALSE,                 /* pc_relative */
+        false,                 /* pc_relative */

         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         _bfd_elf_rel_vtable_reloc_fn, /* special_function */
         "R_386_GNU_VTENTRY",   /* name */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         _bfd_elf_rel_vtable_reloc_fn, /* special_function */
         "R_386_GNU_VTENTRY",   /* name */

-        FALSE,                 /* partial_inplace */
+        false,                 /* partial_inplace */

         0,                     /* src_mask */
         0,                     /* dst_mask */
         0,                     /* src_mask */
         0,                     /* dst_mask */

-        FALSE)                 /* pcrel_offset */
+        false)                 /* pcrel_offset */

 
 #define R_386_vt (R_386_GNU_VTENTRY + 1 - R_386_vt_offset)
 
 };
 
 
 #define R_386_vt (R_386_GNU_VTENTRY + 1 - R_386_vt_offset)
 
 };
 

-#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)


@@ -388,7 +381,7 @@ elf_i386_rtype_to_howto (unsigned r_type)
   return &elf_howto_table[indx];
 }
 
   return &elf_howto_table[indx];
 }
 

-static bfd_boolean
+static bool

 elf_i386_info_to_howto_rel (bfd *abfd,
                            arelent *cache_ptr,
                            Elf_Internal_Rela *dst)
 elf_i386_info_to_howto_rel (bfd *abfd,
                            arelent *cache_ptr,
                            Elf_Internal_Rela *dst)


@@ -401,10 +394,10 @@ elf_i386_info_to_howto_rel (bfd *abfd,
       _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
                          abfd, r_type);
       bfd_set_error (bfd_error_bad_value);
       _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
                          abfd, r_type);
       bfd_set_error (bfd_error_bad_value);

-      return FALSE;
+      return false;

     }
 
     }
 

-  return TRUE;
+  return true;

 }
 
 /* Return whether a symbol name implies a local label.  The UnixWare
 }
 
 /* Return whether a symbol name implies a local label.  The UnixWare


@@ -413,18 +406,18 @@ elf_i386_info_to_howto_rel (bfd *abfd,
    If so, we should move the .X recognition into
    _bfd_elf_is_local_label_name.  */
 
    If so, we should move the .X recognition into
    _bfd_elf_is_local_label_name.  */
 

-static bfd_boolean
+static bool

 elf_i386_is_local_label_name (bfd *abfd, const char *name)
 {
   if (name[0] == '.' && name[1] == 'X')
 elf_i386_is_local_label_name (bfd *abfd, const char *name)
 {
   if (name[0] == '.' && name[1] == 'X')

-    return TRUE;
+    return true;

 
   return _bfd_elf_is_local_label_name (abfd, name);
 }
 \f
 /* Support for core dump NOTE sections.  */
 
 
   return _bfd_elf_is_local_label_name (abfd, name);
 }
 \f
 /* Support for core dump NOTE sections.  */
 

-static bfd_boolean
+static bool

 elf_i386_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
 {
   int offset;
 elf_i386_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
 {
   int offset;


@@ -435,7 +428,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);


@@ -452,7 +445,7 @@ elf_i386_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
       switch (note->descsz)
        {
        default:
       switch (note->descsz)
        {
        default:

-         return FALSE;
+         return false;

 
        case 144:               /* Linux/i386 */
          /* pr_cursig */
 
        case 144:               /* Linux/i386 */
          /* pr_cursig */


@@ -474,7 +467,7 @@ elf_i386_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
                                          size, note->descpos + offset);
 }
 
                                          size, note->descpos + offset);
 }
 

-static bfd_boolean
+static bool

 elf_i386_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 {
   if (note->namesz == 8 && strcmp (note->namedata, "FreeBSD") == 0)
 elf_i386_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 {
   if (note->namesz == 8 && strcmp (note->namedata, "FreeBSD") == 0)


@@ -482,7 +475,7 @@ elf_i386_grok_psinfo (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;

 
       elf_tdata (abfd)->core->program
        = _bfd_elfcore_strndup (abfd, note->descdata + 8, 17);
 
       elf_tdata (abfd)->core->program
        = _bfd_elfcore_strndup (abfd, note->descdata + 8, 17);


@@ -494,7 +487,7 @@ elf_i386_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
       switch (note->descsz)
        {
        default:
       switch (note->descsz)
        {
        default:

-         return FALSE;
+         return false;

 
        case 124:               /* Linux/i386 elf_prpsinfo.  */
          elf_tdata (abfd)->core->pid
 
        case 124:               /* Linux/i386 elf_prpsinfo.  */
          elf_tdata (abfd)->core->pid


@@ -517,7 +510,7 @@ elf_i386_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
       command[n - 1] = '\0';
   }
 
       command[n - 1] = '\0';
   }
 

-  return TRUE;
+  return true;

 }
 \f
 /* Functions for the i386 ELF linker.
 }
 \f
 /* Functions for the i386 ELF linker.


@@ -529,7 +522,7 @@ elf_i386_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
    Functions named elf_i386_* are called by external routines, other
    functions are only called locally.  elf_i386_* functions appear
    in this file more or less in the order in which they are called
    Functions named elf_i386_* are called by external routines, other
    functions are only called locally.  elf_i386_* functions appear
    in this file more or less in the order in which they are called

-   from external routines.  eg. elf_i386_check_relocs is called
+   from external routines.  eg. elf_i386_scan_relocs is called

    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.  */
 


@@ -843,18 +836,10 @@ static const struct elf_x86_non_lazy_plt_layout elf_i386_non_lazy_ibt_plt =
 #define PLTRESOLVE_RELOCS 2
 #define PLT_NON_JUMP_SLOT_RELOCS 2
 
 #define PLTRESOLVE_RELOCS 2
 #define PLT_NON_JUMP_SLOT_RELOCS 2
 

-/* These are the standard parameters.  */
-static const struct elf_x86_backend_data elf_i386_arch_bed =
-  {
-    is_normal                          /* os */
-  };
-
-#define        elf_backend_arch_data   &elf_i386_arch_bed
-

 /* Return TRUE if the TLS access code sequence support transition
    from R_TYPE.  */
 
 /* Return TRUE if the TLS access code sequence support transition
    from R_TYPE.  */
 

-static bfd_boolean
+static bool

 elf_i386_check_tls_transition (asection *sec,
                               bfd_byte *contents,
                               Elf_Internal_Shdr *symtab_hdr,
 elf_i386_check_tls_transition (asection *sec,
                               bfd_byte *contents,
                               Elf_Internal_Shdr *symtab_hdr,


@@ -868,7 +853,7 @@ elf_i386_check_tls_transition (asection *sec,
   struct elf_link_hash_entry *h;
   bfd_vma offset;
   bfd_byte *call;
   struct elf_link_hash_entry *h;
   bfd_vma offset;
   bfd_byte *call;

-  bfd_boolean indirect_call;
+  bool indirect_call;

 
   offset = rel->r_offset;
   switch (r_type)
 
   offset = rel->r_offset;
   switch (r_type)


@@ -876,9 +861,9 @@ elf_i386_check_tls_transition (asection *sec,
     case R_386_TLS_GD:
     case R_386_TLS_LDM:
       if (offset < 2 || (rel + 1) >= relend)
     case R_386_TLS_GD:
     case R_386_TLS_LDM:
       if (offset < 2 || (rel + 1) >= relend)

-       return FALSE;
+       return false;

 
 

-      indirect_call = FALSE;
+      indirect_call = false;

       call = contents + offset + 4;
       val = *(call - 5);
       type = *(call - 6);
       call = contents + offset + 4;
       val = *(call - 5);
       type = *(call - 6);


@@ -899,19 +884,19 @@ elf_i386_check_tls_transition (asection *sec,
             can transit to different access model.  */
          if ((offset + 10) > sec->size
              || (type != 0x8d && type != 0x04))
             can transit to different access model.  */
          if ((offset + 10) > sec->size
              || (type != 0x8d && type != 0x04))

-           return FALSE;
+           return false;

 
          if (type == 0x04)
            {
              /* leal foo@tlsgd(,%ebx,1), %eax
                 call ___tls_get_addr@PLT  */
              if (offset < 3)
 
          if (type == 0x04)
            {
              /* leal foo@tlsgd(,%ebx,1), %eax
                 call ___tls_get_addr@PLT  */
              if (offset < 3)

-               return FALSE;
+               return false;

 
              if (*(call - 7) != 0x8d
                  || val != 0x1d
                  || call[0] != 0xe8)
 
              if (*(call - 7) != 0x8d
                  || val != 0x1d
                  || call[0] != 0xe8)

-               return FALSE;
+               return false;

            }
          else
            {
            }
          else
            {


@@ -929,7 +914,7 @@ elf_i386_check_tls_transition (asection *sec,
                 is used to pass parameter to ___tls_get_addr.  */
              reg = val & 7;
              if ((val & 0xf8) != 0x80 || reg == 4 || reg == 0)
                 is used to pass parameter to ___tls_get_addr.  */
              reg = val & 7;
              if ((val & 0xf8) != 0x80 || reg == 4 || reg == 0)

-               return FALSE;
+               return false;

 
              indirect_call = call[0] == 0xff;
              if (!(reg == 3 && call[0] == 0xe8 && call[5] == 0x90)
 
              indirect_call = call[0] == 0xff;
              if (!(reg == 3 && call[0] == 0xe8 && call[5] == 0x90)


@@ -937,7 +922,7 @@ elf_i386_check_tls_transition (asection *sec,
                  && !(indirect_call
                       && (call[1] & 0xf8) == 0x90
                       && (call[1] & 0x7) == reg))
                  && !(indirect_call
                       && (call[1] & 0xf8) == 0x90
                       && (call[1] & 0x7) == reg))

-               return FALSE;
+               return false;

            }
        }
       else
            }
        }
       else


@@ -952,13 +937,13 @@ elf_i386_check_tls_transition (asection *sec,
                addr32 call ___tls_get_addr
             can transit to different access model.  */
          if (type != 0x8d || (offset + 9) > sec->size)
                addr32 call ___tls_get_addr
             can transit to different access model.  */
          if (type != 0x8d || (offset + 9) > sec->size)

-           return FALSE;
+           return false;

 
          /* %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)
 
          /* %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;
+           return false;

 
          indirect_call = call[0] == 0xff;
          if (!(reg == 3 && call[0] == 0xe8)
 
          indirect_call = call[0] == 0xff;
          if (!(reg == 3 && call[0] == 0xe8)


@@ -966,17 +951,17 @@ elf_i386_check_tls_transition (asection *sec,
              && !(indirect_call
                   && (call[1] & 0xf8) == 0x90
                   && (call[1] & 0x7) == reg))
              && !(indirect_call
                   && (call[1] & 0xf8) == 0x90
                   && (call[1] & 0x7) == reg))

-           return FALSE;
+           return false;

        }
 
       r_symndx = ELF32_R_SYM (rel[1].r_info);
       if (r_symndx < symtab_hdr->sh_info)
        }
 
       r_symndx = ELF32_R_SYM (rel[1].r_info);
       if (r_symndx < symtab_hdr->sh_info)

-       return FALSE;
+       return false;

 
       h = sym_hashes[r_symndx - symtab_hdr->sh_info];
       if (h == NULL
          || !((struct elf_x86_link_hash_entry *) h)->tls_get_addr)
 
       h = sym_hashes[r_symndx - symtab_hdr->sh_info];
       if (h == NULL
          || !((struct elf_x86_link_hash_entry *) h)->tls_get_addr)

-       return FALSE;
+       return false;

       else if (indirect_call)
        return (ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32X);
       else
       else if (indirect_call)
        return (ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32X);
       else


@@ -991,15 +976,15 @@ elf_i386_check_tls_transition (asection *sec,
        */
 
       if (offset < 1 || (offset + 4) > sec->size)
        */
 
       if (offset < 1 || (offset + 4) > sec->size)

-       return FALSE;
+       return false;

 
       /* Check "movl foo@tpoff(%rip), %eax" first.  */
       val = bfd_get_8 (abfd, contents + offset - 1);
       if (val == 0xa1)
 
       /* Check "movl foo@tpoff(%rip), %eax" first.  */
       val = bfd_get_8 (abfd, contents + offset - 1);
       if (val == 0xa1)

-       return TRUE;
+       return true;

 
       if (offset < 2)
 
       if (offset < 2)

-       return FALSE;
+       return false;

 
       /* Check movl|addl foo@tpoff(%rip), %reg.   */
       type = bfd_get_8 (abfd, contents + offset - 2);
 
       /* Check movl|addl foo@tpoff(%rip), %reg.   */
       type = bfd_get_8 (abfd, contents + offset - 2);


@@ -1015,11 +1000,11 @@ elf_i386_check_tls_transition (asection *sec,
        */
 
       if (offset < 2 || (offset + 4) > sec->size)
        */
 
       if (offset < 2 || (offset + 4) > sec->size)

-       return FALSE;
+       return false;

 
       val = bfd_get_8 (abfd, contents + offset - 1);
       if ((val & 0xc0) != 0x80 || (val & 7) == 4)
 
       val = bfd_get_8 (abfd, contents + offset - 1);
       if ((val & 0xc0) != 0x80 || (val & 7) == 4)

-       return FALSE;
+       return false;

 
       type = bfd_get_8 (abfd, contents + offset - 2);
       return type == 0x8b || type == 0x2b || type == 0x03;
 
       type = bfd_get_8 (abfd, contents + offset - 2);
       return type == 0x8b || type == 0x2b || type == 0x03;


@@ -1033,10 +1018,10 @@ elf_i386_check_tls_transition (asection *sec,
         going to be eax.  */
 
       if (offset < 2 || (offset + 4) > sec->size)
         going to be eax.  */
 
       if (offset < 2 || (offset + 4) > sec->size)

-       return FALSE;
+       return false;

 
       if (bfd_get_8 (abfd, contents + offset - 2) != 0x8d)
 
       if (bfd_get_8 (abfd, contents + offset - 2) != 0x8d)

-       return FALSE;
+       return false;

 
       val = bfd_get_8 (abfd, contents + offset - 1);
       return (val & 0xc7) == 0x83;
 
       val = bfd_get_8 (abfd, contents + offset - 1);
       return (val & 0xc7) == 0x83;


@@ -1052,7 +1037,7 @@ elf_i386_check_tls_transition (asection *sec,
          return call[0] == 0xff && call[1] == 0x10;
        }
 
          return call[0] == 0xff && call[1] == 0x10;
        }
 

-      return FALSE;
+      return false;

 
     default:
       abort ();
 
     default:
       abort ();


@@ -1062,7 +1047,7 @@ elf_i386_check_tls_transition (asection *sec,
 /* Return TRUE if the TLS access transition is OK or no transition
    will be performed.  Update R_TYPE if there is a transition.  */
 
 /* 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
+static bool

 elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
                         asection *sec, bfd_byte *contents,
                         Elf_Internal_Shdr *symtab_hdr,
 elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
                         asection *sec, bfd_byte *contents,
                         Elf_Internal_Shdr *symtab_hdr,


@@ -1072,17 +1057,17 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
                         const Elf_Internal_Rela *relend,
                         struct elf_link_hash_entry *h,
                         unsigned long r_symndx,
                         const Elf_Internal_Rela *relend,
                         struct elf_link_hash_entry *h,
                         unsigned long r_symndx,

-                        bfd_boolean from_relocate_section)
+                        bool from_relocate_section)

 {
   unsigned int from_type = *r_type;
   unsigned int to_type = from_type;
 {
   unsigned int from_type = *r_type;
   unsigned int to_type = from_type;

-  bfd_boolean check = TRUE;
+  bool check = true;

 
   /* Skip TLS transition for functions.  */
   if (h != NULL
       && (h->type == STT_FUNC
          || h->type == STT_GNU_IFUNC))
 
   /* Skip TLS transition for functions.  */
   if (h != NULL
       && (h->type == STT_FUNC
          || h->type == STT_GNU_IFUNC))

-    return TRUE;
+    return true;

 
   switch (from_type)
     {
 
   switch (from_type)
     {


@@ -1121,7 +1106,7 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
            }
 
          /* We checked the transition before when we were called from
            }
 
          /* We checked the transition before when we were called from

-            elf_i386_check_relocs.  We only want to check the new
+            elf_i386_scan_relocs.  We only want to check the new

             transition which hasn't been checked before.  */
          check = new_to_type != to_type && from_type == to_type;
          to_type = new_to_type;
             transition which hasn't been checked before.  */
          check = new_to_type != to_type && from_type == to_type;
          to_type = new_to_type;


@@ -1135,12 +1120,12 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
       break;
 
     default:
       break;
 
     default:

-      return TRUE;
+      return true;

     }
 
   /* Return TRUE if there is no transition.  */
   if (from_type == to_type)
     }
 
   /* Return TRUE if there is no transition.  */
   if (from_type == to_type)

-    return TRUE;
+    return true;

 
   /* Check if the transition can be performed.  */
   if (check
 
   /* Check if the transition can be performed.  */
   if (check


@@ -1167,7 +1152,7 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
            {
              Elf_Internal_Sym *isym;
 
            {
              Elf_Internal_Sym *isym;
 

-             isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+             isym = bfd_sym_from_r_symndx (&htab->elf.sym_cache,

                                            abfd, r_symndx);
              name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL);
            }
                                            abfd, r_symndx);
              name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL);
            }


@@ -1180,11 +1165,11 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
         abfd, from->name, to->name, name,
         (uint64_t) rel->r_offset, sec);
       bfd_set_error (bfd_error_bad_value);
         abfd, from->name, to->name, name,
         (uint64_t) rel->r_offset, sec);
       bfd_set_error (bfd_error_bad_value);

-      return FALSE;
+      return false;

     }
 
   *r_type = to_type;
     }
 
   *r_type = to_type;

-  return TRUE;
+  return true;

 }
 
 /* With the local symbol, foo, we convert
 }
 
 /* With the local symbol, foo, we convert


@@ -1207,38 +1192,39 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
    instructions.  */
 
 static
    instructions.  */
 
 static

-bfd_boolean
+bool

 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,
 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,
+                            bool *converted,

                             struct bfd_link_info *link_info)
 {
   struct elf_x86_link_hash_table *htab;
   unsigned int opcode;
   unsigned int modrm;
                             struct bfd_link_info *link_info)
 {
   struct elf_x86_link_hash_table *htab;
   unsigned int opcode;
   unsigned int modrm;

-  bfd_boolean baseless;
+  bool baseless;

   Elf_Internal_Sym *isym;
   unsigned int addend;
   unsigned int nop;
   bfd_vma nop_offset;
   Elf_Internal_Sym *isym;
   unsigned int addend;
   unsigned int nop;
   bfd_vma nop_offset;

-  bfd_boolean is_pic;
-  bfd_boolean to_reloc_32;
+  bool is_pic;
+  bool to_reloc_32;
+  bool abs_symbol;

   unsigned int r_type;
   unsigned int r_symndx;
   bfd_vma roff = irel->r_offset;
   unsigned int r_type;
   unsigned int r_symndx;
   bfd_vma roff = irel->r_offset;

-  bfd_boolean local_ref;
+  bool local_ref;

   struct elf_x86_link_hash_entry *eh;
 
   if (roff < 2)
   struct elf_x86_link_hash_entry *eh;
 
   if (roff < 2)

-    return TRUE;
+    return true;

 
   /* Addend for R_386_GOT32X relocations must be 0.  */
   addend = bfd_get_32 (abfd, contents + roff);
   if (addend != 0)
 
   /* Addend for R_386_GOT32X relocations must be 0.  */
   addend = bfd_get_32 (abfd, contents + roff);
   if (addend != 0)

-    return TRUE;
+    return true;

 
   htab = elf_x86_hash_table (link_info, I386_ELF_DATA);
   is_pic = bfd_link_pic (link_info);
 
   htab = elf_x86_hash_table (link_info, I386_ELF_DATA);
   is_pic = bfd_link_pic (link_info);


@@ -1249,6 +1235,21 @@ elf_i386_convert_load_reloc (bfd *abfd, Elf_Internal_Shdr *symtab_hdr,
   modrm = bfd_get_8 (abfd, contents + roff - 1);
   baseless = (modrm & 0xc7) == 0x5;
 
   modrm = bfd_get_8 (abfd, contents + roff - 1);
   baseless = (modrm & 0xc7) == 0x5;
 

+  if (h)
+    {
+      /* NB: Also set linker_def via SYMBOL_REFERENCES_LOCAL_P.  */
+      local_ref = SYMBOL_REFERENCES_LOCAL_P (link_info, h);
+      isym = NULL;
+      abs_symbol = ABS_SYMBOL_P (h);
+    }
+  else
+    {
+      local_ref = true;
+      isym = bfd_sym_from_r_symndx (&htab->elf.sym_cache, abfd,
+                                   r_symndx);
+      abs_symbol = isym->st_shndx == SHN_ABS;
+    }
+

   if (baseless && is_pic)
     {
       /* For PIC, disallow R_386_GOT32X without a base register
   if (baseless && is_pic)
     {
       /* For PIC, disallow R_386_GOT32X without a base register


@@ -1256,11 +1257,7 @@ elf_i386_convert_load_reloc (bfd *abfd, Elf_Internal_Shdr *symtab_hdr,
       const char *name;
 
       if (h == NULL)
       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);
-       }
+       name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL);

       else
        name = h->root.root.string;
 
       else
        name = h->root.root.string;
 


@@ -1269,7 +1266,7 @@ elf_i386_convert_load_reloc (bfd *abfd, Elf_Internal_Shdr *symtab_hdr,
        (_("%pB: direct GOT relocation R_386_GOT32X against `%s' without base"
           " register can not be used when making a shared object"),
         abfd, name);
        (_("%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;
+      return false;

     }
 
   opcode = bfd_get_8 (abfd, contents + roff - 2);
     }
 
   opcode = bfd_get_8 (abfd, contents + roff - 2);


@@ -1294,9 +1291,6 @@ elf_i386_convert_load_reloc (bfd *abfd, Elf_Internal_Shdr *symtab_hdr,
        goto convert_load;
     }
 
        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
   /* Undefined weak symbol is only bound locally in executable
      and its reference is resolved as 0.  */
   if (h->root.type == bfd_link_hash_undefweak


@@ -1307,14 +1301,14 @@ elf_i386_convert_load_reloc (bfd *abfd, Elf_Internal_Shdr *symtab_hdr,
        {
          /* No direct branch to 0 for PIC.  */
          if (is_pic)
        {
          /* No direct branch to 0 for PIC.  */
          if (is_pic)

-           return TRUE;
+           return true;

          else
            goto convert_branch;
        }
       else
        {
          /* We can convert load of address 0 to R_386_32.  */
          else
            goto convert_branch;
        }
       else
        {
          /* We can convert load of address 0 to R_386_32.  */

-         to_reloc_32 = TRUE;
+         to_reloc_32 = true;

          goto convert_load;
        }
     }
          goto convert_load;
        }
     }


@@ -1327,7 +1321,7 @@ elf_i386_convert_load_reloc (bfd *abfd, Elf_Internal_Shdr *symtab_hdr,
          && local_ref)
        {
          /* The function is locally defined.   */
          && local_ref)
        {
          /* The function is locally defined.   */

-convert_branch:
+       convert_branch:

          /* Convert R_386_GOT32X to R_386_PC32.  */
          if (modrm == 0x15 || (modrm & 0xf8) == 0x90)
            {
          /* Convert R_386_GOT32X to R_386_PC32.  */
          if (modrm == 0x15 || (modrm & 0xf8) == 0x90)
            {


@@ -1369,7 +1363,7 @@ convert_branch:
          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;
          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;
+         *converted = true;

        }
     }
   else
        }
     }
   else


@@ -1381,7 +1375,7 @@ convert_branch:
         Avoid optimizing _DYNAMIC since ld.so may use its
         link-time address.  */
       if (h == htab->elf.hdynamic)
         Avoid optimizing _DYNAMIC since ld.so may use its
         link-time address.  */
       if (h == htab->elf.hdynamic)

-       return TRUE;
+       return true;

 
       /* def_regular is set by an assignment in a linker script in
         bfd_elf_record_link_assignment.  start_stop is set on
 
       /* def_regular is set by an assignment in a linker script in
         bfd_elf_record_link_assignment.  start_stop is set on


@@ -1393,9 +1387,12 @@ convert_branch:
               || h->root.type == bfd_link_hash_defweak)
              && local_ref))
        {
               || h->root.type == bfd_link_hash_defweak)
              && local_ref))
        {

-convert_load:
+       convert_load:

          if (opcode == 0x8b)
            {
          if (opcode == 0x8b)
            {

+             if (abs_symbol && local_ref)
+               to_reloc_32 = true;
+

              if (to_reloc_32)
                {
                  /* Convert "mov foo@GOT[(%reg1)], %reg2" to
              if (to_reloc_32)
                {
                  /* Convert "mov foo@GOT[(%reg1)], %reg2" to


@@ -1417,7 +1414,7 @@ convert_load:
            {
              /* Only R_386_32 is supported.  */
              if (!to_reloc_32)
            {
              /* Only R_386_32 is supported.  */
              if (!to_reloc_32)

-               return TRUE;
+               return true;

 
              if (opcode == 0x85)
                {
 
              if (opcode == 0x85)
                {


@@ -1442,53 +1439,39 @@ convert_load:
          bfd_put_8 (abfd, opcode, contents + roff - 2);
          irel->r_info = ELF32_R_INFO (r_symndx, r_type);
          *r_type_p = r_type;
          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;
+         *converted = true;

        }
     }
 
        }
     }
 

-  return TRUE;
+  return true;

 }
 
 }
 

-/* Rename some of the generic section flags to better document how they
-   are used here.  */
-#define check_relocs_failed    sec_flg0
-

 /* Look through the relocs for a section during the first phase, and
 /* Look through the relocs for a section during the first phase, and

-   calculate needed space in the global offset table, procedure linkage
-   table, and dynamic reloc sections.  */
-
-static bfd_boolean
-elf_i386_check_relocs (bfd *abfd,
-                      struct bfd_link_info *info,
-                      asection *sec,
-                      const Elf_Internal_Rela *relocs)
+   calculate needed space in the global offset table, and procedure
+   linkage table.  */
+
+static bool
+elf_i386_scan_relocs (bfd *abfd,
+                     struct bfd_link_info *info,
+                     asection *sec,
+                     const Elf_Internal_Rela *relocs)

 {
   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;
 {
   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;

   bfd_byte *contents;
   bfd_byte *contents;

-  bfd_boolean converted;
+  bool converted;

 
   if (bfd_link_relocatable (info))
 
   if (bfd_link_relocatable (info))

-    return TRUE;
-
-  /* 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;
+    return true;

 
   htab = elf_x86_hash_table (info, I386_ELF_DATA);
   if (htab == NULL)
     {
       sec->check_relocs_failed = 1;
 
   htab = elf_x86_hash_table (info, I386_ELF_DATA);
   if (htab == NULL)
     {
       sec->check_relocs_failed = 1;

-      return FALSE;
+      return false;

     }
 
   BFD_ASSERT (is_x86_elf (abfd, htab));
     }
 
   BFD_ASSERT (is_x86_elf (abfd, htab));


@@ -1499,15 +1482,13 @@ elf_i386_check_relocs (bfd *abfd,
   else if (!bfd_malloc_and_get_section (abfd, sec, &contents))
     {
       sec->check_relocs_failed = 1;
   else if (!bfd_malloc_and_get_section (abfd, sec, &contents))
     {
       sec->check_relocs_failed = 1;

-      return FALSE;
+      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;
+  converted = false;

 
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
 
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)


@@ -1518,7 +1499,8 @@ elf_i386_check_relocs (bfd *abfd,
       struct elf_x86_link_hash_entry *eh;
       Elf_Internal_Sym *isym;
       const char *name;
       struct elf_x86_link_hash_entry *eh;
       Elf_Internal_Sym *isym;
       const char *name;

-      bfd_boolean size_reloc;
+      bool size_reloc;
+      bool no_dynreloc;

 
       r_symndx = ELF32_R_SYM (rel->r_info);
       r_type = ELF32_R_TYPE (rel->r_info);
 
       r_symndx = ELF32_R_SYM (rel->r_info);
       r_type = ELF32_R_TYPE (rel->r_info);


@@ -1534,7 +1516,7 @@ elf_i386_check_relocs (bfd *abfd,
       if (r_symndx < symtab_hdr->sh_info)
        {
          /* A local symbol.  */
       if (r_symndx < symtab_hdr->sh_info)
        {
          /* A local symbol.  */

-         isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+         isym = bfd_sym_from_r_symndx (&htab->elf.sym_cache,

                                        abfd, r_symndx);
          if (isym == NULL)
            goto error_return;
                                        abfd, r_symndx);
          if (isym == NULL)
            goto error_return;


@@ -1542,7 +1524,7 @@ elf_i386_check_relocs (bfd *abfd,
          /* 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 = _bfd_elf_x86_get_local_sym_hash (htab, abfd, rel, TRUE);
+             h = _bfd_elf_x86_get_local_sym_hash (htab, abfd, rel, true);

              if (h == NULL)
                goto error_return;
 
              if (h == NULL)
                goto error_return;
 


@@ -1587,15 +1569,19 @@ elf_i386_check_relocs (bfd *abfd,
            goto error_return;
        }
 
            goto error_return;
        }
 

+      if (!_bfd_elf_x86_valid_reloc_p (sec, info, htab, rel, h, isym,
+                                      symtab_hdr, &no_dynreloc))
+       return false;
+

       if (! elf_i386_tls_transition (info, abfd, sec, contents,
                                     symtab_hdr, sym_hashes,
                                     &r_type, GOT_UNKNOWN,
       if (! elf_i386_tls_transition (info, abfd, sec, contents,
                                     symtab_hdr, sym_hashes,
                                     &r_type, GOT_UNKNOWN,

-                                    rel, rel_end, h, r_symndx, FALSE))
+                                    rel, rel_end, h, r_symndx, false))

        goto error_return;
 
       /* Check if _GLOBAL_OFFSET_TABLE_ is referenced.  */
       if (h == htab->elf.hgot)
        goto error_return;
 
       /* Check if _GLOBAL_OFFSET_TABLE_ is referenced.  */
       if (h == htab->elf.hgot)

-       htab->got_referenced = TRUE;
+       htab->got_referenced = true;

 
       switch (r_type)
        {
 
       switch (r_type)
        {


@@ -1622,7 +1608,7 @@ elf_i386_check_relocs (bfd *abfd,
          break;
 
        case R_386_SIZE32:
          break;
 
        case R_386_SIZE32:

-         size_reloc = TRUE;
+         size_reloc = true;

          goto do_size;
 
        case R_386_TLS_IE_32:
          goto do_size;
 
        case R_386_TLS_IE_32:


@@ -1674,25 +1660,12 @@ elf_i386_check_relocs (bfd *abfd,
              {
                bfd_signed_vma *local_got_refcounts;
 
              {
                bfd_signed_vma *local_got_refcounts;
 

+               if (!elf_x86_allocate_local_got_info (abfd,
+                                                     symtab_hdr->sh_info))
+                     goto error_return;
+

                /* This is a global offset table entry for a local symbol.  */
                local_got_refcounts = elf_local_got_refcounts (abfd);
                /* This is a global offset table entry for a local symbol.  */
                local_got_refcounts = elf_local_got_refcounts (abfd);

-               if (local_got_refcounts == NULL)
-                 {
-                   bfd_size_type size;
-
-                   size = symtab_hdr->sh_info;
-                   size *= (sizeof (bfd_signed_vma)
-                            + sizeof (bfd_vma) + sizeof(char));
-                   local_got_refcounts = (bfd_signed_vma *)
-                       bfd_zalloc (abfd, size);
-                   if (local_got_refcounts == NULL)
-                     goto error_return;
-                   elf_local_got_refcounts (abfd) = local_got_refcounts;
-                   elf_x86_local_tlsdesc_gotent (abfd)
-                     = (bfd_vma *) (local_got_refcounts + symtab_hdr->sh_info);
-                   elf_x86_local_got_tls_type (abfd)
-                     = (char *) (local_got_refcounts + 2 * symtab_hdr->sh_info);
-                 }

                local_got_refcounts[r_symndx] = 1;
                old_tls_type = elf_x86_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];
              }


@@ -1739,7 +1712,7 @@ elf_i386_check_relocs (bfd *abfd,
 
        case R_386_GOTOFF:
        case R_386_GOTPC:
 
        case R_386_GOTOFF:
        case R_386_GOTPC:

-create_got:
+       create_got:

          if (r_type != R_386_TLS_IE)
            {
              if (eh != NULL)
          if (r_type != R_386_TLS_IE)
            {
              if (eh != NULL)


@@ -1750,7 +1723,7 @@ create_got:
                  if (r_type == R_386_GOTOFF
                      && h->root.type == bfd_link_hash_undefweak
                      && bfd_link_executable (info))
                  if (r_type == R_386_GOTOFF
                      && h->root.type == bfd_link_hash_undefweak
                      && bfd_link_executable (info))

-                   htab->got_referenced = TRUE;
+                   htab->got_referenced = true;

                }
              break;
            }
                }
              break;
            }


@@ -1769,7 +1742,7 @@ create_got:
        case R_386_PC32:
          if (eh != NULL && (sec->flags & SEC_CODE) != 0)
            eh->zero_undefweak |= 0x2;
        case R_386_PC32:
          if (eh != NULL && (sec->flags & SEC_CODE) != 0)
            eh->zero_undefweak |= 0x2;

-do_relocation:
+       do_relocation:

          /* We are called after all symbols have been resolved.  Only
             relocation against STT_GNU_IFUNC symbol must go through
             PLT.  */
          /* We are called after all symbols have been resolved.  Only
             relocation against STT_GNU_IFUNC symbol must go through
             PLT.  */


@@ -1777,7 +1750,7 @@ do_relocation:
              && (bfd_link_executable (info)
                  || h->type == STT_GNU_IFUNC))
            {
              && (bfd_link_executable (info)
                  || h->type == STT_GNU_IFUNC))
            {

-             bfd_boolean func_pointer_ref = FALSE;
+             bool func_pointer_ref = false;

 
              if (r_type == R_386_PC32)
                {
 
              if (r_type == R_386_PC32)
                {


@@ -1803,7 +1776,24 @@ do_relocation:
                  /* 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)

-                   func_pointer_ref = TRUE;
+                   func_pointer_ref = true;
+               }
+
+             if (h->pointer_equality_needed
+                 && h->type == STT_FUNC
+                 && eh->def_protected
+                 && elf_has_indirect_extern_access (h->root.u.def.section->owner))
+               {
+                 /* Disallow non-canonical reference to canonical
+                    protected function.  */
+                 _bfd_error_handler
+                   /* xgettext:c-format */
+                   (_("%pB: non-canonical reference to canonical "
+                      "protected function `%s' in %pB"),
+                    abfd, h->root.root.string,
+                    h->root.u.def.section->owner);
+                 bfd_set_error (bfd_error_bad_value);
+                 goto error_return;

                }
 
              if (!func_pointer_ref)
                }
 
              if (!func_pointer_ref)


@@ -1816,6 +1806,9 @@ do_relocation:
                     adjust_dynamic_symbol.  */
                  h->non_got_ref = 1;
 
                     adjust_dynamic_symbol.  */
                  h->non_got_ref = 1;
 

+                 if (!elf_has_indirect_extern_access (sec->owner))
+                   eh->non_got_ref_without_indirect_extern_access = 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.  */
                  /* 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.  */


@@ -1825,31 +1818,20 @@ do_relocation:
                }
            }
 
                }
            }
 

-         size_reloc = FALSE;
-do_size:
-         if (NEED_DYNAMIC_RELOCATION_P (info, FALSE, h, sec, r_type,
-                                        R_386_32))
+         size_reloc = false;
+       do_size:
+         if (!no_dynreloc
+             && NEED_DYNAMIC_RELOCATION_P (false, 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;
 

-             /* We must copy these reloc types into the output file.
-                Create a reloc section in dynobj and make room for
-                this reloc.  */
-             if (sreloc == NULL)
-               {
-                 sreloc = _bfd_elf_make_dynamic_reloc_section
-                   (sec, htab->elf.dynobj, 2, abfd, /*rela?*/ FALSE);
-
-                 if (sreloc == NULL)
-                   goto error_return;
-               }
-

              /* If this is a global symbol, we count the number of
                 relocations we need for this symbol.  */
              if (h != NULL)
                {
              /* If this is a global symbol, we count the number of
                 relocations we need for this symbol.  */
              if (h != NULL)
                {

-                 head = &eh->dyn_relocs;
+                 head = &h->dyn_relocs;

                }
              else
                {
                }
              else
                {


@@ -1859,7 +1841,7 @@ do_size:
                  void **vpp;
                  asection *s;
 
                  void **vpp;
                  asection *s;
 

-                 isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+                 isym = bfd_sym_from_r_symndx (&htab->elf.sym_cache,

                                                abfd, r_symndx);
                  if (isym == NULL)
                    goto error_return;
                                                abfd, r_symndx);
                  if (isym == NULL)
                    goto error_return;


@@ -1875,7 +1857,7 @@ do_size:
              p = *head;
              if (p == NULL || p->sec != sec)
                {
              p = *head;
              if (p == NULL || p->sec != sec)
                {

-                 bfd_size_type amt = sizeof *p;
+                 size_t amt = sizeof *p;

                  p = (struct elf_dyn_relocs *) bfd_alloc (htab->elf.dynobj,
                                                           amt);
                  if (p == NULL)
                  p = (struct elf_dyn_relocs *) bfd_alloc (htab->elf.dynobj,
                                                           amt);
                  if (p == NULL)


@@ -1915,13 +1897,14 @@ do_size:
 
   if (elf_section_data (sec)->this_hdr.contents != contents)
     {
 
   if (elf_section_data (sec)->this_hdr.contents != contents)
     {

-      if (!converted && !info->keep_memory)
+      if (!converted && !_bfd_link_keep_memory (info))

        free (contents);
       else
        {
          /* 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;
        free (contents);
       else
        {
          /* 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;

+         info->cache_size += sec->size;

        }
     }
 
        }
     }
 


@@ -1929,19 +1912,37 @@ do_size:
   if (elf_section_data (sec)->relocs != relocs && converted)
     elf_section_data (sec)->relocs = (Elf_Internal_Rela *) relocs;
 
   if (elf_section_data (sec)->relocs != relocs && converted)
     elf_section_data (sec)->relocs = (Elf_Internal_Rela *) relocs;
 

-  return TRUE;
+  return true;

 
 

-error_return:
+ error_return:

   if (elf_section_data (sec)->this_hdr.contents != contents)
     free (contents);
   sec->check_relocs_failed = 1;
   if (elf_section_data (sec)->this_hdr.contents != contents)
     free (contents);
   sec->check_relocs_failed = 1;

-  return FALSE;
+  return false;
+}
+
+static bool
+elf_i386_always_size_sections (bfd *output_bfd,
+                              struct bfd_link_info *info)
+{
+  bfd *abfd;
+
+  /* Scan relocations after rel_from_abs has been set on __ehdr_start.  */
+  for (abfd = info->input_bfds;
+       abfd != (bfd *) NULL;
+       abfd = abfd->link.next)
+    if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
+       && !_bfd_elf_link_iterate_on_relocs (abfd, info,
+                                            elf_i386_scan_relocs))
+      return false;
+
+  return _bfd_x86_elf_always_size_sections (output_bfd, info);

 }
 
 /* Set the correct type for an x86 ELF section.  We do this by the
    section name, which is a hack, but ought to work.  */
 
 }
 
 /* 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 bool

 elf_i386_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
                        Elf_Internal_Shdr *hdr,
                        asection *sec)
 elf_i386_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
                        Elf_Internal_Shdr *hdr,
                        asection *sec)


@@ -1969,7 +1970,7 @@ elf_i386_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
   if (strcmp (name, ".reloc") == 0)
     hdr->sh_type = SHT_PROGBITS;
 
   if (strcmp (name, ".reloc") == 0)
     hdr->sh_type = SHT_PROGBITS;
 

-  return TRUE;
+  return true;

 }
 
 /* Return the relocation value for @tpoff relocation
 }
 
 /* Return the relocation value for @tpoff relocation


@@ -1993,7 +1994,7 @@ elf_i386_tpoff (struct bfd_link_info *info, bfd_vma address)
 
 /* Relocate an i386 ELF section.  */
 
 
 /* Relocate an i386 ELF section.  */
 

-static bfd_boolean
+static int

 elf_i386_relocate_section (bfd *output_bfd,
                           struct bfd_link_info *info,
                           bfd *input_bfd,
 elf_i386_relocate_section (bfd *output_bfd,
                           struct bfd_link_info *info,
                           bfd *input_bfd,


@@ -2011,21 +2012,21 @@ elf_i386_relocate_section (bfd *output_bfd,
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *wrel;
   Elf_Internal_Rela *relend;
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *wrel;
   Elf_Internal_Rela *relend;

-  bfd_boolean is_vxworks_tls;
+  bool is_vxworks_tls;

   unsigned plt_entry_size;
 
   unsigned plt_entry_size;
 

-  /* Skip if check_relocs failed.  */
+  /* Skip if check_relocs or scan_relocs failed.  */

   if (input_section->check_relocs_failed)
   if (input_section->check_relocs_failed)

-    return FALSE;
+    return false;

 
   htab = elf_x86_hash_table (info, I386_ELF_DATA);
   if (htab == NULL)
 
   htab = elf_x86_hash_table (info, I386_ELF_DATA);
   if (htab == NULL)

-    return FALSE;
+    return false;

 
   if (!is_x86_elf (input_bfd, htab))
     {
       bfd_set_error (bfd_error_wrong_format);
 
   if (!is_x86_elf (input_bfd, htab))
     {
       bfd_set_error (bfd_error_wrong_format);

-      return FALSE;
+      return false;

     }
 
   symtab_hdr = &elf_symtab_hdr (input_bfd);
     }
 
   symtab_hdr = &elf_symtab_hdr (input_bfd);


@@ -2034,7 +2035,7 @@ elf_i386_relocate_section (bfd *output_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'.  */
   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'.  */

-  is_vxworks_tls = (htab->target_os == is_vxworks
+  is_vxworks_tls = (htab->elf.target_os == is_vxworks

                    && bfd_link_pic (info)
                    && !strcmp (input_section->output_section->name,
                                ".tls_vars"));
                    && bfd_link_pic (info)
                    && !strcmp (input_section->output_section->name,
                                ".tls_vars"));


@@ -2056,14 +2057,14 @@ elf_i386_relocate_section (bfd *output_bfd,
       asection *sec;
       bfd_vma off, offplt, plt_offset;
       bfd_vma relocation;
       asection *sec;
       bfd_vma off, offplt, plt_offset;
       bfd_vma relocation;

-      bfd_boolean unresolved_reloc;
+      bool unresolved_reloc;

       bfd_reloc_status_type r;
       unsigned int indx;
       int tls_type;
       bfd_vma st_size;
       asection *resolved_plt;
       bfd_reloc_status_type r;
       unsigned int indx;
       int tls_type;
       bfd_vma st_size;
       asection *resolved_plt;

-      bfd_boolean resolved_to_zero;
-      bfd_boolean relative_reloc;
+      bool resolved_to_zero;
+      bool relative_reloc;

 
       r_type = ELF32_R_TYPE (rel->r_info);
       if (r_type == R_386_GNU_VTINHERIT
 
       r_type = ELF32_R_TYPE (rel->r_info);
       if (r_type == R_386_GNU_VTINHERIT


@@ -2082,7 +2083,7 @@ elf_i386_relocate_section (bfd *output_bfd,
       h = NULL;
       sym = NULL;
       sec = NULL;
       h = NULL;
       sym = NULL;
       sec = NULL;

-      unresolved_reloc = FALSE;
+      unresolved_reloc = false;

       if (r_symndx < symtab_hdr->sh_info)
        {
          sym = local_syms + r_symndx;
       if (r_symndx < symtab_hdr->sh_info)
        {
          sym = local_syms + r_symndx;


@@ -2166,7 +2167,7 @@ elf_i386_relocate_section (bfd *output_bfd,
            {
              /* Relocate against local STT_GNU_IFUNC symbol.  */
              h = _bfd_elf_x86_get_local_sym_hash (htab, input_bfd, rel,
            {
              /* Relocate against local STT_GNU_IFUNC symbol.  */
              h = _bfd_elf_x86_get_local_sym_hash (htab, input_bfd, rel,

-                                                  FALSE);
+                                                  false);

              if (h == NULL)
                abort ();
 
              if (h == NULL)
                abort ();
 


@@ -2177,8 +2178,8 @@ elf_i386_relocate_section (bfd *output_bfd,
        }
       else
        {
        }
       else
        {

-         bfd_boolean warned ATTRIBUTE_UNUSED;
-         bfd_boolean ignored ATTRIBUTE_UNUSED;
+         bool warned ATTRIBUTE_UNUSED;
+         bool ignored ATTRIBUTE_UNUSED;

 
          RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
                                   r_symndx, symtab_hdr, sym_hashes,
 
          RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
                                   r_symndx, symtab_hdr, sym_hashes,


@@ -2302,7 +2303,7 @@ elf_i386_relocate_section (bfd *output_bfd,
                    {
                      /* This references the local defitionion.  We must
                         initialize this entry in the global offset table.
                    {
                      /* This references the local defitionion.  We must
                         initialize this entry in the global offset table.

-                        Since the offset must always be a multiple of 8,
+                        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 use the least significant bit to record
                         whether we have initialized it already.
 


@@ -2362,7 +2363,7 @@ elf_i386_relocate_section (bfd *output_bfd,
          switch (r_type)
            {
            default:
          switch (r_type)
            {
            default:

-bad_ifunc_reloc:
+           bad_ifunc_reloc:

              if (h->root.root.string)
                name = h->root.root.string;
              else
              if (h->root.root.string)
                name = h->root.root.string;
              else


@@ -2374,7 +2375,7 @@ bad_ifunc_reloc:
                   "symbol `%s' isn't supported"), input_bfd,
                 howto->name, name);
              bfd_set_error (bfd_error_bad_value);
                   "symbol `%s' isn't supported"), input_bfd,
                 howto->name, name);
              bfd_set_error (bfd_error_bad_value);

-             return FALSE;
+             return false;

 
            case R_386_32:
              /* Generate dynamic relcoation only when there is a
 
            case R_386_32:
              /* Generate dynamic relcoation only when there is a


@@ -2386,7 +2387,7 @@ bad_ifunc_reloc:
                  asection *sreloc;
                  bfd_vma offset;
 
                  asection *sreloc;
                  bfd_vma offset;
 

-do_ifunc_pointer:
+               do_ifunc_pointer:

                  /* Need a dynamic relocation to get the real function
                     adddress.  */
                  offset = _bfd_elf_section_offset (output_bfd,
                  /* Need a dynamic relocation to get the real function
                     adddress.  */
                  offset = _bfd_elf_section_offset (output_bfd,


@@ -2409,6 +2410,12 @@ do_ifunc_pointer:
 
                      /* This symbol is resolved locally.  */
                      outrel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);
 
                      /* This symbol is resolved locally.  */
                      outrel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);

+
+                     if (htab->params->report_relative_reloc)
+                       _bfd_x86_elf_link_report_relative_reloc
+                         (info, input_section, h, sym,
+                          "R_386_IRELATIVE", &outrel);
+

                      bfd_put_32 (output_bfd,
                                  (h->root.u.def.value
                                   + h->root.u.def.section->output_section->vma
                      bfd_put_32 (output_bfd,
                                  (h->root.u.def.value
                                   + h->root.u.def.section->output_section->vma


@@ -2449,7 +2456,7 @@ do_ifunc_pointer:
            }
        }
 
            }
        }
 

-skip_ifunc:
+    skip_ifunc:

       resolved_to_zero = (eh != NULL
                          && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh));
 
       resolved_to_zero = (eh != NULL
                          && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh));
 


@@ -2462,7 +2469,7 @@ skip_ifunc:
          if (htab->elf.sgot == NULL)
            abort ();
 
          if (htab->elf.sgot == NULL)
            abort ();
 

-         relative_reloc = FALSE;
+         relative_reloc = false;

          if (h != NULL)
            {
              off = h->got.offset;
          if (h != NULL)
            {
              off = h->got.offset;


@@ -2483,18 +2490,20 @@ skip_ifunc:
                      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))
+                     /* NB: Don't generate relative relocation here if
+                        it has been generated by DT_RELR.  */
+                     if (!info->enable_dt_relr
+                         && 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;
                        {
                          /* 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;
+                         relative_reloc = true;

                        }
                    }
                }
              else
                        }
                    }
                }
              else

-               unresolved_reloc = FALSE;
+               unresolved_reloc = false;

            }
          else
            {
            }
          else
            {


@@ -2514,8 +2523,10 @@ skip_ifunc:
                              htab->elf.sgot->contents + off);
                  local_got_offsets[r_symndx] |= 1;
 
                              htab->elf.sgot->contents + off);
                  local_got_offsets[r_symndx] |= 1;
 

-                 if (bfd_link_pic (info))
-                   relative_reloc = TRUE;
+                 /* NB: Don't generate relative relocation here if it
+                    has been generated by DT_RELR.  */
+                 if (!info->enable_dt_relr && bfd_link_pic (info))
+                   relative_reloc = true;

                }
            }
 
                }
            }
 


@@ -2532,6 +2543,12 @@ skip_ifunc:
                                 + htab->elf.sgot->output_offset
                                 + off);
              outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
                                 + htab->elf.sgot->output_offset
                                 + off);
              outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);

+
+             if (htab->params->report_relative_reloc)
+               _bfd_x86_elf_link_report_relative_reloc
+                 (info, input_section, h, sym, "R_386_RELATIVE",
+                  &outrel);
+

              elf_append_rel (output_bfd, s, &outrel);
            }
 
              elf_append_rel (output_bfd, s, &outrel);
            }
 


@@ -2551,7 +2568,7 @@ skip_ifunc:
                     we don't know what the GOT base is.  */
                  const char *name;
 
                     we don't know what the GOT base is.  */
                  const char *name;
 

-disallow_got32:
+               disallow_got32:

                  if (h == NULL || h->root.root.string == NULL)
                    name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
                                             NULL);
                  if (h == NULL || h->root.root.string == NULL)
                    name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
                                             NULL);


@@ -2565,7 +2582,7 @@ disallow_got32:
                       " when making a shared object"),
                     input_bfd, howto->name, name);
                  bfd_set_error (bfd_error_bad_value);
                       " when making a shared object"),
                     input_bfd, howto->name, name);
                  bfd_set_error (bfd_error_bad_value);

-                 return FALSE;
+                 return false;

                }
            }
          else
                }
            }
          else


@@ -2614,7 +2631,7 @@ disallow_got32:
                       " `%s' can not be used when making a shared object"),
                     input_bfd, v, h->root.root.string);
                  bfd_set_error (bfd_error_bad_value);
                       " `%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;
+                 return false;

                }
              else if (!SYMBOL_REFERENCES_LOCAL_P (info, h)
                       && (h->type == STT_FUNC
                }
              else if (!SYMBOL_REFERENCES_LOCAL_P (info, h)
                       && (h->type == STT_FUNC


@@ -2629,7 +2646,7 @@ disallow_got32:
                     h->type == STT_FUNC ? "function" : "data",
                     h->root.root.string);
                  bfd_set_error (bfd_error_bad_value);
                     h->type == STT_FUNC ? "function" : "data",
                     h->root.root.string);
                  bfd_set_error (bfd_error_bad_value);

-                 return FALSE;
+                 return false;

                }
            }
 
                }
            }
 


@@ -2646,7 +2663,7 @@ disallow_got32:
          /* Use global offset table as symbol value.  */
          relocation = htab->elf.sgotplt->output_section->vma
                       + htab->elf.sgotplt->output_offset;
          /* Use global offset table as symbol value.  */
          relocation = htab->elf.sgotplt->output_section->vma
                       + htab->elf.sgotplt->output_offset;

-         unresolved_reloc = FALSE;
+         unresolved_reloc = false;

          break;
 
        case R_386_PLT32:
          break;
 
        case R_386_PLT32:


@@ -2690,7 +2707,7 @@ disallow_got32:
          relocation = (resolved_plt->output_section->vma
                        + resolved_plt->output_offset
                        + plt_offset);
          relocation = (resolved_plt->output_section->vma
                        + resolved_plt->output_offset
                        + plt_offset);

-         unresolved_reloc = FALSE;
+         unresolved_reloc = false;

          break;
 
        case R_386_SIZE32:
          break;
 
        case R_386_SIZE32:


@@ -2704,51 +2721,68 @@ disallow_got32:
              || is_vxworks_tls)
            break;
 
              || is_vxworks_tls)
            break;
 

-         if (GENERATE_DYNAMIC_RELOCATION_P (info, eh, r_type,
-                                            FALSE, resolved_to_zero,
+         if (GENERATE_DYNAMIC_RELOCATION_P (false, info, eh, r_type,
+                                            sec, false,
+                                            resolved_to_zero,

                                             (r_type == R_386_PC32)))
            {
              Elf_Internal_Rela outrel;
                                             (r_type == R_386_PC32)))
            {
              Elf_Internal_Rela outrel;

-             bfd_boolean skip, relocate;
+             bool skip, relocate;
+             bool generate_dynamic_reloc = true;

              asection *sreloc;
 
              /* When generating a shared object, these relocations
                 are copied into the output file to be resolved at run
                 time.  */
 
              asection *sreloc;
 
              /* When generating a shared object, these relocations
                 are copied into the output file to be resolved at run
                 time.  */
 

-             skip = FALSE;
-             relocate = FALSE;
+             skip = false;
+             relocate = false;

 
              outrel.r_offset =
                _bfd_elf_section_offset (output_bfd, info, input_section,
                                         rel->r_offset);
              if (outrel.r_offset == (bfd_vma) -1)
 
              outrel.r_offset =
                _bfd_elf_section_offset (output_bfd, info, input_section,
                                         rel->r_offset);
              if (outrel.r_offset == (bfd_vma) -1)

-               skip = TRUE;
+               skip = true;

              else if (outrel.r_offset == (bfd_vma) -2)
              else if (outrel.r_offset == (bfd_vma) -2)

-               skip = TRUE, relocate = TRUE;
+               skip = true, relocate = true;

              outrel.r_offset += (input_section->output_section->vma
                                  + input_section->output_offset);
 
              if (skip)
                memset (&outrel, 0, sizeof outrel);
              outrel.r_offset += (input_section->output_section->vma
                                  + input_section->output_offset);
 
              if (skip)
                memset (&outrel, 0, sizeof outrel);

-             else if (COPY_INPUT_RELOC_P (info, h, r_type))
+             else if (COPY_INPUT_RELOC_P (false, info, h, r_type))

                outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
              else
                {
                  /* This symbol is local, or marked to become local.  */
                outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
              else
                {
                  /* This symbol is local, or marked to become local.  */

-                 relocate = TRUE;
-                 outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
-               }
+                 relocate = true;
+                 /* NB: Don't generate relative relocation here if it
+                    has been generated by DT_RELR.  */
+                 if (info->enable_dt_relr)
+                   generate_dynamic_reloc = false;
+                 else
+                   {
+                     outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);

 
 

-             sreloc = elf_section_data (input_section)->sreloc;
+                     if (htab->params->report_relative_reloc)
+                       _bfd_x86_elf_link_report_relative_reloc
+                         (info, input_section, h, sym, "R_386_RELATIVE",
+                          &outrel);
+                   }
+               }

 
 

-             if (sreloc == NULL || sreloc->contents == NULL)
+             if (generate_dynamic_reloc)

                {
                {

-                 r = bfd_reloc_notsupported;
-                 goto check_relocation_error;
-               }
+                 sreloc = elf_section_data (input_section)->sreloc;

 
 

-             elf_append_rel (output_bfd, sreloc, &outrel);
+                 if (sreloc == NULL || sreloc->contents == NULL)
+                   {
+                     r = bfd_reloc_notsupported;
+                     goto check_relocation_error;
+                   }
+
+                 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
 
              /* If this reloc is against an external symbol, we do
                 not want to fiddle with the addend.  Otherwise, we


@@ -2769,6 +2803,12 @@ disallow_got32:
                                + input_section->output_section->vma
                                + input_section->output_offset;
              outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
                                + input_section->output_section->vma
                                + input_section->output_offset;
              outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);

+
+             if (htab->params->report_relative_reloc)
+               _bfd_x86_elf_link_report_relative_reloc
+                 (info, input_section, h, sym, "R_386_RELATIVE",
+                  &outrel);
+

              sreloc = elf_section_data (input_section)->sreloc;
              if (sreloc == NULL)
                abort ();
              sreloc = elf_section_data (input_section)->sreloc;
              if (sreloc == NULL)
                abort ();


@@ -2794,8 +2834,8 @@ disallow_got32:
                                         input_section, contents,
                                         symtab_hdr, sym_hashes,
                                         &r_type_tls, tls_type, rel,
                                         input_section, contents,
                                         symtab_hdr, sym_hashes,
                                         &r_type_tls, tls_type, rel,

-                                        relend, h, r_symndx, TRUE))
-           return FALSE;
+                                        relend, h, r_symndx, true))
+           return false;

 
          if (r_type_tls == R_386_TLS_LE_32)
            {
 
          if (r_type_tls == R_386_TLS_LE_32)
            {


@@ -3124,7 +3164,7 @@ disallow_got32:
              || r_type_tls == R_386_TLS_DESC_CALL)
            {
              relocation = htab->sgotplt_jump_table_size + offplt;
              || r_type_tls == R_386_TLS_DESC_CALL)
            {
              relocation = htab->sgotplt_jump_table_size + offplt;

-             unresolved_reloc = FALSE;
+             unresolved_reloc = false;

            }
          else if (r_type_tls == r_type)
            {
            }
          else if (r_type_tls == r_type)
            {


@@ -3137,7 +3177,7 @@ disallow_got32:
                relocation += 4;
              if (r_type == R_386_TLS_IE)
                relocation += g_o_t;
                relocation += 4;
              if (r_type == R_386_TLS_IE)
                relocation += g_o_t;

-             unresolved_reloc = FALSE;
+             unresolved_reloc = false;

            }
          else if (r_type == R_386_TLS_GD)
            {
            }
          else if (r_type == R_386_TLS_GD)
            {


@@ -3268,7 +3308,7 @@ disallow_got32:
              continue;
            }
          else
              continue;
            }
          else

-           BFD_ASSERT (FALSE);
+           BFD_ASSERT (false);

          break;
 
        case R_386_TLS_LDM:
          break;
 
        case R_386_TLS_LDM:


@@ -3276,8 +3316,8 @@ disallow_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, TRUE))
-           return FALSE;
+                                        relend, h, r_symndx, true))
+           return false;

 
          if (r_type != R_386_TLS_LDM)
            {
 
          if (r_type != R_386_TLS_LDM)
            {


@@ -3338,7 +3378,7 @@ disallow_got32:
                       + htab->elf.sgot->output_offset + off
                       - htab->elf.sgotplt->output_section->vma
                       - htab->elf.sgotplt->output_offset;
                       + htab->elf.sgot->output_offset + off
                       - htab->elf.sgotplt->output_section->vma
                       - htab->elf.sgotplt->output_offset;

-         unresolved_reloc = FALSE;
+         unresolved_reloc = false;

          break;
 
        case R_386_TLS_LDO_32:
          break;
 
        case R_386_TLS_LDO_32:


@@ -3406,15 +3446,15 @@ disallow_got32:
             (uint64_t) rel->r_offset,
             howto->name,
             h->root.root.string);
             (uint64_t) rel->r_offset,
             howto->name,
             h->root.root.string);

-         return FALSE;
+         return false;

        }
 
        }
 

-do_relocation:
+    do_relocation:

       r = _bfd_final_link_relocate (howto, input_bfd, input_section,
                                    contents, rel->r_offset,
                                    relocation, 0);
 
       r = _bfd_final_link_relocate (howto, input_bfd, input_section,
                                    contents, rel->r_offset,
                                    relocation, 0);
 

-check_relocation_error:
+    check_relocation_error:

       if (r != bfd_reloc_ok)
        {
          const char *name;
       if (r != bfd_reloc_ok)
        {
          const char *name;


@@ -3427,7 +3467,7 @@ check_relocation_error:
                                                      symtab_hdr->sh_link,
                                                      sym->st_name);
              if (name == NULL)
                                                      symtab_hdr->sh_link,
                                                      sym->st_name);
              if (name == NULL)

-               return FALSE;
+               return false;

              if (*name == '\0')
                name = bfd_section_name (sec);
            }
              if (*name == '\0')
                name = bfd_section_name (sec);
            }


@@ -3443,7 +3483,7 @@ check_relocation_error:
                (_("%pB(%pA+%#" PRIx64 "): reloc against `%s': error %d"),
                 input_bfd, input_section,
                 (uint64_t) rel->r_offset, name, (int) r);
                (_("%pB(%pA+%#" PRIx64 "): reloc against `%s': error %d"),
                 input_bfd, input_section,
                 (uint64_t) rel->r_offset, name, (int) r);

-             return FALSE;
+             return false;

            }
        }
 
            }
        }
 


@@ -3471,13 +3511,13 @@ check_relocation_error:
       input_section->reloc_count -= deleted;
     }
 
       input_section->reloc_count -= deleted;
     }
 

-  return TRUE;
+  return true;

 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 

-static bfd_boolean
+static bool

 elf_i386_finish_dynamic_symbol (bfd *output_bfd,
                                struct bfd_link_info *info,
                                struct elf_link_hash_entry *h,
 elf_i386_finish_dynamic_symbol (bfd *output_bfd,
                                struct bfd_link_info *info,
                                struct elf_link_hash_entry *h,


@@ -3486,12 +3526,12 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
   struct elf_x86_link_hash_table *htab;
   unsigned plt_entry_size;
   struct elf_x86_link_hash_entry *eh;
   struct elf_x86_link_hash_table *htab;
   unsigned plt_entry_size;
   struct elf_x86_link_hash_entry *eh;

-  bfd_boolean local_undefweak;
-  bfd_boolean use_plt_second;
+  bool local_undefweak;
+  bool use_plt_second;

 
   htab = elf_x86_hash_table (info, I386_ELF_DATA);
   if (htab == NULL)
 
   htab = elf_x86_hash_table (info, I386_ELF_DATA);
   if (htab == NULL)

-    return FALSE;
+    return false;

 
   plt_entry_size = htab->plt.plt_entry_size;
 
 
   plt_entry_size = htab->plt.plt_entry_size;
 


@@ -3588,7 +3628,7 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
                      resolved_plt->contents + plt_offset
                      + htab->plt.plt_got_offset);
 
                      resolved_plt->contents + plt_offset
                      + htab->plt.plt_got_offset);
 

-         if (htab->target_os == is_vxworks)
+         if (htab->elf.target_os == is_vxworks)

            {
              int s, k, reloc_index;
 
            {
              int s, k, reloc_index;
 


@@ -3664,6 +3704,11 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
                           + h->root.u.def.section->output_offset),
                          gotplt->contents + got_offset);
              rel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);
                           + h->root.u.def.section->output_offset),
                          gotplt->contents + got_offset);
              rel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);

+
+             if (htab->params->report_relative_reloc)
+               _bfd_x86_elf_link_report_relative_reloc
+                 (info, relplt, h, sym, "R_386_IRELATIVE", &rel);
+

              /* R_386_IRELATIVE comes last.  */
              plt_index = htab->next_irelative_index--;
            }
              /* R_386_IRELATIVE comes last.  */
              plt_index = htab->next_irelative_index--;
            }


@@ -3762,6 +3807,8 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
     {
       Elf_Internal_Rela rel;
       asection *relgot = htab->elf.srelgot;
     {
       Elf_Internal_Rela rel;
       asection *relgot = htab->elf.srelgot;

+      const char *relative_reloc_name = NULL;
+      bool generate_dynamic_reloc = true;

 
       /* 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.  */


@@ -3802,6 +3849,7 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
                               + h->root.u.def.section->output_offset),
                              htab->elf.sgot->contents + h->got.offset);
                  rel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);
                               + h->root.u.def.section->output_offset),
                              htab->elf.sgot->contents + h->got.offset);
                  rel.r_info = ELF32_R_INFO (0, R_386_IRELATIVE);

+                 relative_reloc_name = "R_386_IRELATIVE";

                }
              else
                goto do_glob_dat;
                }
              else
                goto do_glob_dat;


@@ -3836,25 +3884,39 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd,
                          (plt->output_section->vma
                           + plt->output_offset + plt_offset),
                          htab->elf.sgot->contents + h->got.offset);
                          (plt->output_section->vma
                           + plt->output_offset + plt_offset),
                          htab->elf.sgot->contents + h->got.offset);

-             return TRUE;
+             return true;

            }
        }
       else if (bfd_link_pic (info)
               && SYMBOL_REFERENCES_LOCAL_P (info, h))
        {
          BFD_ASSERT((h->got.offset & 1) != 0);
            }
        }
       else if (bfd_link_pic (info)
               && SYMBOL_REFERENCES_LOCAL_P (info, h))
        {
          BFD_ASSERT((h->got.offset & 1) != 0);

-         rel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
+         if (info->enable_dt_relr)
+           generate_dynamic_reloc = false;
+         else
+           {
+             rel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
+             relative_reloc_name = "R_386_RELATIVE";
+           }

        }
       else
        {
          BFD_ASSERT((h->got.offset & 1) == 0);
        }
       else
        {
          BFD_ASSERT((h->got.offset & 1) == 0);

-do_glob_dat:
+       do_glob_dat:

          bfd_put_32 (output_bfd, (bfd_vma) 0,
                      htab->elf.sgot->contents + h->got.offset);
          rel.r_info = ELF32_R_INFO (h->dynindx, R_386_GLOB_DAT);
        }
 
          bfd_put_32 (output_bfd, (bfd_vma) 0,
                      htab->elf.sgot->contents + h->got.offset);
          rel.r_info = ELF32_R_INFO (h->dynindx, R_386_GLOB_DAT);
        }
 

-      elf_append_rel (output_bfd, relgot, &rel);
+      if (generate_dynamic_reloc)
+       {
+         if (relative_reloc_name != NULL
+             && htab->params->report_relative_reloc)
+           _bfd_x86_elf_link_report_relative_reloc
+             (info, relgot, h, sym, relative_reloc_name, &rel);
+
+         elf_append_rel (output_bfd, relgot, &rel);
+       }

     }
 
   if (h->needs_copy)
     }
 
   if (h->needs_copy)


@@ -3876,13 +3938,13 @@ do_glob_dat:
       elf_append_rel (output_bfd, s, &rel);
     }
 
       elf_append_rel (output_bfd, s, &rel);
     }
 

-  return TRUE;
+  return true;

 }
 
 /* Finish up local dynamic symbol handling.  We set the contents of
    various dynamic sections here.  */
 
 }
 
 /* Finish up local dynamic symbol handling.  We set the contents of
    various dynamic sections here.  */
 

-static bfd_boolean
+static int

 elf_i386_finish_local_dynamic_symbol (void **slot, void *inf)
 {
   struct elf_link_hash_entry *h
 elf_i386_finish_local_dynamic_symbol (void **slot, void *inf)
 {
   struct elf_link_hash_entry *h


@@ -3898,7 +3960,7 @@ elf_i386_finish_local_dynamic_symbol (void **slot, void *inf)
    here since undefined weak symbol may not be dynamic and may not be
    called for elf_i386_finish_dynamic_symbol.  */
 
    here since undefined weak symbol may not be dynamic and may not be
    called for elf_i386_finish_dynamic_symbol.  */
 

-static bfd_boolean
+static bool

 elf_i386_pie_finish_undefweak_symbol (struct bfd_hash_entry *bh,
                                      void *inf)
 {
 elf_i386_pie_finish_undefweak_symbol (struct bfd_hash_entry *bh,
                                      void *inf)
 {


@@ -3907,7 +3969,7 @@ elf_i386_pie_finish_undefweak_symbol (struct bfd_hash_entry *bh,
 
   if (h->root.type != bfd_link_hash_undefweak
       || h->dynindx != -1)
 
   if (h->root.type != bfd_link_hash_undefweak
       || h->dynindx != -1)

-    return TRUE;
+    return true;

 
   return elf_i386_finish_dynamic_symbol (info->output_bfd,
                                         info, h, NULL);
 
   return elf_i386_finish_dynamic_symbol (info->output_bfd,
                                         info, h, NULL);


@@ -3962,7 +4024,7 @@ elf_i386_reloc_type_class (const struct bfd_link_info *info,
 
 /* Finish up the dynamic sections.  */
 
 
 /* Finish up the dynamic sections.  */
 

-static bfd_boolean
+static bool

 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)
 {


@@ -3970,13 +4032,21 @@ elf_i386_finish_dynamic_sections (bfd *output_bfd,
 
   htab = _bfd_x86_elf_finish_dynamic_sections (output_bfd, info);
   if (htab == NULL)
 
   htab = _bfd_x86_elf_finish_dynamic_sections (output_bfd, info);
   if (htab == NULL)

-    return FALSE;
+    return false;

 
   if (!htab->elf.dynamic_sections_created)
 
   if (!htab->elf.dynamic_sections_created)

-    return TRUE;
+    return true;

 
   if (htab->elf.splt && htab->elf.splt->size > 0)
     {
 
   if (htab->elf.splt && htab->elf.splt->size > 0)
     {

+      if (bfd_is_abs_section (htab->elf.splt->output_section))
+       {
+         info->callbacks->einfo
+           (_("%F%P: discarded output section: `%pA'\n"),
+            htab->elf.splt);
+         return false;
+       }
+

       /* 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)
       /* 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)


@@ -4006,7 +4076,7 @@ elf_i386_finish_dynamic_sections (bfd *output_bfd,
                          htab->elf.splt->contents
                          + htab->lazy_plt->plt0_got2_offset);
 
                          htab->elf.splt->contents
                          + htab->lazy_plt->plt0_got2_offset);
 

-             if (htab->target_os == is_vxworks)
+             if (htab->elf.target_os == is_vxworks)

                {
                  Elf_Internal_Rela rel;
                  int num_plts = (htab->elf.splt->size
                {
                  Elf_Internal_Rela rel;
                  int num_plts = (htab->elf.splt->size


@@ -4066,7 +4136,7 @@ elf_i386_finish_dynamic_sections (bfd *output_bfd,
                       elf_i386_pie_finish_undefweak_symbol,
                       info);
 
                       elf_i386_pie_finish_undefweak_symbol,
                       info);
 

-  return TRUE;
+  return true;

 }
 
 /* Fill PLT/GOT entries and allocate dynamic relocations for local
 }
 
 /* Fill PLT/GOT entries and allocate dynamic relocations for local


@@ -4074,7 +4144,7 @@ elf_i386_finish_dynamic_sections (bfd *output_bfd,
    It has to be done before elf_link_sort_relocs is called so that
    dynamic relocations are properly sorted.  */
 
    It has to be done before elf_link_sort_relocs is called so that
    dynamic relocations are properly sorted.  */
 

-static bfd_boolean
+static bool

 elf_i386_output_arch_local_syms
   (bfd *output_bfd ATTRIBUTE_UNUSED,
    struct bfd_link_info *info,
 elf_i386_output_arch_local_syms
   (bfd *output_bfd ATTRIBUTE_UNUSED,
    struct bfd_link_info *info,


@@ -4087,19 +4157,16 @@ elf_i386_output_arch_local_syms
   struct elf_x86_link_hash_table *htab
     = elf_x86_hash_table (info, I386_ELF_DATA);
   if (htab == NULL)
   struct elf_x86_link_hash_table *htab
     = elf_x86_hash_table (info, I386_ELF_DATA);
   if (htab == NULL)

-    return FALSE;
+    return false;

 
   /* Fill PLT and GOT entries for local STT_GNU_IFUNC symbols.  */
   htab_traverse (htab->loc_hash_table,
                 elf_i386_finish_local_dynamic_symbol,
                 info);
 
 
   /* Fill PLT and GOT entries for local STT_GNU_IFUNC symbols.  */
   htab_traverse (htab->loc_hash_table,
                 elf_i386_finish_local_dynamic_symbol,
                 info);
 

-  return TRUE;
+  return true;

 }
 
 }
 

-/* 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.   */
 
 /* Similar to _bfd_elf_get_synthetic_symtab.  Support PLTs with all
    dynamic relocations.   */
 


@@ -4147,7 +4214,7 @@ elf_i386_get_synthetic_symtab (bfd *abfd,
   lazy_plt = NULL;
   non_lazy_ibt_plt = NULL;
   lazy_ibt_plt = NULL;
   lazy_plt = NULL;
   non_lazy_ibt_plt = NULL;
   lazy_ibt_plt = NULL;

-  switch (get_elf_x86_backend_data (abfd)->target_os)
+  switch (get_elf_backend_data (abfd)->target_os)

     {
     case is_normal:
     case is_solaris:
     {
     case is_normal:
     case is_solaris:


@@ -4158,9 +4225,8 @@ elf_i386_get_synthetic_symtab (bfd *abfd,
     case is_vxworks:
       lazy_plt = &elf_i386_lazy_plt;
       break;
     case is_vxworks:
       lazy_plt = &elf_i386_lazy_plt;
       break;

-    case is_nacl:
-      lazy_plt = &elf_i386_nacl_plt;
-      break;
+    default:
+      abort ();

     }
 
   got_addr = 0;
     }
 
   got_addr = 0;


@@ -4307,7 +4373,7 @@ elf_i386_link_setup_gnu_properties (struct bfd_link_info *info)
 {
   struct elf_x86_init_table init_table;
 
 {
   struct elf_x86_init_table init_table;
 

-  switch (get_elf_x86_backend_data (info->output_bfd)->target_os)
+  switch (get_elf_backend_data (info->output_bfd)->target_os)

     {
     case is_normal:
     case is_solaris:
     {
     case is_normal:
     case is_solaris:


@@ -4324,13 +4390,8 @@ elf_i386_link_setup_gnu_properties (struct bfd_link_info *info)
       init_table.lazy_ibt_plt = NULL;
       init_table.non_lazy_ibt_plt = NULL;
       break;
       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;
+    default:
+      abort ();

     }
 
   init_table.r_info = elf32_r_info;
     }
 
   init_table.r_info = elf32_r_info;


@@ -4368,7 +4429,7 @@ elf_i386_link_setup_gnu_properties (struct bfd_link_info *info)
 #define bfd_elf32_get_synthetic_symtab       elf_i386_get_synthetic_symtab
 
 #define elf_backend_relocs_compatible        _bfd_elf_relocs_compatible
 #define bfd_elf32_get_synthetic_symtab       elf_i386_get_synthetic_symtab
 
 #define elf_backend_relocs_compatible        _bfd_elf_relocs_compatible

-#define elf_backend_check_relocs             elf_i386_check_relocs
+#define elf_backend_always_size_sections      elf_i386_always_size_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_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


@@ -4381,7 +4442,7 @@ elf_i386_link_setup_gnu_properties (struct bfd_link_info *info)
 #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_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 elf_backend_linux_prpsinfo32_ugid16    true

 
 #define        elf32_bed                             elf32_i386_bed
 
 
 #define        elf32_bed                             elf32_i386_bed
 


@@ -4400,11 +4461,11 @@ elf_i386_link_setup_gnu_properties (struct bfd_link_info *info)
    "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 bfd_boolean
+static bool

 elf_i386_fbsd_init_file_header (bfd *abfd, struct bfd_link_info *info)
 {
   if (!_bfd_elf_init_file_header (abfd, info))
 elf_i386_fbsd_init_file_header (bfd *abfd, struct bfd_link_info *info)
 {
   if (!_bfd_elf_init_file_header (abfd, info))

-    return FALSE;
+    return false;

 
 #ifdef OLD_FREEBSD_ABI_LABEL
   {
 
 #ifdef OLD_FREEBSD_ABI_LABEL
   {


@@ -4413,7 +4474,7 @@ elf_i386_fbsd_init_file_header (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;
+  return true;

 }
 
 #undef elf_backend_init_file_header
 }
 
 #undef elf_backend_init_file_header


@@ -4434,13 +4495,8 @@ elf_i386_fbsd_init_file_header (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"
 

-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
+#undef ELF_TARGET_OS
+#define        ELF_TARGET_OS                   is_solaris

 
 /* 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.  */


@@ -4469,7 +4525,7 @@ static const struct elf_x86_backend_data elf_i386_solaris_arch_bed =
    FALSE otherwise.  ISECTION is the best guess matching section from the
    input bfd IBFD, but it might be NULL.  */
 
    FALSE otherwise.  ISECTION is the best guess matching section from the
    input bfd IBFD, but it might be NULL.  */
 

-static bfd_boolean
+static bool

 elf32_i386_copy_solaris_special_section_fields (const bfd *ibfd ATTRIBUTE_UNUSED,
                                                bfd *obfd ATTRIBUTE_UNUSED,
                                                const Elf_Internal_Shdr *isection ATTRIBUTE_UNUSED,
 elf32_i386_copy_solaris_special_section_fields (const bfd *ibfd ATTRIBUTE_UNUSED,
                                                bfd *obfd ATTRIBUTE_UNUSED,
                                                const Elf_Internal_Shdr *isection ATTRIBUTE_UNUSED,


@@ -4477,7 +4533,7 @@ elf32_i386_copy_solaris_special_section_fields (const bfd *ibfd ATTRIBUTE_UNUSED
 {
   /* PR 19938: FIXME: Need to add code for setting the sh_info
      and sh_link fields of Solaris specific section types.  */
 {
   /* PR 19938: FIXME: Need to add code for setting the sh_info
      and sh_link fields of Solaris specific section types.  */

-  return FALSE;
+  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:
 
   /* 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:


@@ -4548,12 +4604,12 @@ SHT_SUNW_versym      The section header index of    0
 
 /* Intel MCU support.  */
 
 
 /* Intel MCU support.  */
 

-static bfd_boolean
+static bool

 elf32_iamcu_elf_object_p (bfd *abfd)
 {
   /* Set the right machine number for an IAMCU elf32 file.  */
   bfd_default_set_arch_mach (abfd, bfd_arch_iamcu, bfd_mach_i386_iamcu);
 elf32_iamcu_elf_object_p (bfd *abfd)
 {
   /* Set the right machine number for an IAMCU elf32 file.  */
   bfd_default_set_arch_mach (abfd, bfd_arch_iamcu, bfd_mach_i386_iamcu);

-  return TRUE;
+  return true;

 }
 
 #undef  TARGET_LITTLE_SYM
 }
 
 #undef  TARGET_LITTLE_SYM


@@ -4566,9 +4622,7 @@ elf32_iamcu_elf_object_p (bfd *abfd)
 #undef ELF_MACHINE_CODE
 #define        ELF_MACHINE_CODE                EM_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_TARGET_OS

 #undef ELF_OSABI
 
 #undef  elf32_bed
 #undef ELF_OSABI
 
 #undef  elf32_bed


@@ -4592,201 +4646,7 @@ elf32_iamcu_elf_object_p (bfd *abfd)
 #define ELF_ARCH                       bfd_arch_i386
 #undef ELF_MACHINE_CODE
 #define ELF_MACHINE_CODE               EM_386
 #define ELF_ARCH                       bfd_arch_i386
 #undef ELF_MACHINE_CODE
 #define ELF_MACHINE_CODE               EM_386

-
-/* Native Client support.  */
-
-#undef TARGET_LITTLE_SYM
-#define        TARGET_LITTLE_SYM               i386_elf32_nacl_vec
-#undef TARGET_LITTLE_NAME
-#define        TARGET_LITTLE_NAME              "elf32-i386-nacl"
-#undef elf32_bed
-#define        elf32_bed                       elf32_i386_nacl_bed
-
-#undef ELF_MAXPAGESIZE
-#define        ELF_MAXPAGESIZE                 0x10000
-
-/* Restore defaults.  */
-#undef ELF_OSABI
-#undef elf_backend_want_plt_sym
-#define elf_backend_want_plt_sym       0
-#undef elf_backend_static_tls_alignment
-
-/* NaCl uses substantially different PLT entries for the same effects.  */
-
-#undef elf_backend_plt_alignment
-#define elf_backend_plt_alignment      5
-#define NACL_PLT_ENTRY_SIZE            64
-#define        NACLMASK                        0xe0 /* 32-byte alignment mask.  */
-
-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.  */
-    0x83, 0xe1, NACLMASK,        /* andl $NACLMASK, %ecx */
-    0xff, 0xe1                   /* jmp *%ecx */
-  };
-
-static const bfd_byte elf_i386_nacl_plt_entry[NACL_PLT_ENTRY_SIZE] =
-  {
-    0x8b, 0x0d,                                /* movl contents of address, %ecx */
-    0, 0, 0, 0,                                /* replaced with GOT slot address.  */
-    0x83, 0xe1, NACLMASK,              /* andl $NACLMASK, %ecx */
-    0xff, 0xe1,                                /* jmp *%ecx */
-
-    /* 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).  */
-    0x68,                             /* pushl immediate */
-    0, 0, 0, 0,                               /* replaced with reloc offset.  */
-    0xe9,                             /* jmp relative */
-    0, 0, 0, 0,                               /* replaced with offset to .plt.  */
-
-    /* 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
-  };
-
-static const bfd_byte
-elf_i386_nacl_pic_plt0_entry[sizeof (elf_i386_nacl_plt0_entry)] =
-  {
-    0xff, 0x73, 0x04,          /* pushl 4(%ebx) */
-    0x8b, 0x4b, 0x08,          /* mov 0x8(%ebx), %ecx */
-    0x83, 0xe1, 0xe0,          /* and $NACLMASK, %ecx */
-    0xff, 0xe1,                        /* jmp *%ecx */
-
-    /* This is expected to be the same size as elf_i386_nacl_plt0_entry,
-       so pad to that size with nop instructions.  */
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90
-  };
-
-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 */
-
-    /* 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).  */
-    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.  */
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
-    0x90, 0x90
-  };
-
-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 \
-     || PLT_FDE_LEN_OFFSET != 4 + PLT_CIE_LENGTH + 12)
-# error "Need elf_x86_backend_data parameters for eh_frame_plt offsets!"
-#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 */
-    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_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 */
-    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_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_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 */
-    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 */
-    sizeof (elf_i386_nacl_eh_frame_plt) /* eh_frame_plt_size */
-  };
-
-static const struct elf_x86_backend_data elf_i386_nacl_arch_bed =
-  {
-    is_nacl                            /* os */
-  };
-
-static bfd_boolean
-elf32_i386_nacl_elf_object_p (bfd *abfd)
-{
-  /* Set the right machine number for a NaCl i386 ELF32 file.  */
-  bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_i386_i386_nacl);
-  return TRUE;
-}
-
-#undef elf_backend_arch_data
-#define elf_backend_arch_data  &elf_i386_nacl_arch_bed
-

 #undef elf_backend_object_p
 #undef elf_backend_object_p

-#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_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
-
-#include "elf32-target.h"
-
-/* Restore defaults.  */
-#undef elf_backend_object_p
-#undef elf_backend_modify_segment_map
-#undef elf_backend_modify_headers
-#undef elf_backend_final_write_processing

 
 /* VxWorks support.  */
 
 
 /* VxWorks support.  */
 


@@ -4800,13 +4660,8 @@ elf32_i386_nacl_elf_object_p (bfd *abfd)
 #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_x86_backend_data elf_i386_vxworks_arch_bed =
-  {
-    is_vxworks                         /* os */
-  };
-
-#undef elf_backend_arch_data
-#define        elf_backend_arch_data   &elf_i386_vxworks_arch_bed
+#undef ELF_TARGET_OS
+#define ELF_TARGET_OS          is_vxworks

 
 #undef elf_backend_relocs_compatible
 #undef elf_backend_add_symbol_hook
 
 #undef elf_backend_relocs_compatible
 #undef elf_backend_add_symbol_hook