Prevent a potential use-after-fee memory corruption bug in the linker (for PE format...
[deliverable/binutils-gdb.git] / ld / emultempl / pe.em
index 3183caa672f4b02651d1a46af4e972ec62aad611..ad5d65d024a52c349b0a95ba91abb6a5f207f3d2 100644 (file)
@@ -8,7 +8,7 @@ fi
 rm -f e${EMULATION_NAME}.c
 (echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-)
 fragment <<EOF
-/* Copyright (C) 1995-2017 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2020 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -37,22 +37,10 @@ fragment <<EOF
 
 #define TARGET_IS_${EMULATION_NAME}
 
-/* Do this before including bfd.h, so we prototype the right functions.  */
-
-#if defined(TARGET_IS_armpe) \
-    || defined(TARGET_IS_arm_epoc_pe) \
-    || defined(TARGET_IS_arm_wince_pe)
-#define bfd_arm_allocate_interworking_sections \
-       bfd_${EMULATION_NAME}_allocate_interworking_sections
-#define bfd_arm_get_bfd_for_interworking \
-       bfd_${EMULATION_NAME}_get_bfd_for_interworking
-#define bfd_arm_process_before_allocation \
-       bfd_${EMULATION_NAME}_process_before_allocation
-#endif
-
 #include "sysdep.h"
 #include "bfd.h"
 #include "bfdlink.h"
+#include "ctf-api.h"
 #include "getopt.h"
 #include "libiberty.h"
 #include "filenames.h"
@@ -79,6 +67,17 @@ fragment <<EOF
 #include "../bfd/libcoff.h"
 #include "../bfd/libpei.h"
 
+#if defined(TARGET_IS_armpe) \
+    || defined(TARGET_IS_arm_wince_pe)
+#define bfd_arm_allocate_interworking_sections \
+       bfd_${EMULATION_NAME}_allocate_interworking_sections
+#define bfd_arm_get_bfd_for_interworking \
+       bfd_${EMULATION_NAME}_get_bfd_for_interworking
+#define bfd_arm_process_before_allocation \
+       bfd_${EMULATION_NAME}_process_before_allocation
+#include "coff-arm.h"
+#endif
+
 #include "deffile.h"
 #include "pe-dll.h"
 #include "safe-ctype.h"
@@ -95,7 +94,6 @@ fragment <<EOF
 #if defined(TARGET_IS_i386pe) \
     || defined(TARGET_IS_shpe) \
     || defined(TARGET_IS_armpe) \
-    || defined(TARGET_IS_arm_epoc_pe) \
     || defined(TARGET_IS_arm_wince_pe)
 #define DLL_SUPPORT
 #endif
@@ -242,9 +240,9 @@ fragment <<EOF
                                        (OPTION_EXCLUDE_LIBS + 1)
 #define OPTION_DLL_DISABLE_RUNTIME_PSEUDO_RELOC        \
                                        (OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC + 1)
-#define OPTION_LARGE_ADDRESS_AWARE     (OPTION_DLL_DISABLE_RUNTIME_PSEUDO_RELOC + 1)
+#define OPTION_LARGE_ADDRESS_AWARE     (OPTION_DLL_DISABLE_RUNTIME_PSEUDO_RELOC + 1)
 #define OPTION_DISABLE_LARGE_ADDRESS_AWARE \
-                                       (OPTION_LARGE_ADDRESS_AWARE + 1)
+                                       (OPTION_LARGE_ADDRESS_AWARE + 1)
 #define OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V1      \
                                        (OPTION_DISABLE_LARGE_ADDRESS_AWARE + 1)
 #define OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V2      \
@@ -253,8 +251,8 @@ fragment <<EOF
                                        (OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V2 + 1)
 #define OPTION_USE_NUL_PREFIXED_IMPORT_TABLES \
                                        (OPTION_EXCLUDE_MODULES_FOR_IMPLIB + 1)
-#define OPTION_NO_LEADING_UNDERSCORE   (OPTION_USE_NUL_PREFIXED_IMPORT_TABLES + 1)
-#define OPTION_LEADING_UNDERSCORE      (OPTION_NO_LEADING_UNDERSCORE + 1)
+#define OPTION_NO_LEADING_UNDERSCORE   (OPTION_USE_NUL_PREFIXED_IMPORT_TABLES + 1)
+#define OPTION_LEADING_UNDERSCORE      (OPTION_NO_LEADING_UNDERSCORE + 1)
 #define OPTION_ENABLE_LONG_SECTION_NAMES \
                                        (OPTION_LEADING_UNDERSCORE + 1)
 #define OPTION_DISABLE_LONG_SECTION_NAMES \
@@ -272,6 +270,7 @@ fragment <<EOF
 #define OPTION_INSERT_TIMESTAMP                (OPTION_TERMINAL_SERVER_AWARE + 1)
 #define OPTION_NO_INSERT_TIMESTAMP     (OPTION_INSERT_TIMESTAMP + 1)
 #define OPTION_BUILD_ID                        (OPTION_NO_INSERT_TIMESTAMP + 1)
+#define OPTION_ENABLE_RELOC_SECTION    (OPTION_BUILD_ID + 1)
 
 static void
 gld${EMULATION_NAME}_add_options
@@ -351,6 +350,7 @@ gld${EMULATION_NAME}_add_options
     {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER},
     {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE},
     {"build-id", optional_argument, NULL, OPTION_BUILD_ID},
+    {"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION},
     {NULL, no_argument, NULL, 0}
   };
 
@@ -385,11 +385,6 @@ typedef struct
 #define U(CSTR) \
   ((is_underscoring () == 0) ? CSTR : "_" CSTR)
 
-/* Get size of constant string for a possible underscore prefixed
-   C visible symbol.  */
-#define U_SIZE(CSTR) \
-  (sizeof (CSTR) + (is_underscoring () == 0 ? 0 : 1))
-
 #define D(field,symbol,def,usc)  {&pe.field, sizeof (pe.field), def, symbol, 0, usc}
 
 static definfo init[] =
@@ -488,15 +483,16 @@ gld_${EMULATION_NAME}_list_options (FILE *file)
                                        executable image files\n"));
   fprintf (file, _("  --disable-long-section-names       Never use long COFF section names, even\n\
                                        in object files\n"));
-  fprintf (file, _("  --dynamicbase                     Image base address may be relocated using\n\
-                                      address space layout randomization (ASLR)\n"));
-  fprintf (file, _("  --forceinteg              Code integrity checks are enforced\n"));
-  fprintf (file, _("  --nxcompat                Image is compatible with data execution prevention\n"));
-  fprintf (file, _("  --no-isolation            Image understands isolation but do not isolate the image\n"));
-  fprintf (file, _("  --no-seh                  Image does not use SEH. No SE handler may\n\
-                                      be called in this image\n"));
-  fprintf (file, _("  --no-bind                         Do not bind this image\n"));
-  fprintf (file, _("  --wdmdriver               Driver uses the WDM model\n"));
+  fprintf (file, _("  --dynamicbase                      Image base address may be relocated using\n\
+                                       address space layout randomization (ASLR)\n"));
+  fprintf (file, _("  --enable-reloc-section             Create the base relocation table\n"));
+  fprintf (file, _("  --forceinteg               Code integrity checks are enforced\n"));
+  fprintf (file, _("  --nxcompat                 Image is compatible with data execution prevention\n"));
+  fprintf (file, _("  --no-isolation             Image understands isolation but do not isolate the image\n"));
+  fprintf (file, _("  --no-seh                   Image does not use SEH. No SE handler may\n\
+                                       be called in this image\n"));
+  fprintf (file, _("  --no-bind                  Do not bind this image\n"));
+  fprintf (file, _("  --wdmdriver                Driver uses the WDM model\n"));
   fprintf (file, _("  --tsaware                  Image is Terminal Server aware\n"));
   fprintf (file, _("  --build-id[=STYLE]         Generate build ID\n"));
 }
@@ -531,10 +527,10 @@ set_entry_point (void)
   int i;
 
   static const struct
-    {
-      const int value;
-      const char *entry;
-    }
+  {
+    const int value;
+    const char *entry;
+  }
   v[] =
     {
       { 1, "NtProcessStartup"  },
@@ -560,14 +556,14 @@ set_entry_point (void)
   else
     {
       for (i = 0; v[i].entry; i++)
-        if (v[i].value == pe_subsystem)
-          break;
+       if (v[i].value == pe_subsystem)
+         break;
 
       /* If no match, use the default.  */
       if (v[i].entry != NULL)
-        entry = v[i].entry;
+       entry = v[i].entry;
       else
-        entry = default_entry;
+       entry = default_entry;
     }
 
   initial_symbol_char = (is_underscoring () != 0 ? "_" : "");
@@ -651,7 +647,7 @@ set_pe_subsystem (void)
 
       if (v[i].name == NULL)
        {
-         einfo (_("%P%F: invalid subsystem type %s\n"), optarg);
+         einfo (_("%F%P: invalid subsystem type %s\n"), optarg);
          return;
        }
 
@@ -672,7 +668,7 @@ set_pe_value (char *name)
   set_pe_name (name,  strtoul (optarg, &end, 0));
 
   if (end == optarg)
-    einfo (_("%P%F: invalid hex number for PE parameter '%s'\n"), optarg);
+    einfo (_("%F%P: invalid hex number for PE parameter '%s'\n"), optarg);
 
   optarg = end;
 }
@@ -689,7 +685,7 @@ set_pe_stack_heap (char *resname, char *comname)
       set_pe_value (comname);
     }
   else if (*optarg)
-    einfo (_("%P%F: strange hex info for PE parameter '%s'\n"), optarg);
+    einfo (_("%F%P: strange hex info for PE parameter '%s'\n"), optarg);
 }
 
 #define DEFAULT_BUILD_ID_STYLE "md5"
@@ -862,6 +858,9 @@ gld${EMULATION_NAME}_handle_option (int optc)
 /*  Get DLLCharacteristics bits  */
     case OPTION_DYNAMIC_BASE:
       pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE;
+      /* fall through */
+    case OPTION_ENABLE_RELOC_SECTION:
+      pe_dll_enable_reloc_section = 1;
       break;
     case OPTION_FORCE_INTEGRITY:
       pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY;
@@ -1001,7 +1000,7 @@ gld_${EMULATION_NAME}_set_symbols (void)
 
   if (pe.FileAlignment > pe.SectionAlignment)
     {
-      einfo (_("%P: warning, file alignment > section alignment.\n"));
+      einfo (_("%P: warning, file alignment > section alignment\n"));
     }
 }
 
@@ -1022,13 +1021,6 @@ gld_${EMULATION_NAME}_after_parse (void)
   after_parse_default ();
 }
 
-/* pe-dll.c directly accesses pe_data_import_dll,
-   so it must be defined outside of #ifdef DLL_SUPPORT.
-   Note - this variable is deliberately not initialised.
-   This allows it to be treated as a common varaible, and only
-   exist in one incarnation in a multiple target enabled linker.  */
-char * pe_data_import_dll;
-
 #ifdef DLL_SUPPORT
 static struct bfd_link_hash_entry *pe_undef_found_sym;
 
@@ -1066,7 +1058,7 @@ change_undef (struct bfd_link_hash_entry * undef,
 
   if (pe_enable_stdcall_fixup == -1)
     {
-      einfo (_("Warning: resolving %s by linking to %s\n"),
+      einfo (_("%P: warning: resolving %s by linking to %s\n"),
             undef->root.string, sym->root.string);
 
       if (! gave_warning_message)
@@ -1109,7 +1101,7 @@ pe_fixup_stdcalls (void)
 
            if (lead_at)
              *cname = '_';
-           if (at)           
+           if (at)
              * strchr (cname, '@') = 0;
            sym = bfd_link_hash_lookup (link_info.hash, cname, FALSE, FALSE, TRUE);
 
@@ -1129,131 +1121,23 @@ pe_fixup_stdcalls (void)
       }
 }
 
-static int
-make_import_fixup (arelent *rel, asection *s, char *name)
+static void
+make_import_fixup (arelent *rel, asection *s, char *name, const char *symname)
 {
   struct bfd_symbol *sym = *rel->sym_ptr_ptr;
   char addend[4];
+  bfd_vma _addend;
 
   if (pe_dll_extra_pe_debug)
     printf ("arelent: %s@%#lx: add=%li\n", sym->name,
            (unsigned long) rel->address, (long) rel->addend);
 
   if (! bfd_get_section_contents (s->owner, s, addend, rel->address, sizeof (addend)))
-    einfo (_("%C: Cannot get section contents - auto-import exception\n"),
+    einfo (_("%P: %C: cannot get section contents - auto-import exception\n"),
           s->owner, s, rel->address);
 
-  pe_create_import_fixup (rel, s, bfd_get_32 (s->owner, addend), name);
-
-  return 1;
-}
-
-static void
-pe_find_data_imports (void)
-{
-  struct bfd_link_hash_entry *undef, *sym;
-  size_t namelen;
-  char *buf, *name;
-
-  if (link_info.pei386_auto_import == 0)
-    return;
-
-  namelen = 0;
-  for (undef = link_info.hash->undefs; undef; undef = undef->u.undef.next)
-    {
-      if (undef->type == bfd_link_hash_undefined)
-       {
-         size_t len = strlen (undef->root.string);
-         if (namelen < len)
-           namelen = len;
-       }
-    }
-  if (namelen == 0)
-    return;
-
-  /* We are being a bit cunning here.  The buffer will have space for
-     prefixes at the beginning.  The prefix is modified here and in a
-     number of functions called from this function.  */
-#define PREFIX_LEN 32
-  buf = xmalloc (PREFIX_LEN + namelen + 1);
-  name = buf + PREFIX_LEN;
-
-  for (undef = link_info.hash->undefs; undef; undef = undef->u.undef.next)
-    {
-      if (undef->type == bfd_link_hash_undefined)
-       {
-         char *impname;
-
-         if (pe_dll_extra_pe_debug)
-           printf ("%s:%s\n", __FUNCTION__, undef->root.string);
-
-         strcpy (name, undef->root.string);
-         impname = name - (sizeof "__imp_" - 1);
-         memcpy (impname, "__imp_", sizeof "__imp_" - 1);
-
-         sym = bfd_link_hash_lookup (link_info.hash, impname, 0, 0, 1);
-
-         if (sym && sym->type == bfd_link_hash_defined)
-           {
-             bfd *b = sym->u.def.section->owner;
-             asymbol **symbols;
-             int nsyms, i;
-
-             if (link_info.pei386_auto_import == -1)
-               {
-                 static bfd_boolean warned = FALSE;
-
-                 info_msg (_("Info: resolving %s by linking to %s "
-                             "(auto-import)\n"), name, impname);
-
-                 /* PR linker/4844.  */
-                 if (! warned)
-                   {
-                     warned = TRUE;
-                     einfo (_("%P: warning: auto-importing has been activated "
-                              "without --enable-auto-import specified on the "
-                              "command line.\nThis should work unless it "
-                              "involves constant data structures referencing "
-                              "symbols from auto-imported DLLs.\n"));
-                   }
-               }
-
-             if (!bfd_generic_link_read_symbols (b))
-               {
-                 einfo (_("%B%F: could not read symbols: %E\n"), b);
-                 return;
-               }
-
-             symbols = bfd_get_outsymbols (b);
-             nsyms = bfd_get_symcount (b);
-
-             for (i = 0; i < nsyms; i++)
-               {
-                 if (! CONST_STRNEQ (symbols[i]->name, U ("_head_")))
-                   continue;
-
-                 if (pe_dll_extra_pe_debug)
-                   printf ("->%s\n", symbols[i]->name);
-
-                 pe_data_import_dll = (char *) (symbols[i]->name
-                                                + U_SIZE ("_head_") - 1);
-                 break;
-               }
-
-             pe_walk_relocs_of_symbol (&link_info, name, make_import_fixup);
-
-             /* Let's differentiate it somehow from defined.  */
-             undef->type = bfd_link_hash_defweak;
-             /* We replace original name with __imp_ prefixed, this
-                1) may trash memory 2) leads to duplicate symbol generation.
-                Still, IMHO it's better than having name polluted.  */
-             undef->root.string = sym->root.string;
-             undef->u.def.value = sym->u.def.value;
-             undef->u.def.section = sym->u.def.section;
-           }
-       }
-    }
-  free (buf);
+  _addend = bfd_get_32 (s->owner, addend);
+  pe_create_import_fixup (rel, s, _addend, name, symname);
 }
 
 static bfd_boolean
@@ -1290,9 +1174,9 @@ pecoff_checksum_contents (bfd *abfd,
 
       status = bfd_bread (&b, (bfd_size_type) 1, abfd);
       if (status < 1)
-        {
-          break;
-        }
+       {
+         break;
+       }
 
       (*process) (&b, 1, arg);
       filepos += 1;
@@ -1317,25 +1201,25 @@ write_build_id (bfd *abfd)
     {
       struct bfd_link_order *l = NULL;
       for (l = asec->map_head.link_order; l != NULL; l = l->next)
-        {
-          if (l->type == bfd_indirect_link_order)
-            {
-              if (l->u.indirect.section == t->build_id.sec)
-                {
-                  link_order = l;
-                  break;
-                }
-            }
-        }
+       {
+         if (l->type == bfd_indirect_link_order)
+           {
+             if (l->u.indirect.section == t->build_id.sec)
+               {
+                 link_order = l;
+                 break;
+               }
+           }
+       }
 
       if (link_order)
-        break;
+       break;
     }
 
   if (!link_order)
     {
       einfo (_("%P: warning: .buildid section discarded,"
-               " --build-id ignored.\n"));
+              " --build-id ignored\n"));
       return TRUE;
     }
 
@@ -1407,7 +1291,7 @@ setup_build_id (bfd *ibfd)
 
   if (!validate_build_id_style (emit_build_id))
     {
-      einfo (_("%P: warning: unrecognized --build-id style ignored.\n"));
+      einfo (_("%P: warning: unrecognized --build-id style ignored\n"));
       return FALSE;
     }
 
@@ -1431,8 +1315,8 @@ setup_build_id (bfd *ibfd)
       return TRUE;
     }
 
-  einfo (_("%P: warning: Cannot create .buildid section,"
-          " --build-id ignored.\n"));
+  einfo (_("%P: warning: cannot create .buildid section,"
+          " --build-id ignored\n"));
   return FALSE;
 }
 
@@ -1482,15 +1366,19 @@ gld_${EMULATION_NAME}_after_open (void)
      FIXME: This should be done via a function, rather than by
      including an internal BFD header.  */
 
-  if (coff_data (link_info.output_bfd) == NULL
+  if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour
+      || coff_data (link_info.output_bfd) == NULL
       || coff_data (link_info.output_bfd)->pe == 0)
-    einfo (_("%F%P: cannot perform PE operations on non PE output file '%B'.\n"),
+    einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
           link_info.output_bfd);
 
   pe_data (link_info.output_bfd)->pe_opthdr = pe;
   pe_data (link_info.output_bfd)->dll = init[DLLOFF].value;
   pe_data (link_info.output_bfd)->real_flags |= real_flags;
-  pe_data (link_info.output_bfd)->insert_timestamp = insert_timestamp;
+  if (insert_timestamp)
+    pe_data (link_info.output_bfd)->timestamp = -1;
+  else
+    pe_data (link_info.output_bfd)->timestamp = 0;
 
   /* At this point we must decide whether to use long section names
      in the output or not.  If the user hasn't explicitly specified
@@ -1523,21 +1411,19 @@ gld_${EMULATION_NAME}_after_open (void)
   pe_output_file_set_long_section_names (link_info.output_bfd);
 
 #ifdef DLL_SUPPORT
-  if (pe_enable_stdcall_fixup) /* -1=warn or 1=disable */
-    pe_fixup_stdcalls ();
-
   pe_process_import_defs (link_info.output_bfd, &link_info);
 
-  pe_find_data_imports ();
+  if (link_info.pei386_auto_import) /* -1=warn or 1=enable */
+    pe_find_data_imports (U ("_head_"), make_import_fixup);
 
-  /* As possibly new symbols are added by imports, we rerun
-     stdcall/fastcall fixup here.  */
-  if (pe_enable_stdcall_fixup) /* -1=warn or 1=disable */
+  /* The implementation of the feature is rather dumb and would cause the
+     compilation time to go through the roof if there are many undefined
+     symbols in the link, so it needs to be run after auto-import.  */
+  if (pe_enable_stdcall_fixup) /* -1=warn or 1=enable */
     pe_fixup_stdcalls ();
 
 #if defined (TARGET_IS_i386pe) \
     || defined (TARGET_IS_armpe) \
-    || defined (TARGET_IS_arm_epoc_pe) \
     || defined (TARGET_IS_arm_wince_pe)
   if (!bfd_link_relocatable (&link_info))
     pe_dll_build_sections (link_info.output_bfd, &link_info);
@@ -1549,15 +1435,15 @@ gld_${EMULATION_NAME}_after_open (void)
 #endif
 #endif /* DLL_SUPPORT */
 
-#if defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_epoc_pe) || defined(TARGET_IS_arm_wince_pe)
+#if defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_wince_pe)
   if (strstr (bfd_get_target (link_info.output_bfd), "arm") == NULL)
     {
       /* The arm backend needs special fields in the output hash structure.
         These will only be created if the output format is an arm format,
         hence we do not support linking and changing output formats at the
         same time.  Use a link followed by objcopy to change output formats.  */
-      einfo (_("%F%X%P: error: cannot change output format "
-              "whilst linking ARM binaries\n"));
+      einfo (_("%F%P: error: cannot change output format "
+              "whilst linking %s binaries\n"), "ARM");
       return;
     }
   {
@@ -1616,7 +1502,7 @@ gld_${EMULATION_NAME}_after_open (void)
 
                    if (!bfd_generic_link_read_symbols (is->the_bfd))
                      {
-                       einfo (_("%B%F: could not read symbols: %E\n"),
+                       einfo (_("%F%P: %pB: could not read symbols: %E\n"),
                               is->the_bfd);
                        return;
                      }
@@ -1636,7 +1522,7 @@ gld_${EMULATION_NAME}_after_open (void)
                      {
                        struct bfd_symbol *s;
                        struct bfd_link_hash_entry * blhe;
-                       char *other_bfd_filename;
+                       const char *other_bfd_filename;
                        char *n;
 
                        s = (relocs[i]->sym_ptr_ptr)[0];
@@ -1666,7 +1552,7 @@ gld_${EMULATION_NAME}_after_open (void)
                        /* Rename this implib to match the other one.  */
                        n = xmalloc (strlen (other_bfd_filename) + 1);
                        strcpy (n, other_bfd_filename);
-                       is->the_bfd->my_archive->filename = n;
+                       bfd_set_filename (is->the_bfd->my_archive, n);
                      }
 
                    free (relocs);
@@ -1769,13 +1655,27 @@ gld_${EMULATION_NAME}_after_open (void)
                else /* sentinel */
                  seq = 'c';
 
-               new_name = xmalloc (strlen (is->the_bfd->filename) + 3);
-               sprintf (new_name, "%s.%c", is->the_bfd->filename, seq);
-               is->the_bfd->filename = new_name;
 
-               new_name = xmalloc (strlen (is->filename) + 3);
-               sprintf (new_name, "%s.%c", is->filename, seq);
-               is->filename = new_name;
+               /* PR 25993: It is possible that is->the_bfd-filename == is->filename.
+                  In which case calling bfd_set_filename on one will free the memory
+                  pointed to by the other.  */
+               if (is->filename == is->the_bfd->filename)
+                 {
+                   new_name = xmalloc (strlen (is->filename) + 3);
+                   sprintf (new_name, "%s.%c", is->filename, seq);
+                   bfd_set_filename (is->the_bfd, new_name);
+                   is->filename = new_name;
+                 }
+               else
+                 {
+                   new_name = xmalloc (strlen (is->the_bfd->filename) + 3);
+                   sprintf (new_name, "%s.%c", is->the_bfd->filename, seq);
+                   bfd_set_filename (is->the_bfd, new_name);
+
+                   new_name = xmalloc (strlen (is->filename) + 3);
+                   sprintf (new_name, "%s.%c", is->filename, seq);
+                   is->filename = new_name;
+                 }
              }
          }
       }
@@ -1823,7 +1723,7 @@ gld_${EMULATION_NAME}_after_open (void)
 
                if (!bfd_generic_link_read_symbols (is->the_bfd))
                  {
-                   einfo (_("%B%F: could not read symbols: %E\n"),
+                   einfo (_("%F%P: %pB: could not read symbols: %E\n"),
                           is->the_bfd);
                    return;
                  }
@@ -1866,7 +1766,7 @@ gld_${EMULATION_NAME}_before_allocation (void)
        if (!ppc_process_before_allocation (is->the_bfd, &link_info))
          {
            /* xgettext:c-format */
-           einfo (_("Errors encountered processing file %s\n"), is->filename);
+           einfo (_("%P: errors encountered processing file %s\n"), is->filename);
          }
       }
   }
@@ -1875,7 +1775,7 @@ gld_${EMULATION_NAME}_before_allocation (void)
   ppc_allocate_toc_section (&link_info);
 #endif /* TARGET_IS_ppcpe */
 
-#if defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_epoc_pe) || defined(TARGET_IS_arm_wince_pe)
+#if defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_wince_pe)
   /* FIXME: we should be able to set the size of the interworking stub
      section.
 
@@ -1889,7 +1789,7 @@ gld_${EMULATION_NAME}_before_allocation (void)
            (is->the_bfd, & link_info, support_old_code))
          {
            /* xgettext:c-format */
-           einfo (_("Errors encountered processing file %s for interworking\n"),
+           einfo (_("%P: errors encountered processing file %s for interworking\n"),
                   is->filename);
          }
       }
@@ -1897,7 +1797,7 @@ gld_${EMULATION_NAME}_before_allocation (void)
 
   /* We have seen it all. Allocate it, and carry on.  */
   bfd_arm_allocate_interworking_sections (& link_info);
-#endif /* TARGET_IS_armpe || TARGET_IS_arm_epoc_pe || TARGET_IS_arm_wince_pe */
+#endif /* TARGET_IS_armpe || TARGET_IS_arm_wince_pe */
 
   before_allocation_default ();
 }
@@ -1947,11 +1847,11 @@ gld_${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry ATTRIB
              struct bfd_link_hash_entry *h;
 
              sprintf (buf, "%s%s", U (""),
-                      pe_def_file->exports[i].internal_name);
+                      pe_def_file->exports[i].internal_name);
 
              h = bfd_link_hash_lookup (link_info.hash, buf, TRUE, TRUE, TRUE);
              if (h == (struct bfd_link_hash_entry *) NULL)
-               einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
+               einfo (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
              if (h->type == bfd_link_hash_new)
                {
                  h->type = bfd_link_hash_undefined;
@@ -2012,9 +1912,6 @@ gld_${EMULATION_NAME}_recognized_file (lang_input_statement_type *entry ATTRIBUT
 #ifdef TARGET_IS_armpe
   pe_dll_id_target ("pei-arm-little");
 #endif
-#ifdef TARGET_IS_arm_epoc_pe
-  pe_dll_id_target ("epoc-pei-arm-little");
-#endif
 #ifdef TARGET_IS_arm_wince_pe
   pe_dll_id_target ("pei-arm-wince-little");
 #endif
@@ -2027,7 +1924,7 @@ gld_${EMULATION_NAME}_recognized_file (lang_input_statement_type *entry ATTRIBUT
 static void
 gld_${EMULATION_NAME}_finish (void)
 {
-#if defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_epoc_pe) || defined(TARGET_IS_arm_wince_pe)
+#if defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_wince_pe)
   struct bfd_link_hash_entry * h;
 
   if (thumb_entry_symbol != NULL)
@@ -2046,8 +1943,7 @@ gld_${EMULATION_NAME}_finish (void)
          /* Special procesing is required for a Thumb entry symbol.  The
             bottom bit of its address must be set.  */
          val = (h->u.def.value
-                + bfd_get_section_vma (link_info.output_bfd,
-                                       h->u.def.section->output_section)
+                + bfd_section_vma (h->u.def.section->output_section)
                 + h->u.def.section->output_offset);
 
          val |= 1;
@@ -2067,13 +1963,14 @@ gld_${EMULATION_NAME}_finish (void)
       else
        einfo (_("%P: warning: cannot find thumb start symbol %s\n"), thumb_entry_symbol);
     }
-#endif /* defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_epoc_pe) || defined(TARGET_IS_arm_wince_pe) */
+#endif /* defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_wince_pe) */
 
   finish_default ();
 
 #ifdef DLL_SUPPORT
   if (bfd_link_pic (&link_info)
 #if !defined(TARGET_IS_shpe)
+      || pe_dll_enable_reloc_section
       || (!bfd_link_relocatable (&link_info)
          && pe_def_file->num_exports != 0)
 #endif
@@ -2243,9 +2140,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
                && (nexts->flags & SEC_EXCLUDE) == 0
                && ((nexts->flags ^ flags) & (SEC_LOAD | SEC_ALLOC)) == 0
                && (nexts->owner->flags & DYNAMIC) == 0
-               && nexts->owner->usrdata != NULL
-               && !(((lang_input_statement_type *) nexts->owner->usrdata)
-                    ->flags.just_syms))
+               && !bfd_input_just_syms (nexts->owner))
              flags = (((flags ^ SEC_READONLY)
                        | (nexts->flags ^ SEC_READONLY))
                       ^ SEC_READONLY);
@@ -2280,8 +2175,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
                                                       NULL);
          if (after == NULL)
            /* *ABS* is always the first output section statement.  */
-           after = (&lang_output_section_statement.head
-                    ->output_section_statement);
+           after = (void *) lang_os_list.head;
        }
 
       /* All sections in an executable must be aligned to a page boundary.
@@ -2292,7 +2186,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
                               &add_child);
       if (bfd_link_relocatable (&link_info))
        {
-         os->section_alignment = s->alignment_power;
+         os->section_alignment = exp_intop (1U << s->alignment_power);
          os->bfd_section->alignment_power = s->alignment_power;
        }
     }
@@ -2309,7 +2203,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
 
       ls = &(*pl)->input_section;
 
-      lname = bfd_get_section_name (ls->section->owner, ls->section);
+      lname = bfd_section_name (ls->section);
       if (strchr (lname, '\$') != NULL
          && (dollar == NULL || strcmp (orig_secname, lname) < 0))
        break;
@@ -2342,11 +2236,13 @@ gld_${EMULATION_NAME}_open_dynamic_archive
       /* Alternate explicit import library for dll's.  */
       { "%s.dll.a", FALSE },
       /* "libfoo.a" could be either an import lib or a static lib.
-          For backwards compatibility, libfoo.a needs to precede
-          libfoo.dll and foo.dll in the search.  */
+        For backwards compatibility, libfoo.a needs to precede
+        libfoo.dll and foo.dll in the search.  */
       { "lib%s.a", FALSE },
       /* The 'native' spelling of an import lib name is "foo.lib".  */
       { "%s.lib", FALSE },
+      /* PR 22948 - Check for an import library.  */
+      { "lib%s.lib", FALSE },
 #ifdef DLL_SUPPORT
       /* Try "<prefix>foo.dll" (preferred dll name, if specified).  */
       {        "%s%s.dll", TRUE },
@@ -2474,6 +2370,8 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
   hll_default,
   gld_${EMULATION_NAME}_after_parse,
   gld_${EMULATION_NAME}_after_open,
+  after_check_relocs_default,
+  before_place_orphans_default,
   after_allocation_default,
   set_output_arch_default,
   ldemul_default_target,
@@ -2494,6 +2392,8 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
   gld_${EMULATION_NAME}_recognized_file,
   gld_${EMULATION_NAME}_find_potential_libraries,
   NULL,        /* new_vers_pattern.  */
-  NULL /* extra_map_file_text.  */
+  NULL,        /* extra_map_file_text.  */
+  ${LDEMUL_EMIT_CTF_EARLY-NULL},
+  ${LDEMUL_EXAMINE_STRTAB_FOR_CTF-NULL}
 };
 EOF
This page took 0.033939 seconds and 4 git commands to generate.