bfd_get_filename
[deliverable/binutils-gdb.git] / ld / emultempl / pe.em
index 093c0815439d16ee94ac96056ba40b91d799a3d8..49bb66b906a70dd916ca374830195d1946e0f642 100644 (file)
@@ -7,24 +7,26 @@ else
 fi
 rm -f e${EMULATION_NAME}.c
 (echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-)
-cat >>e${EMULATION_NAME}.c <<EOF
-/* This file is part of GLD, the Gnu Linker.
-   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+fragment <<EOF
+/* Copyright (C) 1995-2019 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This file is part of the GNU Binutils.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* For WINDOWS_NT */
 /* The original file generated returned different default scripts depending
@@ -33,33 +35,52 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    only determine if the subsystem is console or windows in order to select
    the correct entry point by default. */
 
-#include "bfd.h"
+#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_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 "getopt.h"
 #include "libiberty.h"
+#include "filenames.h"
 #include "ld.h"
 #include "ldmain.h"
-#include "ldgram.h"
 #include "ldexp.h"
 #include "ldlang.h"
 #include "ldfile.h"
 #include "ldemul.h"
+#include <ldgram.h>
 #include "ldlex.h"
 #include "ldmisc.h"
 #include "ldctor.h"
+#include "ldbuildid.h"
 #include "coff/internal.h"
 
-/* FIXME: This is a BFD internal header file, and we should not be
+/* FIXME: See bfd/peXXigen.c for why we include an architecture specific
+   header in generic PE code.  */
+#include "coff/i386.h"
+#include "coff/pe.h"
+
+/* FIXME: These are BFD internal header files, and we should not be
    using it here.  */
 #include "../bfd/libcoff.h"
+#include "../bfd/libpei.h"
 
 #include "deffile.h"
 #include "pe-dll.h"
-
-#include <ctype.h>
-
-#define TARGET_IS_${EMULATION_NAME}
+#include "safe-ctype.h"
 
 /* Permit the emulation parameters to override the default section
    alignment by setting OVERRIDE_SECTION_ALIGNMENT.  FIXME: This makes
@@ -70,11 +91,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define PE_DEF_SECTION_ALIGNMENT ${OVERRIDE_SECTION_ALIGNMENT}
 #endif
 
-#if defined(TARGET_IS_i386pe)
+#if defined(TARGET_IS_i386pe) \
+    || defined(TARGET_IS_shpe) \
+    || defined(TARGET_IS_armpe) \
+    || defined(TARGET_IS_arm_wince_pe)
 #define DLL_SUPPORT
 #endif
-#if defined(TARGET_IS_shpe) || defined(TARGET_IS_mipspe) || defined(TARGET_IS_armpe)
-#define DLL_SUPPORT
+
+#if defined(TARGET_IS_i386pe)
+#define DEFAULT_PSEUDO_RELOC_VERSION 2
+#else
+#define DEFAULT_PSEUDO_RELOC_VERSION 1
 #endif
 
 #if defined(TARGET_IS_i386pe) || ! defined(DLL_SUPPORT)
@@ -84,7 +111,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #undef PE_DEF_SECTION_ALIGNMENT
 #undef PE_DEF_FILE_ALIGNMENT
 #define NT_EXE_IMAGE_BASE              0x00010000
-#ifdef TARGET_IS_armpe
+
+#if defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_wince_pe)
 #define PE_DEF_SECTION_ALIGNMENT       0x00001000
 #define        PE_DEF_SUBSYSTEM                9
 #else
@@ -94,99 +122,86 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define PE_DEF_FILE_ALIGNMENT          0x00000200
 #endif
 
-#ifdef TARGET_IS_arm_epoc_pe
-#define bfd_arm_pe_allocate_interworking_sections \
-       bfd_arm_epoc_pe_allocate_interworking_sections
-#define bfd_arm_pe_get_bfd_for_interworking \
-       bfd_arm_epoc_pe_get_bfd_for_interworking
-#define bfd_arm_pe_process_before_allocation \
-       bfd_arm_epoc_pe_process_before_allocation
-#endif
-
-static void gld_${EMULATION_NAME}_set_symbols PARAMS ((void));
-static void gld_${EMULATION_NAME}_after_open PARAMS ((void));
-static void gld_${EMULATION_NAME}_before_parse PARAMS ((void));
-static void gld_${EMULATION_NAME}_after_parse PARAMS ((void));
-static void gld_${EMULATION_NAME}_before_allocation PARAMS ((void));
-static asection *output_prev_sec_find
-  PARAMS ((lang_output_section_statement_type *));
-static boolean gld_${EMULATION_NAME}_place_orphan
-  PARAMS ((lang_input_statement_type *, asection *));
-static char *gld_${EMULATION_NAME}_get_script PARAMS ((int *));
-static int gld_${EMULATION_NAME}_parse_args PARAMS ((int, char **));
-static void gld_${EMULATION_NAME}_finish PARAMS ((void));
-static boolean gld_${EMULATION_NAME}_open_dynamic_archive
-  PARAMS ((const char *, search_dirs_type *, lang_input_statement_type *));
-static void gld_${EMULATION_NAME}_list_options PARAMS ((FILE *));
-static void set_pe_name PARAMS ((char *, long));
-static void set_pe_subsystem PARAMS ((void));
-static void set_pe_value PARAMS ((char *));
-static void set_pe_stack_heap PARAMS ((char *, char *));
-
-#ifdef DLL_SUPPORT
-static boolean pe_undef_cdecl_match
-  PARAMS ((struct bfd_link_hash_entry *, PTR));
-static void pe_fixup_stdcalls PARAMS ((void));
-static int make_import_fixup PARAMS ((arelent *, asection *));
-static void pe_find_data_imports PARAMS ((void));
-#endif
-
-static boolean pr_sym PARAMS ((struct bfd_hash_entry *, PTR string));
-static boolean gld_${EMULATION_NAME}_unrecognized_file
-  PARAMS ((lang_input_statement_type *));
-static boolean gld_${EMULATION_NAME}_recognized_file
-  PARAMS ((lang_input_statement_type *));
-static int gld_${EMULATION_NAME}_find_potential_libraries
-  PARAMS ((char *, lang_input_statement_type *));
-
-
 static struct internal_extra_pe_aouthdr pe;
 static int dll;
+static int pe_subsystem = ${SUBSYSTEM};
+static flagword real_flags = 0;
 static int support_old_code = 0;
 static char * thumb_entry_symbol = NULL;
 static lang_assignment_statement_type *image_base_statement = 0;
+static unsigned short pe_dll_characteristics = 0;
+static bfd_boolean insert_timestamp = TRUE;
+static const char *emit_build_id;
 
 #ifdef DLL_SUPPORT
-static int pe_enable_stdcall_fixup = -1; /* 0=disable 1=enable */
+static int pe_enable_stdcall_fixup = -1; /* 0=disable 1=enable */
 static char *pe_out_def_filename = NULL;
-static char *pe_implib_filename = NULL;
 static int pe_enable_auto_image_base = 0;
+static unsigned long pe_auto_image_base = 0x61500000;
 static char *pe_dll_search_prefix = NULL;
 #endif
 
 extern const char *output_filename;
 
+static int is_underscoring (void)
+{
+  int u = 0;
+  if (pe_leading_underscore != -1)
+    return pe_leading_underscore;
+  if (!bfd_get_target_info ("${OUTPUT_FORMAT}", NULL, NULL, &u, NULL))
+    bfd_get_target_info ("${RELOCATEABLE_OUTPUT_FORMAT}", NULL, NULL, &u, NULL);
+
+  if (u == -1)
+    abort ();
+  pe_leading_underscore = (u != 0 ? 1 : 0);
+  return pe_leading_underscore;
+}
+
 static void
-gld_${EMULATION_NAME}_before_parse()
+gld_${EMULATION_NAME}_before_parse (void)
 {
-  const bfd_arch_info_type *arch = bfd_scan_arch ("${OUTPUT_ARCH}");
-  if (arch)
-    {
-      ldfile_output_architecture = arch->arch;
-      ldfile_output_machine = arch->mach;
-      ldfile_output_machine_name = arch->printable_name;
-    }
-  else
-    ldfile_output_architecture = bfd_arch_${ARCH};
+  is_underscoring ();
+  ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
   output_filename = "${EXECUTABLE_NAME:-a.exe}";
 #ifdef DLL_SUPPORT
-  config.dynamic_link = true;
+  input_flags.dynamic = TRUE;
   config.has_shared = 1;
-/* link_info.pei386_auto_import = true; */
+EOF
 
-#if (PE_DEF_SUBSYSTEM == 9) || (PE_DEF_SUBSYSTEM == 2)
-#if defined TARGET_IS_mipspe || defined TARGET_IS_armpe
-  lang_add_entry ("WinMainCRTStartup", 1);
-#else
-  lang_add_entry ("_WinMainCRTStartup", 1);
-#endif
-#endif
+# Cygwin no longer wants these noisy warnings.  Other PE
+# targets might like to consider adding themselves here.
+# See also the mail thread starting here for the reason why
+# merge_rdata defaults to 0 for cygwin:
+#  http://cygwin.com/ml/cygwin-apps/2013-04/msg00187.html
+case ${target} in
+  *-*-cygwin*)
+    default_auto_import=1
+    default_merge_rdata=0
+    ;;
+  i[3-7]86-*-mingw* | x86_64-*-mingw*)
+    default_auto_import=1
+    default_merge_rdata=0
+    ;;
+  *)
+    default_auto_import=-1
+    default_merge_rdata=1
+    ;;
+esac
+
+fragment <<EOF
+  link_info.pei386_auto_import = ${default_auto_import};
+  /* Use by default version.  */
+  link_info.pei386_runtime_pseudo_reloc = DEFAULT_PSEUDO_RELOC_VERSION;
 #endif
 }
 \f
+/* Indicates if RDATA shall be merged into DATA when pseudo-relocation
+   version 2 is used and auto-import is enabled.  */
+#define MERGE_RDATA_V2 ${default_merge_rdata}
+
 /* PE format extra command line options.  */
 
-/* Used for setting flags in the PE header. */
+/* Used for setting flags in the PE header.  */
 #define OPTION_BASE_FILE               (300  + 1)
 #define OPTION_DLL                     (OPTION_BASE_FILE + 1)
 #define OPTION_FILE_ALIGNMENT          (OPTION_DLL + 1)
@@ -198,19 +213,19 @@ gld_${EMULATION_NAME}_before_parse()
 #define OPTION_MINOR_OS_VERSION                (OPTION_MINOR_IMAGE_VERSION + 1)
 #define OPTION_MINOR_SUBSYSTEM_VERSION (OPTION_MINOR_OS_VERSION + 1)
 #define OPTION_SECTION_ALIGNMENT       (OPTION_MINOR_SUBSYSTEM_VERSION + 1)
-#define OPTION_STACK                    (OPTION_SECTION_ALIGNMENT + 1)
-#define OPTION_SUBSYSTEM                (OPTION_STACK + 1)
+#define OPTION_STACK                   (OPTION_SECTION_ALIGNMENT + 1)
+#define OPTION_SUBSYSTEM               (OPTION_STACK + 1)
 #define OPTION_HEAP                    (OPTION_SUBSYSTEM + 1)
 #define OPTION_SUPPORT_OLD_CODE                (OPTION_HEAP + 1)
 #define OPTION_OUT_DEF                 (OPTION_SUPPORT_OLD_CODE + 1)
 #define OPTION_EXPORT_ALL              (OPTION_OUT_DEF + 1)
 #define OPTION_EXCLUDE_SYMBOLS         (OPTION_EXPORT_ALL + 1)
-#define OPTION_KILL_ATS                        (OPTION_EXCLUDE_SYMBOLS + 1)
+#define OPTION_EXCLUDE_ALL_SYMBOLS     (OPTION_EXCLUDE_SYMBOLS + 1)
+#define OPTION_KILL_ATS                        (OPTION_EXCLUDE_ALL_SYMBOLS + 1)
 #define OPTION_STDCALL_ALIASES         (OPTION_KILL_ATS + 1)
 #define OPTION_ENABLE_STDCALL_FIXUP    (OPTION_STDCALL_ALIASES + 1)
 #define OPTION_DISABLE_STDCALL_FIXUP   (OPTION_ENABLE_STDCALL_FIXUP + 1)
-#define OPTION_IMPLIB_FILENAME         (OPTION_DISABLE_STDCALL_FIXUP + 1)
-#define OPTION_THUMB_ENTRY             (OPTION_IMPLIB_FILENAME + 1)
+#define OPTION_THUMB_ENTRY             (OPTION_DISABLE_STDCALL_FIXUP + 1)
 #define OPTION_WARN_DUPLICATE_EXPORTS  (OPTION_THUMB_ENTRY + 1)
 #define OPTION_IMP_COMPAT              (OPTION_WARN_DUPLICATE_EXPORTS + 1)
 #define OPTION_ENABLE_AUTO_IMAGE_BASE  (OPTION_IMP_COMPAT + 1)
@@ -220,53 +235,130 @@ gld_${EMULATION_NAME}_before_parse()
 #define OPTION_DLL_ENABLE_AUTO_IMPORT  (OPTION_NO_DEFAULT_EXCLUDES + 1)
 #define OPTION_DLL_DISABLE_AUTO_IMPORT (OPTION_DLL_ENABLE_AUTO_IMPORT + 1)
 #define OPTION_ENABLE_EXTRA_PE_DEBUG   (OPTION_DLL_DISABLE_AUTO_IMPORT + 1)
+#define OPTION_EXCLUDE_LIBS            (OPTION_ENABLE_EXTRA_PE_DEBUG + 1)
+#define OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC \
+                                       (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_DISABLE_LARGE_ADDRESS_AWARE \
+                                       (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      \
+                                       (OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V1 + 1)
+#define OPTION_EXCLUDE_MODULES_FOR_IMPLIB \
+                                       (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_ENABLE_LONG_SECTION_NAMES \
+                                       (OPTION_LEADING_UNDERSCORE + 1)
+#define OPTION_DISABLE_LONG_SECTION_NAMES \
+                                       (OPTION_ENABLE_LONG_SECTION_NAMES + 1)
+/* DLLCharacteristics flags.  */
+#define OPTION_DYNAMIC_BASE            (OPTION_DISABLE_LONG_SECTION_NAMES + 1)
+#define OPTION_FORCE_INTEGRITY         (OPTION_DYNAMIC_BASE + 1)
+#define OPTION_NX_COMPAT               (OPTION_FORCE_INTEGRITY + 1)
+#define OPTION_NO_ISOLATION            (OPTION_NX_COMPAT + 1)
+#define OPTION_NO_SEH                  (OPTION_NO_ISOLATION + 1)
+#define OPTION_NO_BIND                 (OPTION_NO_SEH + 1)
+#define OPTION_WDM_DRIVER              (OPTION_NO_BIND + 1)
+#define OPTION_TERMINAL_SERVER_AWARE   (OPTION_WDM_DRIVER + 1)
+/* Determinism.  */
+#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)
 
-static struct option longopts[] = {
-  /* PE options */
-  {"base-file", required_argument, NULL, OPTION_BASE_FILE},
-  {"dll", no_argument, NULL, OPTION_DLL},
-  {"file-alignment", required_argument, NULL, OPTION_FILE_ALIGNMENT},
-  {"heap", required_argument, NULL, OPTION_HEAP},
-  {"image-base", required_argument, NULL, OPTION_IMAGE_BASE},
-  {"major-image-version", required_argument, NULL, OPTION_MAJOR_IMAGE_VERSION},
-  {"major-os-version", required_argument, NULL, OPTION_MAJOR_OS_VERSION},
-  {"major-subsystem-version", required_argument, NULL, OPTION_MAJOR_SUBSYSTEM_VERSION},
-  {"minor-image-version", required_argument, NULL, OPTION_MINOR_IMAGE_VERSION},
-  {"minor-os-version", required_argument, NULL, OPTION_MINOR_OS_VERSION},
-  {"minor-subsystem-version", required_argument, NULL, OPTION_MINOR_SUBSYSTEM_VERSION},
-  {"section-alignment", required_argument, NULL, OPTION_SECTION_ALIGNMENT},
-  {"stack", required_argument, NULL, OPTION_STACK},
-  {"subsystem", required_argument, NULL, OPTION_SUBSYSTEM},
-  {"support-old-code", no_argument, NULL, OPTION_SUPPORT_OLD_CODE},
-  {"thumb-entry", required_argument, NULL, OPTION_THUMB_ENTRY},
+static void
+gld${EMULATION_NAME}_add_options
+  (int ns ATTRIBUTE_UNUSED,
+   char **shortopts ATTRIBUTE_UNUSED,
+   int nl,
+   struct option **longopts,
+   int nrl ATTRIBUTE_UNUSED,
+   struct option **really_longopts ATTRIBUTE_UNUSED)
+{
+  static const struct option xtra_long[] =
+  {
+    /* PE options.  */
+    {"base-file", required_argument, NULL, OPTION_BASE_FILE},
+    {"dll", no_argument, NULL, OPTION_DLL},
+    {"file-alignment", required_argument, NULL, OPTION_FILE_ALIGNMENT},
+    {"heap", required_argument, NULL, OPTION_HEAP},
+    {"image-base", required_argument, NULL, OPTION_IMAGE_BASE},
+    {"major-image-version", required_argument, NULL, OPTION_MAJOR_IMAGE_VERSION},
+    {"major-os-version", required_argument, NULL, OPTION_MAJOR_OS_VERSION},
+    {"major-subsystem-version", required_argument, NULL, OPTION_MAJOR_SUBSYSTEM_VERSION},
+    {"minor-image-version", required_argument, NULL, OPTION_MINOR_IMAGE_VERSION},
+    {"minor-os-version", required_argument, NULL, OPTION_MINOR_OS_VERSION},
+    {"minor-subsystem-version", required_argument, NULL, OPTION_MINOR_SUBSYSTEM_VERSION},
+    {"section-alignment", required_argument, NULL, OPTION_SECTION_ALIGNMENT},
+    {"stack", required_argument, NULL, OPTION_STACK},
+    {"subsystem", required_argument, NULL, OPTION_SUBSYSTEM},
+    {"support-old-code", no_argument, NULL, OPTION_SUPPORT_OLD_CODE},
+    {"thumb-entry", required_argument, NULL, OPTION_THUMB_ENTRY},
+    {"use-nul-prefixed-import-tables", no_argument, NULL,
+     OPTION_USE_NUL_PREFIXED_IMPORT_TABLES},
+    {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE},
+    {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE},
+    {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP},
+    {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP},
 #ifdef DLL_SUPPORT
-  /* getopt allows abbreviations, so we do this to stop it from treating -o
-     as an abbreviation for this option */
-  {"output-def", required_argument, NULL, OPTION_OUT_DEF},
-  {"output-def", required_argument, NULL, OPTION_OUT_DEF},
-  {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL},
-  {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS},
-  {"kill-at", no_argument, NULL, OPTION_KILL_ATS},
-  {"add-stdcall-alias", no_argument, NULL, OPTION_STDCALL_ALIASES},
-  {"enable-stdcall-fixup", no_argument, NULL, OPTION_ENABLE_STDCALL_FIXUP},
-  {"disable-stdcall-fixup", no_argument, NULL, OPTION_DISABLE_STDCALL_FIXUP},
-  {"out-implib", required_argument, NULL, OPTION_IMPLIB_FILENAME},
-  {"warn-duplicate-exports", no_argument, NULL, OPTION_WARN_DUPLICATE_EXPORTS},
-  {"compat-implib", no_argument, NULL, OPTION_IMP_COMPAT},
-  {"enable-auto-image-base", no_argument, NULL, OPTION_ENABLE_AUTO_IMAGE_BASE},
-  {"disable-auto-image-base", no_argument, NULL, OPTION_DISABLE_AUTO_IMAGE_BASE},
-  {"dll-search-prefix", required_argument, NULL, OPTION_DLL_SEARCH_PREFIX},
-  {"no-default-excludes", no_argument, NULL, OPTION_NO_DEFAULT_EXCLUDES},
-  {"enable-auto-import", no_argument, NULL, OPTION_DLL_ENABLE_AUTO_IMPORT},
-  {"disable-auto-import", no_argument, NULL, OPTION_DLL_DISABLE_AUTO_IMPORT},
-  {"enable-extra-pe-debug", no_argument, NULL, OPTION_ENABLE_EXTRA_PE_DEBUG},
+    /* getopt allows abbreviations, so we do this to stop it
+       from treating -o as an abbreviation for this option.  */
+    {"output-def", required_argument, NULL, OPTION_OUT_DEF},
+    {"output-def", required_argument, NULL, OPTION_OUT_DEF},
+    {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL},
+    {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS},
+    {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS},
+    {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS},
+    {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB},
+    {"kill-at", no_argument, NULL, OPTION_KILL_ATS},
+    {"add-stdcall-alias", no_argument, NULL, OPTION_STDCALL_ALIASES},
+    {"enable-stdcall-fixup", no_argument, NULL, OPTION_ENABLE_STDCALL_FIXUP},
+    {"disable-stdcall-fixup", no_argument, NULL, OPTION_DISABLE_STDCALL_FIXUP},
+    {"warn-duplicate-exports", no_argument, NULL, OPTION_WARN_DUPLICATE_EXPORTS},
+    /* getopt() allows abbreviations, so we do this to stop it from
+       treating -c as an abbreviation for these --compat-implib.  */
+    {"compat-implib", no_argument, NULL, OPTION_IMP_COMPAT},
+    {"compat-implib", no_argument, NULL, OPTION_IMP_COMPAT},
+    {"enable-auto-image-base", optional_argument, NULL, OPTION_ENABLE_AUTO_IMAGE_BASE},
+    {"disable-auto-image-base", no_argument, NULL, OPTION_DISABLE_AUTO_IMAGE_BASE},
+    {"dll-search-prefix", required_argument, NULL, OPTION_DLL_SEARCH_PREFIX},
+    {"no-default-excludes", no_argument, NULL, OPTION_NO_DEFAULT_EXCLUDES},
+    {"enable-auto-import", no_argument, NULL, OPTION_DLL_ENABLE_AUTO_IMPORT},
+    {"disable-auto-import", no_argument, NULL, OPTION_DLL_DISABLE_AUTO_IMPORT},
+    {"enable-extra-pe-debug", no_argument, NULL, OPTION_ENABLE_EXTRA_PE_DEBUG},
+    {"enable-runtime-pseudo-reloc", no_argument, NULL, OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC},
+    {"disable-runtime-pseudo-reloc", no_argument, NULL, OPTION_DLL_DISABLE_RUNTIME_PSEUDO_RELOC},
+    {"enable-runtime-pseudo-reloc-v1", no_argument, NULL, OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V1},
+    {"enable-runtime-pseudo-reloc-v2", no_argument, NULL, OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V2},
 #endif
-  {NULL, no_argument, NULL, 0}
-};
-
+    {"large-address-aware", no_argument, NULL, OPTION_LARGE_ADDRESS_AWARE},
+    {"disable-large-address-aware", no_argument, NULL, OPTION_DISABLE_LARGE_ADDRESS_AWARE},
+    {"enable-long-section-names", no_argument, NULL, OPTION_ENABLE_LONG_SECTION_NAMES},
+    {"disable-long-section-names", no_argument, NULL, OPTION_DISABLE_LONG_SECTION_NAMES},
+    {"dynamicbase",no_argument, NULL, OPTION_DYNAMIC_BASE},
+    {"forceinteg", no_argument, NULL, OPTION_FORCE_INTEGRITY},
+    {"nxcompat", no_argument, NULL, OPTION_NX_COMPAT},
+    {"no-isolation", no_argument, NULL, OPTION_NO_ISOLATION},
+    {"no-seh", no_argument, NULL, OPTION_NO_SEH},
+    {"no-bind", no_argument, NULL, OPTION_NO_BIND},
+    {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER},
+    {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE},
+    {"build-id", optional_argument, NULL, OPTION_BUILD_ID},
+    {NULL, no_argument, NULL, 0}
+  };
+
+  *longopts
+    = xrealloc (*longopts, nl * sizeof (struct option) + sizeof (xtra_long));
+  memcpy (*longopts + nl, &xtra_long, sizeof (xtra_long));
+}
 
 /* PE/WIN32; added routines to get the subsystem type, heap and/or stack
-   parameters which may be input from the command line */
+   parameters which may be input from the command line */
 
 typedef struct
 {
@@ -275,41 +367,58 @@ typedef struct
   int value;
   char *symbol;
   int inited;
+  /* FALSE for an assembly level symbol and TRUE for a C visible symbol.
+     C visible symbols can be prefixed by underscore dependent to target's
+     settings.  */
+  bfd_boolean is_c_symbol;
 } definfo;
 
-#define D(field,symbol,def)  {&pe.field,sizeof(pe.field), def, symbol,0}
+/* Get symbol name dependent to kind and C visible state of
+   underscore.  */
+#define GET_INIT_SYMBOL_NAME(IDX) \
+  (init[(IDX)].symbol \
+   + ((!init[(IDX)].is_c_symbol || is_underscoring () != 0) ? 0 : 1))
+
+/* Decorates the C visible symbol by underscore, if target requires.  */
+#define U(CSTR) \
+  ((is_underscoring () == 0) ? CSTR : "_" CSTR)
+
+#define D(field,symbol,def,usc)  {&pe.field, sizeof (pe.field), def, symbol, 0, usc}
 
 static definfo init[] =
 {
   /* imagebase must be first */
 #define IMAGEBASEOFF 0
-  D(ImageBase,"__image_base__", NT_EXE_IMAGE_BASE),
+  D(ImageBase,"__image_base__", NT_EXE_IMAGE_BASE, FALSE),
 #define DLLOFF 1
-  {&dll, sizeof(dll), 0, "__dll__", 0},
-  D(SectionAlignment,"__section_alignment__", PE_DEF_SECTION_ALIGNMENT),
-  D(FileAlignment,"__file_alignment__", PE_DEF_FILE_ALIGNMENT),
-  D(MajorOperatingSystemVersion,"__major_os_version__", 4),
-  D(MinorOperatingSystemVersion,"__minor_os_version__", 0),
-  D(MajorImageVersion,"__major_image_version__", 1),
-  D(MinorImageVersion,"__minor_image_version__", 0),
-#ifdef TARGET_IS_armpe
-  D(MajorSubsystemVersion,"__major_subsystem_version__", 2),
+  {&dll, sizeof(dll), 0, "__dll__", 0, FALSE},
+#define MSIMAGEBASEOFF 2
+  D(ImageBase, "___ImageBase", NT_EXE_IMAGE_BASE, TRUE),
+  D(SectionAlignment,"__section_alignment__", PE_DEF_SECTION_ALIGNMENT, FALSE),
+  D(FileAlignment,"__file_alignment__", PE_DEF_FILE_ALIGNMENT, FALSE),
+  D(MajorOperatingSystemVersion,"__major_os_version__", 4, FALSE),
+  D(MinorOperatingSystemVersion,"__minor_os_version__", 0, FALSE),
+  D(MajorImageVersion,"__major_image_version__", 1, FALSE),
+  D(MinorImageVersion,"__minor_image_version__", 0, FALSE),
+#if defined(TARGET_IS_armpe)  || defined(TARGET_IS_arm_wince_pe)
+  D(MajorSubsystemVersion,"__major_subsystem_version__", 3, FALSE),
 #else
-  D(MajorSubsystemVersion,"__major_subsystem_version__", 4),
+  D(MajorSubsystemVersion,"__major_subsystem_version__", 4, FALSE),
 #endif
-  D(MinorSubsystemVersion,"__minor_subsystem_version__", 0),
-  D(Subsystem,"__subsystem__", ${SUBSYSTEM}),
-  D(SizeOfStackReserve,"__size_of_stack_reserve__", 0x200000),
-  D(SizeOfStackCommit,"__size_of_stack_commit__", 0x1000),
-  D(SizeOfHeapReserve,"__size_of_heap_reserve__", 0x100000),
-  D(SizeOfHeapCommit,"__size_of_heap_commit__", 0x1000),
-  D(LoaderFlags,"__loader_flags__", 0x0),
-  { NULL, 0, 0, NULL, 0 }
+  D(MinorSubsystemVersion,"__minor_subsystem_version__", 0, FALSE),
+  D(Subsystem,"__subsystem__", ${SUBSYSTEM}, FALSE),
+  D(SizeOfStackReserve,"__size_of_stack_reserve__", 0x200000, FALSE),
+  D(SizeOfStackCommit,"__size_of_stack_commit__", 0x1000, FALSE),
+  D(SizeOfHeapReserve,"__size_of_heap_reserve__", 0x100000, FALSE),
+  D(SizeOfHeapCommit,"__size_of_heap_commit__", 0x1000, FALSE),
+  D(LoaderFlags,"__loader_flags__", 0x0, FALSE),
+  D(DllCharacteristics, "__dll_characteristics__", 0x0, FALSE),
+  { NULL, 0, 0, NULL, 0 , FALSE}
 };
 
+
 static void
-gld_${EMULATION_NAME}_list_options (file)
-     FILE * file;
+gld_${EMULATION_NAME}_list_options (FILE *file)
 {
   fprintf (file, _("  --base_file <basefile>             Generate a base file for relocatable DLLs\n"));
   fprintf (file, _("  --dll                              Set image base to the default for DLLs\n"));
@@ -326,157 +435,244 @@ gld_${EMULATION_NAME}_list_options (file)
   fprintf (file, _("  --stack <size>                     Set size of the initial stack\n"));
   fprintf (file, _("  --subsystem <name>[:<version>]     Set required OS subsystem [& version]\n"));
   fprintf (file, _("  --support-old-code                 Support interworking with old code\n"));
+  fprintf (file, _("  --[no-]leading-underscore          Set explicit symbol underscore prefix mode\n"));
   fprintf (file, _("  --thumb-entry=<symbol>             Set the entry point to be Thumb <symbol>\n"));
+  fprintf (file, _("  --[no-]insert-timestamp            Use a real timestamp rather than zero (default).\n"));
+  fprintf (file, _("                                     This makes binaries non-deterministic\n"));
 #ifdef DLL_SUPPORT
   fprintf (file, _("  --add-stdcall-alias                Export symbols with and without @nn\n"));
   fprintf (file, _("  --disable-stdcall-fixup            Don't link _sym to _sym@nn\n"));
   fprintf (file, _("  --enable-stdcall-fixup             Link _sym to _sym@nn without warnings\n"));
   fprintf (file, _("  --exclude-symbols sym,sym,...      Exclude symbols from automatic export\n"));
+  fprintf (file, _("  --exclude-all-symbols              Exclude all symbols from automatic export\n"));
+  fprintf (file, _("  --exclude-libs lib,lib,...         Exclude libraries from automatic export\n"));
+  fprintf (file, _("  --exclude-modules-for-implib mod,mod,...\n"));
+  fprintf (file, _("                                     Exclude objects, archive members from auto\n"));
+  fprintf (file, _("                                     export, place into import library instead.\n"));
   fprintf (file, _("  --export-all-symbols               Automatically export all globals to DLL\n"));
   fprintf (file, _("  --kill-at                          Remove @nn from exported symbols\n"));
-  fprintf (file, _("  --out-implib <file>                Generate import library\n"));
   fprintf (file, _("  --output-def <file>                Generate a .DEF file for the built DLL\n"));
-  fprintf (file, _("  --warn-duplicate-exports           Warn about duplicate exports.\n"));
-  fprintf (file, _("  --compat-implib                    Create backward compatible import libs;\n"));
-  fprintf (file, _("                                       create __imp_<SYMBOL> as well.\n"));
-  fprintf (file, _("  --enable-auto-image-base           Automatically choose image base for DLLs\n"));
-  fprintf (file, _("                                       unless user specifies one\n"));
+  fprintf (file, _("  --warn-duplicate-exports           Warn about duplicate exports\n"));
+  fprintf (file, _("  --compat-implib                    Create backward compatible import libs;\n\
+                                       create __imp_<SYMBOL> as well.\n"));
+  fprintf (file, _("  --enable-auto-image-base[=<address>] Automatically choose image base for DLLs\n\
+                                       (optionally starting with address) unless\n\
+                                       specifically set with --image-base\n"));
   fprintf (file, _("  --disable-auto-image-base          Do not auto-choose image base. (default)\n"));
-  fprintf (file, _("  --dll-search-prefix=<string>       When linking dynamically to a dll witout an\n"));
-  fprintf (file, _("                                       importlib, use <string><basename>.dll \n"));
-  fprintf (file, _("                                       in preference to lib<basename>.dll \n"));
-  fprintf (file, _("  --enable-auto-import               Do sophistcated linking of _sym to \n"));
-  fprintf (file, _("                                       __imp_sym for DATA references\n"));
+  fprintf (file, _("  --dll-search-prefix=<string>       When linking dynamically to a dll without\n\
+                                       an importlib, use <string><basename>.dll\n\
+                                       in preference to lib<basename>.dll \n"));
+  fprintf (file, _("  --enable-auto-import               Do sophisticated linking of _sym to\n\
+                                       __imp_sym for DATA references\n"));
   fprintf (file, _("  --disable-auto-import              Do not auto-import DATA items from DLLs\n"));
-  fprintf (file, _("  --enable-extra-pe-debug            Enable verbose debug output when building\n"));
-  fprintf (file, _("                                       or linking to DLLs (esp. auto-import)\n"));
+  fprintf (file, _("  --enable-runtime-pseudo-reloc      Work around auto-import limitations by\n\
+                                       adding pseudo-relocations resolved at\n\
+                                       runtime.\n"));
+  fprintf (file, _("  --disable-runtime-pseudo-reloc     Do not add runtime pseudo-relocations for\n\
+                                       auto-imported DATA.\n"));
+  fprintf (file, _("  --enable-extra-pe-debug            Enable verbose debug output when building\n\
+                                       or linking to DLLs (esp. auto-import)\n"));
 #endif
+  fprintf (file, _("  --large-address-aware              Executable supports virtual addresses\n\
+                                       greater than 2 gigabytes\n"));
+  fprintf (file, _("  --disable-large-address-aware      Executable does not support virtual\n\
+                                       addresses greater than 2 gigabytes\n"));
+  fprintf (file, _("  --enable-long-section-names        Use long COFF section names even in\n\
+                                       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, _("  --tsaware                  Image is Terminal Server aware\n"));
+  fprintf (file, _("  --build-id[=STYLE]         Generate build ID\n"));
 }
 
+
 static void
-set_pe_name (name, val)
-     char *name;
-     long val;
+set_pe_name (char *name, long val)
 {
   int i;
-  /* Find the name and set it. */
+  is_underscoring ();
+
+  /* Find the name and set it.  */
   for (i = 0; init[i].ptr; i++)
     {
-      if (strcmp (name, init[i].symbol) == 0)
+      if (strcmp (name, GET_INIT_SYMBOL_NAME (i)) == 0)
        {
          init[i].value = val;
          init[i].inited = 1;
+         if (strcmp (name,"__image_base__") == 0)
+           set_pe_name (U ("__ImageBase"), val);
          return;
        }
     }
-  abort();
+  abort ();
 }
 
+static void
+set_entry_point (void)
+{
+  const char *entry;
+  const char *initial_symbol_char;
+  int i;
+
+  static const struct
+  {
+    const int value;
+    const char *entry;
+  }
+  v[] =
+    {
+      { 1, "NtProcessStartup"  },
+      { 2, "WinMainCRTStartup" },
+      { 3, "mainCRTStartup"    },
+      { 7, "__PosixProcessStartup"},
+      { 9, "WinMainCRTStartup" },
+      {14, "mainCRTStartup"    },
+      { 0, NULL          }
+    };
+
+  /* Entry point name for arbitrary subsystem numbers.  */
+  static const char default_entry[] = "mainCRTStartup";
+
+  if (bfd_link_pic (&link_info) || dll)
+    {
+#if defined (TARGET_IS_i386pe)
+      entry = "DllMainCRTStartup@12";
+#else
+      entry = "DllMainCRTStartup";
+#endif
+    }
+  else
+    {
+      for (i = 0; v[i].entry; i++)
+       if (v[i].value == pe_subsystem)
+         break;
+
+      /* If no match, use the default.  */
+      if (v[i].entry != NULL)
+       entry = v[i].entry;
+      else
+       entry = default_entry;
+    }
+
+  initial_symbol_char = (is_underscoring () != 0 ? "_" : "");
+
+  if (*initial_symbol_char != '\0')
+    {
+      char *alc_entry;
+
+      /* lang_default_entry expects its argument to be permanently
+        allocated, so we don't free this string.  */
+      alc_entry = xmalloc (strlen (initial_symbol_char)
+                          + strlen (entry)
+                          + 1);
+      strcpy (alc_entry, initial_symbol_char);
+      strcat (alc_entry, entry);
+      entry = alc_entry;
+    }
+
+  lang_default_entry (entry);
+}
 
 static void
-set_pe_subsystem ()
+set_pe_subsystem (void)
 {
   const char *sver;
+  char *end;
   int len;
   int i;
+  unsigned long temp_subsystem;
   static const struct
     {
       const char *name;
       const int value;
-      const char *entry;
     }
   v[] =
     {
-      { "native", 1, "NtProcessStartup" },
-#if defined TARGET_IS_mipspe || defined TARGET_IS_armpe
-      { "windows", 2, "WinMainCRTStartup" },
-#else
-      { "windows", 2, "WinMainCRTStartup" },
-#endif
-      { "console", 3, "mainCRTStartup" },
-#if 0
-      /* The Microsoft linker does not recognize this.  */
-      { "os2", 5, "" },
-#endif
-      { "posix", 7, "__PosixProcessStartup"},
-      { "wince", 9, "_WinMainCRTStartup" },
-      { 0, 0, 0 }
+      { "native",  1},
+      { "windows", 2},
+      { "console", 3},
+      { "posix",   7},
+      { "wince",   9},
+      { "xbox",   14},
+      { NULL, 0 }
     };
 
+  /* Check for the presence of a version number.  */
   sver = strchr (optarg, ':');
   if (sver == NULL)
     len = strlen (optarg);
   else
     {
-      char *end;
-
       len = sver - optarg;
       set_pe_name ("__major_subsystem_version__",
-                  strtoul (sver + 1, &end, 0));
+                   strtoul (sver + 1, &end, 0));
       if (*end == '.')
        set_pe_name ("__minor_subsystem_version__",
-                    strtoul (end + 1, &end, 0));
+                     strtoul (end + 1, &end, 0));
       if (*end != '\0')
        einfo (_("%P: warning: bad version number in -subsystem option\n"));
     }
 
-  for (i = 0; v[i].name; i++)
+  /* Check for numeric subsystem.  */
+  temp_subsystem = strtoul (optarg, & end, 0);
+  if ((*end == ':' || *end == '\0') && (temp_subsystem < 65536))
     {
-      if (strncmp (optarg, v[i].name, len) == 0
-         && v[i].name[len] == '\0')
-       {
-         const char *initial_symbol_char;
-         const char *entry;
-
-         set_pe_name ("__subsystem__", v[i].value);
-
-         initial_symbol_char = ${INITIAL_SYMBOL_CHAR};
-         if (*initial_symbol_char == '\0')
-           entry = v[i].entry;
-         else
-           {
-             char *alc_entry;
-
-             /* lang_add_entry expects its argument to be permanently
-                allocated, so we don't free this string.  */
-             alc_entry = xmalloc (strlen (initial_symbol_char)
-                                  + strlen (v[i].entry)
-                                  + 1);
-             strcpy (alc_entry, initial_symbol_char);
-             strcat (alc_entry, v[i].entry);
-             entry = alc_entry;
-           }
+      /* Search list for a numeric match to use its entry point.  */
+      for (i = 0; v[i].name; i++)
+       if (v[i].value == (int) temp_subsystem)
+         break;
 
-         lang_add_entry (entry, 1);
+      /* Use this subsystem.  */
+      pe_subsystem = (int) temp_subsystem;
+    }
+  else
+    {
+      /* Search for subsystem by name.  */
+      for (i = 0; v[i].name; i++)
+       if (strncmp (optarg, v[i].name, len) == 0
+           && v[i].name[len] == '\0')
+         break;
 
+      if (v[i].name == NULL)
+       {
+         einfo (_("%F%P: invalid subsystem type %s\n"), optarg);
          return;
        }
+
+      pe_subsystem = v[i].value;
     }
 
-  einfo (_("%P%F: invalid subsystem type %s\n"), optarg);
-}
+  set_pe_name ("__subsystem__", pe_subsystem);
 
+  return;
+}
 
 
 static void
-set_pe_value (name)
-     char *name;
-
+set_pe_value (char *name)
 {
   char *end;
 
   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;
 }
 
+
 static void
-set_pe_stack_heap (resname, comname)
-     char *resname;
-     char *comname;
+set_pe_stack_heap (char *resname, char *comname)
 {
   set_pe_value (resname);
 
@@ -486,52 +682,26 @@ set_pe_stack_heap (resname, 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"
 
-
-static int
-gld_${EMULATION_NAME}_parse_args(argc, argv)
-     int argc;
-     char **argv;
+static bfd_boolean
+gld${EMULATION_NAME}_handle_option (int optc)
 {
-  int longind;
-  int optc;
-  int prevoptind = optind;
-  int prevopterr = opterr;
-  int wanterror;
-  static int lastoptind = -1;
-
-  if (lastoptind != optind)
-    opterr = 0;
-  wanterror = opterr;
-
-  lastoptind = optind;
-
-  optc = getopt_long_only (argc, argv, "-", longopts, &longind);
-  opterr = prevopterr;
-
   switch (optc)
     {
     default:
-      if (wanterror)
-       xexit (1);
-      optind =  prevoptind;
-      return 0;
+      return FALSE;
 
     case OPTION_BASE_FILE:
-      link_info.base_file = (PTR) fopen (optarg, FOPEN_WB);
+      link_info.base_file = fopen (optarg, FOPEN_WB);
       if (link_info.base_file == NULL)
-       {
-         /* xgettext:c-format */
-         fprintf (stderr, _("%s: Can't open base file %s\n"),
-                  program_name, optarg);
-         xexit (1);
-       }
+       einfo (_("%F%P: cannot open base file %s\n"), optarg);
       break;
 
-      /* PE options */
+      /* PE options */
     case OPTION_HEAP:
       set_pe_stack_heap ("__size_of_heap_reserve__", "__size_of_heap_commit__");
       break;
@@ -577,6 +747,21 @@ gld_${EMULATION_NAME}_parse_args(argc, argv)
     case OPTION_THUMB_ENTRY:
       thumb_entry_symbol = optarg;
       break;
+    case OPTION_USE_NUL_PREFIXED_IMPORT_TABLES:
+      pe_use_nul_prefixed_import_tables = TRUE;
+      break;
+    case OPTION_NO_LEADING_UNDERSCORE:
+      pe_leading_underscore = 0;
+      break;
+    case OPTION_LEADING_UNDERSCORE:
+      pe_leading_underscore = 1;
+      break;
+    case OPTION_INSERT_TIMESTAMP:
+      insert_timestamp = TRUE;
+      break;
+    case OPTION_NO_INSERT_TIMESTAMP:
+      insert_timestamp = FALSE;
+      break;
 #ifdef DLL_SUPPORT
     case OPTION_OUT_DEF:
       pe_out_def_filename = xstrdup (optarg);
@@ -585,7 +770,16 @@ gld_${EMULATION_NAME}_parse_args(argc, argv)
       pe_dll_export_everything = 1;
       break;
     case OPTION_EXCLUDE_SYMBOLS:
-      pe_dll_add_excludes (optarg);
+      pe_dll_add_excludes (optarg, EXCLUDESYMS);
+      break;
+    case OPTION_EXCLUDE_ALL_SYMBOLS:
+      pe_dll_exclude_all_symbols = 1;
+      break;
+    case OPTION_EXCLUDE_LIBS:
+      pe_dll_add_excludes (optarg, EXCLUDELIBS);
+      break;
+    case OPTION_EXCLUDE_MODULES_FOR_IMPLIB:
+      pe_dll_add_excludes (optarg, EXCLUDEFORIMPLIB);
       break;
     case OPTION_KILL_ATS:
       pe_dll_kill_ats = 1;
@@ -599,9 +793,6 @@ gld_${EMULATION_NAME}_parse_args(argc, argv)
     case OPTION_DISABLE_STDCALL_FIXUP:
       pe_enable_stdcall_fixup = 0;
       break;
-    case OPTION_IMPLIB_FILENAME:
-      pe_implib_filename = xstrdup (optarg);
-      break;
     case OPTION_WARN_DUPLICATE_EXPORTS:
       pe_dll_warn_dup_exports = 1;
       break;
@@ -610,28 +801,99 @@ gld_${EMULATION_NAME}_parse_args(argc, argv)
       break;
     case OPTION_ENABLE_AUTO_IMAGE_BASE:
       pe_enable_auto_image_base = 1;
+      if (optarg && *optarg)
+       {
+         char *end;
+         pe_auto_image_base = strtoul (optarg, &end, 0);
+         /* XXX should check that we actually parsed something */
+       }
       break;
     case OPTION_DISABLE_AUTO_IMAGE_BASE:
       pe_enable_auto_image_base = 0;
       break;
     case OPTION_DLL_SEARCH_PREFIX:
-      pe_dll_search_prefix = xstrdup( optarg );
+      pe_dll_search_prefix = xstrdup (optarg);
       break;
     case OPTION_NO_DEFAULT_EXCLUDES:
       pe_dll_do_default_excludes = 0;
       break;
     case OPTION_DLL_ENABLE_AUTO_IMPORT:
-      link_info.pei386_auto_import = true;
+      link_info.pei386_auto_import = 1;
       break;
     case OPTION_DLL_DISABLE_AUTO_IMPORT:
-      link_info.pei386_auto_import = false;
+      link_info.pei386_auto_import = 0;
+      break;
+    case OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC:
+      link_info.pei386_runtime_pseudo_reloc =
+       DEFAULT_PSEUDO_RELOC_VERSION;
+      break;
+    case OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V1:
+      link_info.pei386_runtime_pseudo_reloc = 1;
+      break;
+    case OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V2:
+      link_info.pei386_runtime_pseudo_reloc = 2;
+      break;
+    case OPTION_DLL_DISABLE_RUNTIME_PSEUDO_RELOC:
+      link_info.pei386_runtime_pseudo_reloc = 0;
       break;
     case OPTION_ENABLE_EXTRA_PE_DEBUG:
       pe_dll_extra_pe_debug = 1;
       break;
 #endif
+    case OPTION_LARGE_ADDRESS_AWARE:
+      real_flags |= IMAGE_FILE_LARGE_ADDRESS_AWARE;
+      break;
+    case OPTION_DISABLE_LARGE_ADDRESS_AWARE:
+      real_flags &= ~ IMAGE_FILE_LARGE_ADDRESS_AWARE;
+      break;
+    case OPTION_ENABLE_LONG_SECTION_NAMES:
+      pe_use_coff_long_section_names = 1;
+      break;
+    case OPTION_DISABLE_LONG_SECTION_NAMES:
+      pe_use_coff_long_section_names = 0;
+      break;
+/*  Get DLLCharacteristics bits  */
+    case OPTION_DYNAMIC_BASE:
+      pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE;
+      break;
+    case OPTION_FORCE_INTEGRITY:
+      pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY;
+      break;
+    case OPTION_NX_COMPAT:
+      pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_NX_COMPAT;
+      break;
+    case OPTION_NO_ISOLATION:
+      pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_NO_ISOLATION;
+      break;
+    case OPTION_NO_SEH:
+      pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_NO_SEH;
+      break;
+    case OPTION_NO_BIND:
+      pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_NO_BIND;
+      break;
+    case OPTION_WDM_DRIVER:
+      pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_WDM_DRIVER;
+      break;
+    case OPTION_TERMINAL_SERVER_AWARE:
+      pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE;
+      break;
+    case OPTION_BUILD_ID:
+      if (emit_build_id != NULL)
+       {
+         free ((char *) emit_build_id);
+         emit_build_id = NULL;
+       }
+      if (optarg == NULL)
+       optarg = DEFAULT_BUILD_ID_STYLE;
+      if (strcmp (optarg, "none"))
+       emit_build_id = xstrdup (optarg);
+      break;
     }
-  return 1;
+
+  /*  Set DLLCharacteristics bits  */
+  set_pe_name ("__dll_characteristics__", pe_dll_characteristics);
+
+  return TRUE;
 }
 \f
 
@@ -659,12 +921,13 @@ strhash (const char *str)
   return hash;
 }
 
-/* Use the output file to create a image base for relocatable DLLs. */
+/* Use the output file to create a image base for relocatable DLLs.  */
+
 static unsigned long
 compute_dll_image_base (const char *ofile)
 {
   unsigned long hash = strhash (ofile);
-  return 0x60000000 | ((hash << 16) & 0x0FFC0000);
+  return pe_auto_image_base + ((hash << 16) & 0x0FFC0000);
 }
 #endif
 
@@ -672,62 +935,66 @@ compute_dll_image_base (const char *ofile)
    read.  */
 
 static void
-gld_${EMULATION_NAME}_set_symbols ()
+gld_${EMULATION_NAME}_set_symbols (void)
 {
   /* Run through and invent symbols for all the
-     names and insert the defaults. */
+     names and insert the defaults.  */
   int j;
-  lang_statement_list_type *save;
+
+  is_underscoring ();
 
   if (!init[IMAGEBASEOFF].inited)
     {
-      if (link_info.relocateable)
+      if (bfd_link_relocatable (&link_info))
        init[IMAGEBASEOFF].value = 0;
-      else if (init[DLLOFF].value || link_info.shared)
+      else if (init[DLLOFF].value || bfd_link_dll (&link_info))
+       {
 #ifdef DLL_SUPPORT
-       init[IMAGEBASEOFF].value = (pe_enable_auto_image_base) ?
-         compute_dll_image_base (output_filename) : NT_DLL_IMAGE_BASE;
+         init[IMAGEBASEOFF].value = (pe_enable_auto_image_base
+                                     ? compute_dll_image_base (output_filename)
+                                     : NT_DLL_IMAGE_BASE);
 #else
-       init[IMAGEBASEOFF].value = NT_DLL_IMAGE_BASE;
+         init[IMAGEBASEOFF].value = NT_DLL_IMAGE_BASE;
 #endif
+       }
       else
        init[IMAGEBASEOFF].value = NT_EXE_IMAGE_BASE;
+      init[MSIMAGEBASEOFF].value = init[IMAGEBASEOFF].value;
     }
 
-  /* Don't do any symbol assignments if this is a relocateable link.  */
-  if (link_info.relocateable)
+  /* Don't do any symbol assignments if this is a relocatable link.  */
+  if (bfd_link_relocatable (&link_info))
     return;
 
-  /* Glue the assignments into the abs section */
-  save = stat_ptr;
-
-  stat_ptr = &(abs_output_section->children);
+  /* Glue the assignments into the abs section.  */
+  push_stat_ptr (&abs_output_section->children);
 
   for (j = 0; init[j].ptr; j++)
     {
       long val = init[j].value;
       lang_assignment_statement_type *rv;
-      rv = lang_add_assignment (exp_assop ('=' ,init[j].symbol, exp_intop (val)));
-      if (init[j].size == sizeof(short))
-       *(short *)init[j].ptr = val;
-      else if (init[j].size == sizeof(int))
-       *(int *)init[j].ptr = val;
-      else if (init[j].size == sizeof(long))
-       *(long *)init[j].ptr = val;
+
+      rv = lang_add_assignment (exp_assign (GET_INIT_SYMBOL_NAME (j),
+                                           exp_intop (val), FALSE));
+      if (init[j].size == sizeof (short))
+       *(short *) init[j].ptr = val;
+      else if (init[j].size == sizeof (int))
+       *(int *) init[j].ptr = val;
+      else if (init[j].size == sizeof (long))
+       *(long *) init[j].ptr = val;
       /* This might be a long long or other special type.  */
-      else if (init[j].size == sizeof(bfd_vma))
-       *(bfd_vma *)init[j].ptr = val;
-      else     abort();
+      else if (init[j].size == sizeof (bfd_vma))
+       *(bfd_vma *) init[j].ptr = val;
+      else     abort ();
       if (j == IMAGEBASEOFF)
        image_base_statement = rv;
     }
-  /* Restore the pointer. */
-  stat_ptr = save;
+  /* Restore the pointer.  */
+  pop_stat_ptr ();
 
-  if (pe.FileAlignment >
-      pe.SectionAlignment)
+  if (pe.FileAlignment > pe.SectionAlignment)
     {
-      einfo (_("%P: warning, file alignment > section alignment.\n"));
+      einfo (_("%P: warning, file alignment > section alignment\n"));
     }
 }
 
@@ -735,289 +1002,446 @@ gld_${EMULATION_NAME}_set_symbols ()
    have been read.  */
 
 static void
-gld_${EMULATION_NAME}_after_parse ()
+gld_${EMULATION_NAME}_after_parse (void)
 {
-  /* The Windows libraries are designed for the linker to treat the
-     entry point as an undefined symbol.  Otherwise, the .obj that
-     defines mainCRTStartup is brought in because it is the first
-     encountered in libc.lib and it has other symbols in it which will
-     be pulled in by the link process.  To avoid this, we act as
-     though the user specified -u with the entry point symbol.
-
-     This function is called after the linker script and command line
-     options have been read, so at this point we know the right entry
-     point.  This function is called before the input files are
-     opened, so registering the symbol as undefined will make a
-     difference.  */
-
-  if (! link_info.relocateable && entry_symbol != NULL)
-    ldlang_add_undef (entry_symbol);
+  /* PR ld/6744:  Warn the user if they have used an ELF-only
+     option hoping it will work on PE.  */
+  if (link_info.export_dynamic)
+    einfo (_("%P: warning: --export-dynamic is not supported for PE "
+      "targets, did you mean --export-all-symbols?\n"));
+
+  set_entry_point ();
+
+  after_parse_default ();
 }
 
 #ifdef DLL_SUPPORT
 static struct bfd_link_hash_entry *pe_undef_found_sym;
 
-static boolean
-pe_undef_cdecl_match (h, string)
-  struct bfd_link_hash_entry *h;
-  PTR string;
+static bfd_boolean
+pe_undef_cdecl_match (struct bfd_link_hash_entry *h, void *inf)
 {
   int sl;
-  sl = strlen (string); /* silence compiler warning */
+  char *string = inf;
+  const char *hs = h->root.string;
+
+  sl = strlen (string);
   if (h->type == bfd_link_hash_defined
-      && strncmp (h->root.string, string, sl) == 0
+      && ((*hs == '@' && *string == '_'
+                  && strncmp (hs + 1, string + 1, sl - 1) == 0)
+                 || strncmp (hs, string, sl) == 0)
       && h->root.string[sl] == '@')
     {
       pe_undef_found_sym = h;
-      return false;
+      return FALSE;
     }
-  return true;
+  return TRUE;
 }
 
+/* Change UNDEF to a defined symbol, taking data from SYM.  */
+
 static void
-pe_fixup_stdcalls ()
+change_undef (struct bfd_link_hash_entry * undef,
+             struct bfd_link_hash_entry * sym)
 {
-  static int gave_warning_message = 0;
-  struct bfd_link_hash_entry *undef, *sym;
-  char *at;
-  if (pe_dll_extra_pe_debug)
-    {
-      printf ("%s\n", __FUNCTION__);
-    }
+  static bfd_boolean  gave_warning_message = FALSE;
 
-  for (undef = link_info.hash->undefs; undef; undef=undef->next)
-    if (undef->type == bfd_link_hash_undefined)
+  undef->type = bfd_link_hash_defined;
+  undef->u.def.value = sym->u.def.value;
+  undef->u.def.section = sym->u.def.section;
+
+  if (pe_enable_stdcall_fixup == -1)
     {
-      at = strchr (undef->root.string, '@');
-      if (at)
-      {
-       /* The symbol is a stdcall symbol, so let's look for a cdecl
-          symbol with the same name and resolve to that */
-       char *cname = xstrdup (undef->root.string);
-       at = strchr (cname, '@');
-       *at = 0;
-       sym = bfd_link_hash_lookup (link_info.hash, cname, 0, 0, 1);
-       if (sym && sym->type == bfd_link_hash_defined)
-       {
-         undef->type = bfd_link_hash_defined;
-         undef->u.def.value = sym->u.def.value;
-         undef->u.def.section = sym->u.def.section;
-         if (pe_enable_stdcall_fixup == -1)
-           {
-             einfo (_("Warning: resolving %s by linking to %s\n"),
-                    undef->root.string, cname);
-             if (! gave_warning_message)
-               {
-                 gave_warning_message = 1;
-                 einfo(_("Use --enable-stdcall-fixup to disable these warnings\n"));
-                 einfo(_("Use --disable-stdcall-fixup to disable these fixups\n"));
-               }
-           }
-       }
-      }
-      else
-      {
-       /* The symbol is a cdecl symbol, so we look for stdcall
-          symbols - which means scanning the whole symbol table */
-       pe_undef_found_sym = 0;
-       bfd_link_hash_traverse (link_info.hash, pe_undef_cdecl_match,
-                               (PTR) undef->root.string);
-       sym = pe_undef_found_sym;
-       if (sym)
+      einfo (_("%P: warning: resolving %s by linking to %s\n"),
+            undef->root.string, sym->root.string);
+
+      if (! gave_warning_message)
        {
-         undef->type = bfd_link_hash_defined;
-         undef->u.def.value = sym->u.def.value;
-         undef->u.def.section = sym->u.def.section;
-         if (pe_enable_stdcall_fixup == -1)
-           {
-             einfo (_("Warning: resolving %s by linking to %s\n"),
-                    undef->root.string, sym->root.string);
-             if (! gave_warning_message)
-               {
-                 gave_warning_message = 1;
-                 einfo(_("Use --enable-stdcall-fixup to disable these warnings\n"));
-                 einfo(_("Use --disable-stdcall-fixup to disable these fixups\n"));
-               }
-           }
+         einfo (_("Use --enable-stdcall-fixup to disable these warnings\n"));
+         einfo (_("Use --disable-stdcall-fixup to disable these fixups\n"));
+         gave_warning_message = TRUE;
        }
-      }
     }
+
+  /* PR 19803: Make sure that the linked symbol is not garbage collected.  */
+  lang_add_gc_name (sym->root.string);
 }
 
-static int
-make_import_fixup (rel, s)
-  arelent *rel;
-  asection *s;
+static void
+pe_fixup_stdcalls (void)
 {
-  struct symbol_cache_entry *sym = *rel->sym_ptr_ptr;
+  struct bfd_link_hash_entry *undef, *sym;
 
   if (pe_dll_extra_pe_debug)
-    {
-      printf ("arelent: %s@%#x: add=%li\n", sym->name,
-              (int) rel->address, rel->addend);
-    }
+    printf ("%s\n", __FUNCTION__);
 
-  {
-    int addend = 0;
-    if (!bfd_get_section_contents(s->owner, s, &addend, rel->address, sizeof(addend)))
+  for (undef = link_info.hash->undefs; undef; undef=undef->u.undef.next)
+    if (undef->type == bfd_link_hash_undefined)
       {
-        einfo (_("%C: Cannot get section contents - auto-import exception\n"),
-               s->owner, s, rel->address);
-      }
+       const char * name = undef->root.string;
+       char * at;
+       int lead_at = (*name == '@');
 
-    if (addend == 0)
-      pe_create_import_fixup (rel);
-    else
-      {
-        einfo (_("%C: variable '%T' can't be auto-imported. Please read the documentation for ld's --enable-auto-import for details.\n"),
-               s->owner, s, rel->address, sym->name);
-        einfo ("%X");
+       if (lead_at)
+         at = strchr (name + 1, '@');
+       else
+         at = strchr (name, '@');
+
+       if (at || lead_at)
+         {
+           /* The symbol is a stdcall symbol, so let's look for a
+              cdecl symbol with the same name and resolve to that.  */
+           char *cname = xstrdup (name);
+
+           if (lead_at)
+             *cname = '_';
+           if (at)
+             * strchr (cname, '@') = 0;
+           sym = bfd_link_hash_lookup (link_info.hash, cname, FALSE, FALSE, TRUE);
+
+           if (sym && sym->type == bfd_link_hash_defined)
+             change_undef (undef, sym);
+         }
+       else
+         {
+           /* The symbol is a cdecl symbol, so we look for stdcall
+              symbols - which means scanning the whole symbol table.  */
+           pe_undef_found_sym = NULL;
+           bfd_link_hash_traverse (link_info.hash, pe_undef_cdecl_match,
+                                   (char *) name);
+           if (pe_undef_found_sym)
+             change_undef (undef, pe_undef_found_sym);
+         }
       }
-  }
+}
+
+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 (_("%P: %C: cannot get section contents - auto-import exception\n"),
+          s->owner, s, rel->address);
 
-  return 1;
+  _addend = bfd_get_32 (s->owner, addend);
+  pe_create_import_fixup (rel, s, _addend, name, symname);
 }
 
-char *pe_data_import_dll;
+static bfd_boolean
+pr_sym (struct bfd_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
+{
+  printf ("+%s\n", h->string);
+
+  return TRUE;
+}
+#endif /* DLL_SUPPORT */
 
 static void
-pe_find_data_imports ()
+debug_section_p (bfd *abfd ATTRIBUTE_UNUSED, asection *sect, void *obj)
 {
-  struct bfd_link_hash_entry *undef, *sym;
-  for (undef = link_info.hash->undefs; undef; undef=undef->next)
+  int *found = (int *) obj;
+  if (strncmp (".debug_", sect->name, sizeof (".debug_") - 1) == 0)
+    *found = 1;
+}
+
+static bfd_boolean
+pecoff_checksum_contents (bfd *abfd,
+                         void (*process) (const void *, size_t, void *),
+                         void *arg)
+{
+  file_ptr filepos = (file_ptr) 0;
+
+  while (1)
     {
-      if (undef->type == bfd_link_hash_undefined)
-        {
-          /* C++ symbols are *long* */
-          char buf[4096];
-          if (pe_dll_extra_pe_debug)
-            {
-              printf ("%s:%s\n", __FUNCTION__, undef->root.string);
-            }
-          sprintf (buf, "__imp_%s", undef->root.string);
-
-          sym = bfd_link_hash_lookup (link_info.hash, buf, 0, 0, 1);
-          if (sym && sym->type == bfd_link_hash_defined)
-            {
-              einfo (_("Warning: resolving %s by linking to %s (auto-import)\n"),
-                     undef->root.string, buf);
-              {
-                bfd *b = sym->u.def.section->owner;
-                asymbol **symbols;
-                int nsyms, symsize, i;
-
-                symsize = bfd_get_symtab_upper_bound (b);
-                symbols = (asymbol **) xmalloc (symsize);
-                nsyms = bfd_canonicalize_symtab (b, symbols);
-
-                for (i = 0; i < nsyms; i++)
-                  {
-                    if (memcmp(symbols[i]->name, "__head_",
-                             sizeof ("__head_") - 1))
-                      continue;
-                    if (pe_dll_extra_pe_debug)
-                      {
-                        printf ("->%s\n", symbols[i]->name);
-                      }
-                    pe_data_import_dll = (char*) (symbols[i]->name +
-                                                  sizeof ("__head_") - 1);
-                    break;
-                  }
-              }
-
-              pe_walk_relocs_of_symbol (&link_info, undef->root.string,
-                                        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 poluted. */
-              undef->root.string = sym->root.string;
-              undef->u.def.value = sym->u.def.value;
-              undef->u.def.section = sym->u.def.section;
-            }
-        }
+      unsigned char b;
+      int status;
+
+      if (bfd_seek (abfd, filepos, SEEK_SET) != 0)
+       return 0;
+
+      status = bfd_bread (&b, (bfd_size_type) 1, abfd);
+      if (status < 1)
+       {
+         break;
+       }
+
+      (*process) (&b, 1, arg);
+      filepos += 1;
     }
+
+  return TRUE;
 }
-#endif /* DLL_SUPPORT */
 
-static boolean
-pr_sym (h, string)
-  struct bfd_hash_entry *h;
-  PTR string ATTRIBUTE_UNUSED;
+static bfd_boolean
+write_build_id (bfd *abfd)
 {
-  if (pe_dll_extra_pe_debug)
+  struct pe_tdata *t = pe_data (abfd);
+  asection *asec;
+  struct bfd_link_order *link_order = NULL;
+  unsigned char *contents;
+  bfd_size_type size;
+  bfd_size_type build_id_size;
+  unsigned char *build_id;
+
+  /* Find the section the .buildid output section has been merged info.  */
+  for (asec = abfd->sections; asec != NULL; asec = asec->next)
+    {
+      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 (link_order)
+       break;
+    }
+
+  if (!link_order)
     {
-      printf("+%s\n",h->string);
+      einfo (_("%P: warning: .buildid section discarded,"
+              " --build-id ignored\n"));
+      return TRUE;
     }
-  return true;
+
+  if (t->build_id.sec->contents == NULL)
+    t->build_id.sec->contents = (unsigned char *) xmalloc (t->build_id.sec->size);
+  contents = t->build_id.sec->contents;
+  size = t->build_id.sec->size;
+
+  build_id_size = compute_build_id_size (t->build_id.style);
+  build_id = xmalloc (build_id_size);
+  generate_build_id (abfd, t->build_id.style, pecoff_checksum_contents, build_id, build_id_size);
+
+  bfd_vma ib = pe_data (link_info.output_bfd)->pe_opthdr.ImageBase;
+
+  /* Construct a debug directory entry which points to an immediately following CodeView record.  */
+  struct internal_IMAGE_DEBUG_DIRECTORY idd;
+  idd.Characteristics = 0;
+  idd.TimeDateStamp = 0;
+  idd.MajorVersion = 0;
+  idd.MinorVersion = 0;
+  idd.Type = PE_IMAGE_DEBUG_TYPE_CODEVIEW;
+  idd.SizeOfData = sizeof (CV_INFO_PDB70) + 1;
+  idd.AddressOfRawData = asec->vma - ib + link_order->offset
+    + sizeof (struct external_IMAGE_DEBUG_DIRECTORY);
+  idd.PointerToRawData = asec->filepos + link_order->offset
+    + sizeof (struct external_IMAGE_DEBUG_DIRECTORY);
+
+  struct external_IMAGE_DEBUG_DIRECTORY *ext = (struct external_IMAGE_DEBUG_DIRECTORY *)contents;
+  _bfd_XXi_swap_debugdir_out (abfd, &idd, ext);
+
+  /* Write the debug directory entry.  */
+  if (bfd_seek (abfd, asec->filepos + link_order->offset, SEEK_SET) != 0)
+    return 0;
+
+  if (bfd_bwrite (contents, size, abfd) != size)
+    return 0;
+
+  /* Construct the CodeView record.  */
+  CODEVIEW_INFO cvinfo;
+  cvinfo.CVSignature = CVINFO_PDB70_CVSIGNATURE;
+  cvinfo.Age = 1;
+
+  /* Zero pad or truncate the generated build_id to fit in the CodeView record.  */
+  memset (&(cvinfo.Signature), 0, CV_INFO_SIGNATURE_LENGTH);
+  memcpy (&(cvinfo.Signature), build_id, (build_id_size > CV_INFO_SIGNATURE_LENGTH)
+         ? CV_INFO_SIGNATURE_LENGTH :  build_id_size);
+
+  free (build_id);
+
+  /* Write the codeview record.  */
+  if (_bfd_XXi_write_codeview_record (abfd, idd.PointerToRawData, &cvinfo) == 0)
+    return 0;
+
+  /* Record the location of the debug directory in the data directory.  */
+  pe_data (link_info.output_bfd)->pe_opthdr.DataDirectory[PE_DEBUG_DATA].VirtualAddress
+    = asec->vma  - ib + link_order->offset;
+  pe_data (link_info.output_bfd)->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size
+    = sizeof (struct external_IMAGE_DEBUG_DIRECTORY);
+
+  return TRUE;
 }
 
+/* Make .buildid section, and set up coff_tdata->build_id. */
+static bfd_boolean
+setup_build_id (bfd *ibfd)
+{
+  asection *s;
+  flagword flags;
+
+  if (!validate_build_id_style (emit_build_id))
+    {
+      einfo (_("%P: warning: unrecognized --build-id style ignored\n"));
+      return FALSE;
+    }
+
+  flags = (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_IN_MEMORY
+          | SEC_LINKER_CREATED | SEC_READONLY | SEC_DATA);
+  s = bfd_make_section_anyway_with_flags (ibfd, ".buildid", flags);
+  if (s != NULL)
+    {
+      struct pe_tdata *t = pe_data (link_info.output_bfd);
+      t->build_id.after_write_object_contents = &write_build_id;
+      t->build_id.style = emit_build_id;
+      t->build_id.sec = s;
+
+      /* Section is a fixed size:
+        One IMAGE_DEBUG_DIRECTORY entry, of type IMAGE_DEBUG_TYPE_CODEVIEW,
+        pointing at a CV_INFO_PDB70 record containing the build-id, with a
+        null byte for PdbFileName.  */
+      s->size = sizeof (struct external_IMAGE_DEBUG_DIRECTORY)
+       + sizeof (CV_INFO_PDB70) + 1;
+
+      return TRUE;
+    }
+
+  einfo (_("%P: warning: cannot create .buildid section,"
+          " --build-id ignored\n"));
+  return FALSE;
+}
 
 static void
-gld_${EMULATION_NAME}_after_open ()
+gld_${EMULATION_NAME}_after_open (void)
 {
+  after_open_default ();
 
+#ifdef DLL_SUPPORT
   if (pe_dll_extra_pe_debug)
     {
       bfd *a;
       struct bfd_link_hash_entry *sym;
+
       printf ("%s()\n", __FUNCTION__);
 
-      for (sym = link_info.hash->undefs; sym; sym=sym->next)
-        printf ("-%s\n", sym->root.string);
-      bfd_hash_traverse (&link_info.hash->table, pr_sym,NULL);
+      for (sym = link_info.hash->undefs; sym; sym=sym->u.undef.next)
+       printf ("-%s\n", sym->root.string);
+      bfd_hash_traverse (&link_info.hash->table, pr_sym, NULL);
 
-      for (a = link_info.input_bfds; a; a = a->link_next)
-        {
-          printf("*%s\n",a->filename);
-        }
+      for (a = link_info.input_bfds; a; a = a->link.next)
+       printf ("*%s\n",a->filename);
+    }
+#endif
+
+  if (emit_build_id != NULL)
+    {
+      bfd *abfd;
+
+      /* Find a COFF input.  */
+      for (abfd = link_info.input_bfds;
+          abfd != (bfd *) NULL; abfd = abfd->link.next)
+       if (bfd_get_flavour (abfd) == bfd_target_coff_flavour)
+         break;
+
+      /* If there are no COFF input files do not try to
+        add a build-id section.  */
+      if (abfd == NULL
+         || !setup_build_id (abfd))
+       {
+         free ((char *) emit_build_id);
+         emit_build_id = NULL;
+       }
     }
 
   /* Pass the wacky PE command line options into the output bfd.
      FIXME: This should be done via a function, rather than by
      including an internal BFD header.  */
 
-  if (coff_data (output_bfd) == NULL || coff_data (output_bfd)->pe == NULL)
-    einfo (_("%F%P: PE operations on non PE file.\n"));
+  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 '%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;
+
+  /* At this point we must decide whether to use long section names
+     in the output or not.  If the user hasn't explicitly specified
+     on the command line, we leave it to the default for the format
+     (object files yes, image files no), except if there is debug
+     information present; GDB relies on the long section names to
+     find it, so enable it in that case.  */
+  if (pe_use_coff_long_section_names < 0 && link_info.strip == strip_none)
+    {
+      if (bfd_link_relocatable (&link_info))
+       pe_use_coff_long_section_names = 1;
+      else
+       {
+         /* Iterate over all sections of all input BFDs, checking
+            for any that begin 'debug_' and are long names.  */
+         LANG_FOR_EACH_INPUT_STATEMENT (is)
+         {
+           int found_debug = 0;
+
+           bfd_map_over_sections (is->the_bfd, debug_section_p, &found_debug);
+           if (found_debug)
+             {
+               pe_use_coff_long_section_names = 1;
+               break;
+             }
+         }
+       }
+    }
 
-  pe_data (output_bfd)->pe_opthdr = pe;
-  pe_data (output_bfd)->dll = init[DLLOFF].value;
+  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);
 
-  pe_process_import_defs(output_bfd, &link_info);
-  if (link_info.shared)
-    pe_dll_build_sections (output_bfd, &link_info);
+  /* 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 ();
 
-#ifndef TARGET_IS_i386pe
-#ifndef TARGET_IS_armpe
+#if defined (TARGET_IS_i386pe) \
+    || defined (TARGET_IS_armpe) \
+    || defined (TARGET_IS_arm_wince_pe)
+  if (!bfd_link_relocatable (&link_info))
+    pe_dll_build_sections (link_info.output_bfd, &link_info);
+#else
+  if (bfd_link_pic (&link_info))
+    pe_dll_build_sections (link_info.output_bfd, &link_info);
   else
-    pe_exe_build_sections (output_bfd, &link_info);
-#endif
-#endif
+    pe_exe_build_sections (link_info.output_bfd, &link_info);
 #endif
+#endif /* DLL_SUPPORT */
 
-#if defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_epoc_pe)
-  if (strstr (bfd_get_target (output_bfd), "arm") == NULL)
+#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;
     }
   {
     /* Find a BFD that can hold the interworking stubs.  */
     LANG_FOR_EACH_INPUT_STATEMENT (is)
       {
-       if (bfd_arm_pe_get_bfd_for_interworking (is->the_bfd, & link_info))
+       if (bfd_arm_get_bfd_for_interworking (is->the_bfd, & link_info))
          break;
       }
   }
@@ -1032,7 +1456,7 @@ gld_${EMULATION_NAME}_after_open ()
        head/tail objects, causing an improper import table.  We detect
        those cases and rename the "other" import libraries to match
        the one the head/tail come from, so that the linker will sort
-       things nicely and produce a valid import table. */
+       things nicely and produce a valid import table.  */
 
     LANG_FOR_EACH_INPUT_STATEMENT (is)
       {
@@ -1046,7 +1470,7 @@ gld_${EMULATION_NAME}_after_open ()
              {
                if (strcmp (sec->name, ".idata\$2") == 0)
                  idata2 = 1;
-               if (strncmp (sec->name, ".idata\$", 7) == 0)
+               if (CONST_STRNEQ (sec->name, ".idata\$"))
                  is_imp = 1;
                reloc_count += sec->reloc_count;
              }
@@ -1058,42 +1482,38 @@ gld_${EMULATION_NAME}_after_open ()
                for (sec = is->the_bfd->sections; sec; sec = sec->next)
                  {
                    int i;
-                   long symsize;
                    long relsize;
                    asymbol **symbols;
                    arelent **relocs;
                    int nrelocs;
 
-                   symsize = bfd_get_symtab_upper_bound (is->the_bfd);
-                   if (symsize < 1)
-                     break;
                    relsize = bfd_get_reloc_upper_bound (is->the_bfd, sec);
                    if (relsize < 1)
                      break;
 
-                   symbols = (asymbol **) xmalloc (symsize);
-                   symsize = bfd_canonicalize_symtab (is->the_bfd, symbols);
-                   if (symsize < 0)
+                   if (!bfd_generic_link_read_symbols (is->the_bfd))
                      {
-                       einfo ("%X%P: unable to process symbols: %E");
+                       einfo (_("%F%P: %pB: could not read symbols: %E\n"),
+                              is->the_bfd);
                        return;
                      }
+                   symbols = bfd_get_outsymbols (is->the_bfd);
 
-                   relocs = (arelent **) xmalloc ((size_t) relsize);
+                   relocs = xmalloc ((size_t) relsize);
                    nrelocs = bfd_canonicalize_reloc (is->the_bfd, sec,
-                                                         relocs, symbols);
+                                                     relocs, symbols);
                    if (nrelocs < 0)
                      {
                        free (relocs);
-                       einfo ("%X%P: unable to process relocs: %E");
+                       einfo (_("%X%P: unable to process relocs: %E\n"));
                        return;
                      }
 
                    for (i = 0; i < nrelocs; i++)
                      {
-                       struct symbol_cache_entry *s;
+                       struct bfd_symbol *s;
                        struct bfd_link_hash_entry * blhe;
-                       bfd *other_bfd;
+                       const char *other_bfd_filename;
                        char *n;
 
                        s = (relocs[i]->sym_ptr_ptr)[0];
@@ -1104,23 +1524,25 @@ gld_${EMULATION_NAME}_after_open ()
                        /* Thunk section with reloc to another bfd.  */
                        blhe = bfd_link_hash_lookup (link_info.hash,
                                                     s->name,
-                                                    false, false, true);
+                                                    FALSE, FALSE, TRUE);
 
                        if (blhe == NULL
                            || blhe->type != bfd_link_hash_defined)
                          continue;
 
-                       other_bfd = blhe->u.def.section->owner;
+                       other_bfd_filename
+                         = blhe->u.def.section->owner->my_archive
+                           ? bfd_get_filename (blhe->u.def.section->owner->my_archive)
+                           : bfd_get_filename (blhe->u.def.section->owner);
 
-                       if (strcmp (is->the_bfd->my_archive->filename,
-                                   other_bfd->my_archive->filename) == 0)
+                       if (filename_cmp (bfd_get_filename
+                                           (is->the_bfd->my_archive),
+                                         other_bfd_filename) == 0)
                          continue;
 
-                       /* Rename this implib to match the other.  */
-                       n = (char *) xmalloc (strlen (other_bfd->my_archive->filename) + 1);
-
-                       strcpy (n, other_bfd->my_archive->filename);
-
+                       /* 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;
                      }
 
@@ -1137,6 +1559,7 @@ gld_${EMULATION_NAME}_after_open ()
     int is_ms_arch = 0;
     bfd *cur_arch = 0;
     lang_input_statement_type *is2;
+    lang_input_statement_type *is3;
 
     /* Careful - this is a shell script.  Watch those dollar signs! */
     /* Microsoft import libraries have every member named the same,
@@ -1151,21 +1574,59 @@ gld_${EMULATION_NAME}_after_open ()
       {
        if (is->the_bfd->my_archive)
          {
+           char *pnt;
            bfd *arch = is->the_bfd->my_archive;
+
            if (cur_arch != arch)
              {
                cur_arch = arch;
                is_ms_arch = 1;
-               for (is2 = is;
-                    is2 && is2->the_bfd->my_archive == arch;
-                    is2 = (lang_input_statement_type *)is2->next)
+
+               for (is3 = is;
+                    is3 && is3->the_bfd->my_archive == arch;
+                    is3 = (lang_input_statement_type *) is3->next)
                  {
-                   if (strcmp (is->the_bfd->filename, is2->the_bfd->filename))
-                     is_ms_arch = 0;
+                   /* A MS dynamic import library can also contain static
+                      members, so look for the first element with a .dll
+                      extension, and use that for the remainder of the
+                      comparisons.  */
+                   pnt = strrchr (is3->the_bfd->filename, '.');
+                   if (pnt != NULL && filename_cmp (pnt, ".dll") == 0)
+                     break;
+                 }
+
+               if (is3 == NULL)
+                 is_ms_arch = 0;
+               else
+                 {
+                   /* OK, found one.  Now look to see if the remaining
+                      (dynamic import) members use the same name.  */
+                   for (is2 = is;
+                        is2 && is2->the_bfd->my_archive == arch;
+                        is2 = (lang_input_statement_type *) is2->next)
+                     {
+                       /* Skip static members, ie anything with a .obj
+                          extension.  */
+                       pnt = strrchr (is2->the_bfd->filename, '.');
+                       if (pnt != NULL && filename_cmp (pnt, ".obj") == 0)
+                         continue;
+
+                       if (filename_cmp (is3->the_bfd->filename,
+                                         is2->the_bfd->filename))
+                         {
+                           is_ms_arch = 0;
+                           break;
+                         }
+                     }
                  }
              }
 
-           if (is_ms_arch)
+           /* This fragment might have come from an .obj file in a Microsoft
+              import, and not an actual import record. If this is the case,
+              then leave the filename alone.  */
+           pnt = strrchr (is->the_bfd->filename, '.');
+
+           if (is_ms_arch && (filename_cmp (pnt, ".dll") == 0))
              {
                int idata2 = 0, reloc_count=0;
                asection *sec;
@@ -1196,156 +1657,227 @@ gld_${EMULATION_NAME}_after_open ()
          }
       }
   }
+
+  {
+    /* The following chunk of code tries to identify jump stubs in
+       import libraries which are dead code and eliminates them
+       from the final link. For each exported symbol <sym>, there
+       is a object file in the import library with a .text section
+       and several .idata\$* sections. The .text section contains the
+       symbol definition for <sym> which is a jump stub of the form
+       jmp *__imp_<sym>. The .idata\$5 contains the symbol definition
+       for __imp_<sym> which is the address of the slot for <sym> in
+       the import address table. When a symbol is imported explicitly
+       using __declspec(dllimport) declaration, the compiler generates
+       a reference to __imp_<sym> which directly resolves to the
+       symbol in .idata\$5, in which case the jump stub code is not
+       needed. The following code tries to identify jump stub sections
+       in import libraries which are not referred to by anyone and
+       marks them for exclusion from the final link.  */
+    LANG_FOR_EACH_INPUT_STATEMENT (is)
+      {
+       if (is->the_bfd->my_archive)
+         {
+           int is_imp = 0;
+           asection *sec, *stub_sec = NULL;
+
+           /* See if this is an import library thunk.  */
+           for (sec = is->the_bfd->sections; sec; sec = sec->next)
+             {
+               if (strncmp (sec->name, ".idata\$", 7) == 0)
+                 is_imp = 1;
+               /* The section containing the jmp stub has code
+                  and has a reloc.  */
+               if ((sec->flags & SEC_CODE) && sec->reloc_count)
+                 stub_sec = sec;
+             }
+
+           if (is_imp && stub_sec)
+             {
+               asymbol **symbols;
+               long nsyms, src_count;
+               struct bfd_link_hash_entry * blhe;
+
+               if (!bfd_generic_link_read_symbols (is->the_bfd))
+                 {
+                   einfo (_("%F%P: %pB: could not read symbols: %E\n"),
+                          is->the_bfd);
+                   return;
+                 }
+               symbols = bfd_get_outsymbols (is->the_bfd);
+               nsyms = bfd_get_symcount (is->the_bfd);
+
+               for (src_count = 0; src_count < nsyms; src_count++)
+                 {
+                   if (symbols[src_count]->section->id == stub_sec->id)
+                     {
+                       /* This symbol belongs to the section containing
+                          the stub.  */
+                       blhe = bfd_link_hash_lookup (link_info.hash,
+                                                    symbols[src_count]->name,
+                                                    FALSE, FALSE, TRUE);
+                       /* If the symbol in the stub section has no other
+                          undefined references, exclude the stub section
+                          from the final link.  */
+                       if (blhe != NULL
+                           && blhe->type == bfd_link_hash_defined
+                           && blhe->u.undef.next == NULL
+                           && blhe != link_info.hash->undefs_tail)
+                         stub_sec->flags |= SEC_EXCLUDE;
+                     }
+                 }
+             }
+         }
+      }
+  }
 }
 \f
 static void
-gld_${EMULATION_NAME}_before_allocation()
+gld_${EMULATION_NAME}_before_allocation (void)
 {
 #ifdef TARGET_IS_ppcpe
-  /* Here we rummage through the found bfds to collect toc information */
+  /* Here we rummage through the found bfds to collect toc information */
   {
     LANG_FOR_EACH_INPUT_STATEMENT (is)
       {
        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);
          }
       }
   }
 
-  /* We have seen it all. Allocate it, and carry on */
+  /* We have seen it all. Allocate it, and carry on */
   ppc_allocate_toc_section (&link_info);
 #endif /* TARGET_IS_ppcpe */
 
-#if defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_epoc_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.
 
      Here we rummage through the found bfds to collect glue
      information.  FIXME: should this be based on a command line
-     option?  krk@cygnus.com */
+     option?  krk@cygnus.com */
   {
     LANG_FOR_EACH_INPUT_STATEMENT (is)
       {
-       if (! bfd_arm_pe_process_before_allocation
+       if (! bfd_arm_process_before_allocation
            (is->the_bfd, & link_info, support_old_code))
          {
            /* xgettext:c-format */
-           einfo (_("Errors encountered processing file %s for interworking"),
+           einfo (_("%P: errors encountered processing file %s for interworking\n"),
                   is->filename);
          }
       }
   }
 
-  /* We have seen it all. Allocate it, and carry on */
-  bfd_arm_pe_allocate_interworking_sections (& link_info);
-#endif /* TARGET_IS_armpe */
+  /* We have seen it all. Allocate it, and carry on.  */
+  bfd_arm_allocate_interworking_sections (& link_info);
+#endif /* TARGET_IS_armpe || TARGET_IS_arm_wince_pe */
+
+  before_allocation_default ();
 }
 \f
 #ifdef DLL_SUPPORT
 /* This is called when an input file isn't recognized as a BFD.  We
-   check here for .DEF files and pull them in automatically. */
+   check here for .DEF files and pull them in automatically.  */
 
 static int
-saw_option(char *option)
+saw_option (char *option)
 {
   int i;
-  for (i=0; init[i].ptr; i++)
-    if (strcmp (init[i].symbol, option) == 0)
+
+  for (i = 0; init[i].ptr; i++)
+    if (strcmp (GET_INIT_SYMBOL_NAME (i), option) == 0)
       return init[i].inited;
   return 0;
 }
 #endif /* DLL_SUPPORT */
 
-static boolean
-gld_${EMULATION_NAME}_unrecognized_file(entry)
-     lang_input_statement_type *entry ATTRIBUTE_UNUSED;
+static bfd_boolean
+gld_${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry ATTRIBUTE_UNUSED)
 {
 #ifdef DLL_SUPPORT
   const char *ext = entry->filename + strlen (entry->filename) - 4;
 
-  if (strcmp (ext, ".def") == 0 || strcmp (ext, ".DEF") == 0)
-  {
-    if (pe_def_file == 0)
-      pe_def_file = def_file_empty ();
-    def_file_parse (entry->filename, pe_def_file);
-    if (pe_def_file)
+  if (filename_cmp (ext, ".def") == 0 || filename_cmp (ext, ".DEF") == 0)
     {
-      int i, buflen=0, len;
-      char *buf;
-      for (i=0; i<pe_def_file->num_exports; i++)
-       {
-         len = strlen(pe_def_file->exports[i].internal_name);
-         if (buflen < len+2)
-           buflen = len+2;
-       }
-      buf = (char *) xmalloc (buflen);
-      for (i=0; i<pe_def_file->num_exports; i++)
+      pe_def_file = def_file_parse (entry->filename, pe_def_file);
+
+      if (pe_def_file)
        {
-         struct bfd_link_hash_entry *h;
-         sprintf(buf, "_%s", pe_def_file->exports[i].internal_name);
+         int i, buflen=0, len;
+         char *buf;
 
-         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"));
-         if (h->type == bfd_link_hash_new)
+         for (i = 0; i < pe_def_file->num_exports; i++)
            {
-             h->type = bfd_link_hash_undefined;
-             h->u.undef.abfd = NULL;
-             bfd_link_add_undef (link_info.hash, h);
+             len = strlen (pe_def_file->exports[i].internal_name);
+             if (buflen < len + 2)
+               buflen = len + 2;
            }
-       }
-      free (buf);
 
-      /* def_file_print (stdout, pe_def_file); */
-      if (pe_def_file->is_dll == 1)
-       link_info.shared = 1;
+         buf = xmalloc (buflen);
 
-      if (pe_def_file->base_address != (bfd_vma)(-1))
-      {
-       pe.ImageBase =
-       pe_data (output_bfd)->pe_opthdr.ImageBase =
-       init[IMAGEBASEOFF].value = pe_def_file->base_address;
-       init[IMAGEBASEOFF].inited = 1;
-       if (image_base_statement)
-         image_base_statement->exp =
-           exp_assop ('=', "__image_base__", exp_intop (pe.ImageBase));
-      }
+         for (i = 0; i < pe_def_file->num_exports; i++)
+           {
+             struct bfd_link_hash_entry *h;
 
-#if 0
-      /* Not sure if these *should* be set */
-      if (pe_def_file->version_major != -1)
-      {
-       pe.MajorImageVersion = pe_def_file->version_major;
-       pe.MinorImageVersion = pe_def_file->version_minor;
-      }
-#endif
-      if (pe_def_file->stack_reserve != -1
-         && ! saw_option ("__size_of_stack_reserve__"))
-      {
-       pe.SizeOfStackReserve = pe_def_file->stack_reserve;
-       if (pe_def_file->stack_commit != -1)
-         pe.SizeOfStackCommit = pe_def_file->stack_commit;
-      }
-      if (pe_def_file->heap_reserve != -1
-         && ! saw_option ("__size_of_heap_reserve__"))
-      {
-       pe.SizeOfHeapReserve = pe_def_file->heap_reserve;
-       if (pe_def_file->heap_commit != -1)
-         pe.SizeOfHeapCommit = pe_def_file->heap_commit;
-      }
-      return true;
+             sprintf (buf, "%s%s", U (""),
+                      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 (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
+             if (h->type == bfd_link_hash_new)
+               {
+                 h->type = bfd_link_hash_undefined;
+                 h->u.undef.abfd = NULL;
+                 bfd_link_add_undef (link_info.hash, h);
+               }
+           }
+         free (buf);
+
+         /* def_file_print (stdout, pe_def_file); */
+         if (pe_def_file->is_dll == 1)
+           link_info.type = type_dll;
+
+         if (pe_def_file->base_address != (bfd_vma)(-1))
+           {
+             pe.ImageBase
+               = pe_data (link_info.output_bfd)->pe_opthdr.ImageBase
+               = init[IMAGEBASEOFF].value
+               = pe_def_file->base_address;
+             init[IMAGEBASEOFF].inited = 1;
+             if (image_base_statement)
+               image_base_statement->exp
+                 = exp_assign ("__image_base__", exp_intop (pe.ImageBase),
+                               FALSE);
+           }
+
+         if (pe_def_file->stack_reserve != -1
+             && ! saw_option ("__size_of_stack_reserve__"))
+           {
+             pe.SizeOfStackReserve = pe_def_file->stack_reserve;
+             if (pe_def_file->stack_commit != -1)
+               pe.SizeOfStackCommit = pe_def_file->stack_commit;
+           }
+         if (pe_def_file->heap_reserve != -1
+             && ! saw_option ("__size_of_heap_reserve__"))
+           {
+             pe.SizeOfHeapReserve = pe_def_file->heap_reserve;
+             if (pe_def_file->heap_commit != -1)
+               pe.SizeOfHeapCommit = pe_def_file->heap_commit;
+           }
+         return TRUE;
+       }
     }
-  }
 #endif
-  return false;
-
+  return FALSE;
 }
 
-static boolean
-gld_${EMULATION_NAME}_recognized_file(entry)
-  lang_input_statement_type *entry ATTRIBUTE_UNUSED;
+static bfd_boolean
+gld_${EMULATION_NAME}_recognized_file (lang_input_statement_type *entry ATTRIBUTE_UNUSED)
 {
 #ifdef DLL_SUPPORT
 #ifdef TARGET_IS_i386pe
@@ -1354,31 +1886,28 @@ gld_${EMULATION_NAME}_recognized_file(entry)
 #ifdef TARGET_IS_shpe
   pe_dll_id_target ("pei-shl");
 #endif
-#ifdef TARGET_IS_mipspe
-  pe_dll_id_target ("pei-mips");
-#endif
 #ifdef TARGET_IS_armpe
   pe_dll_id_target ("pei-arm-little");
 #endif
-  if (bfd_get_format (entry->the_bfd) == bfd_object)
-    {
-      const char *ext = entry->filename + strlen (entry->filename) - 4;
-      if (strcmp (ext, ".dll") == 0 || strcmp (ext, ".DLL") == 0)
-       return pe_implied_import_dll (entry->filename);
-    }
+#ifdef TARGET_IS_arm_wince_pe
+  pe_dll_id_target ("pei-arm-wince-little");
+#endif
+  if (pe_bfd_is_dll (entry->the_bfd))
+    return pe_implied_import_dll (entry->filename);
 #endif
-  return false;
+  return FALSE;
 }
 
 static void
-gld_${EMULATION_NAME}_finish ()
+gld_${EMULATION_NAME}_finish (void)
 {
-#if defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_epoc_pe)
+#if defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_wince_pe)
   struct bfd_link_hash_entry * h;
 
   if (thumb_entry_symbol != NULL)
     {
-      h = bfd_link_hash_lookup (link_info.hash, thumb_entry_symbol, false, false, true);
+      h = bfd_link_hash_lookup (link_info.hash, thumb_entry_symbol,
+                               FALSE, FALSE, TRUE);
 
       if (h != (struct bfd_link_hash_entry *) NULL
          && (h->type == bfd_link_hash_defined
@@ -1391,7 +1920,7 @@ gld_${EMULATION_NAME}_finish ()
          /* 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 (output_bfd,
+                + bfd_get_section_vma (link_info.output_bfd,
                                        h->u.def.section->output_section)
                 + h->u.def.section->output_offset);
 
@@ -1404,28 +1933,36 @@ gld_${EMULATION_NAME}_finish ()
 
          sprintf_vma (buffer + 2, val);
 
-         if (entry_symbol != NULL && entry_from_cmdline)
+         if (entry_symbol.name != NULL && entry_from_cmdline)
            einfo (_("%P: warning: '--thumb-entry %s' is overriding '-e %s'\n"),
-                  thumb_entry_symbol, entry_symbol);
-         entry_symbol = buffer;
+                  thumb_entry_symbol, entry_symbol.name);
+         entry_symbol.name = buffer;
        }
       else
-       einfo (_("%P: warning: connot find thumb start symbol %s\n"), thumb_entry_symbol);
+       einfo (_("%P: warning: cannot find thumb start symbol %s\n"), thumb_entry_symbol);
     }
-#endif /* defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_epoc_pe) */
+#endif /* defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_wince_pe) */
+
+  finish_default ();
 
 #ifdef DLL_SUPPORT
-  if (link_info.shared)
+  if (bfd_link_pic (&link_info)
+#if !defined(TARGET_IS_shpe)
+      || (!bfd_link_relocatable (&link_info)
+         && pe_def_file->num_exports != 0)
+#endif
+    )
     {
-      pe_dll_fill_sections (output_bfd, &link_info);
-      if (pe_implib_filename)
-       pe_dll_generate_implib (pe_def_file, pe_implib_filename);
+      pe_dll_fill_sections (link_info.output_bfd, &link_info);
+      if (command_line.out_implib_filename)
+       pe_dll_generate_implib (pe_def_file, command_line.out_implib_filename,
+                               &link_info);
     }
-#if defined(TARGET_IS_shpe) || defined(TARGET_IS_mipspe)
+#if defined(TARGET_IS_shpe)
   /* ARM doesn't need relocs.  */
   else
     {
-      pe_exe_fill_sections (output_bfd, &link_info);
+      pe_exe_fill_sections (link_info.output_bfd, &link_info);
     }
 #endif
 
@@ -1433,50 +1970,25 @@ gld_${EMULATION_NAME}_finish ()
     pe_dll_generate_def_file (pe_out_def_filename);
 #endif /* DLL_SUPPORT */
 
-  /* I don't know where .idata gets set as code, but it shouldn't be */
+  /* I don't know where .idata gets set as code, but it shouldn't be */
   {
-    asection *asec = bfd_get_section_by_name (output_bfd, ".idata");
+    asection *asec = bfd_get_section_by_name (link_info.output_bfd, ".idata");
+
     if (asec)
       {
-        asec->flags &= ~SEC_CODE;
-        asec->flags |= SEC_DATA;
+       asec->flags &= ~SEC_CODE;
+       asec->flags |= SEC_DATA;
       }
   }
 }
 
 \f
-/* Find the last output section before given output statement.
-   Used by place_orphan.  */
-
-static asection *
-output_prev_sec_find (os)
-     lang_output_section_statement_type *os;
-{
-  asection *s = (asection *) NULL;
-  lang_statement_union_type *u;
-  lang_output_section_statement_type *lookup;
-
-  for (u = lang_output_section_statement.head;
-       u != (lang_statement_union_type *) NULL;
-       u = lookup->next)
-    {
-      lookup = &u->output_section_statement;
-      if (lookup == os)
-       return s;
-
-      if (lookup->bfd_section != NULL && lookup->bfd_section->owner != NULL)
-       s = lookup->bfd_section;
-    }
-
-  return NULL;
-}
-
 /* Place an orphan section.
 
    We use this to put sections in a reasonable place in the file, and
    to ensure that they are aligned as required.
 
-   We handle grouped sections here as well.  A section named .foo$nn
+   We handle grouped sections here as well.  A section named .foo\$nn
    goes into the output section .foo.  All grouped sections are sorted
    by name.
 
@@ -1484,428 +1996,350 @@ output_prev_sec_find (os)
    default linker script using wildcards, and are sorted by
    sort_sections.  */
 
-struct orphan_save
+static lang_output_section_statement_type *
+gld_${EMULATION_NAME}_place_orphan (asection *s,
+                                   const char *secname,
+                                   int constraint)
 {
-  lang_output_section_statement_type *os;
-  asection **section;
-  lang_statement_union_type **stmt;
-};
-
-/*ARGSUSED*/
-static boolean
-gld_${EMULATION_NAME}_place_orphan (file, s)
-     lang_input_statement_type *file;
-     asection *s;
-{
-  const char *secname;
-  char *hold_section_name;
+  const char *orig_secname = secname;
   char *dollar = NULL;
-  const char *ps = NULL;
   lang_output_section_statement_type *os;
   lang_statement_list_type add_child;
-
-  secname = bfd_get_section_name (s->owner, s);
+  lang_output_section_statement_type *match_by_name = NULL;
+  lang_statement_union_type **pl;
 
   /* Look through the script to see where to place this section.  */
-
-  hold_section_name = xstrdup (secname);
-  if (!link_info.relocateable)
+  if (!bfd_link_relocatable (&link_info)
+      && (dollar = strchr (secname, '\$')) != NULL)
     {
-      dollar = strchr (hold_section_name, '$');
-      if (dollar != NULL)
-       *dollar = '\0';
+      size_t len = dollar - secname;
+      char *newname = xmalloc (len + 1);
+      memcpy (newname, secname, len);
+      newname[len] = '\0';
+      secname = newname;
     }
 
-  os = lang_output_section_find (hold_section_name);
-
   lang_list_init (&add_child);
 
-  if (os != NULL
-      && (os->bfd_section == NULL
-         || ((s->flags ^ os->bfd_section->flags)
-             & (SEC_LOAD | SEC_ALLOC)) == 0))
+  os = NULL;
+  if (constraint == 0)
+    for (os = lang_output_section_find (secname);
+        os != NULL;
+        os = next_matching_output_section_statement (os, 0))
+      {
+       /* If we don't match an existing output section, tell
+          lang_insert_orphan to create a new output section.  */
+       constraint = SPECIAL;
+
+       if (os->bfd_section != NULL
+           && (os->bfd_section->flags == 0
+               || ((s->flags ^ os->bfd_section->flags)
+                   & (SEC_LOAD | SEC_ALLOC)) == 0))
+         {
+           /* We already have an output section statement with this
+              name, and its bfd section has compatible flags.
+              If the section already exists but does not have any flags set,
+              then it has been created by the linker, probably as a result of
+              a --section-start command line switch.  */
+           lang_add_section (&add_child, s, NULL, os);
+           break;
+         }
+
+       /* Save unused output sections in case we can match them
+          against orphans later.  */
+       if (os->bfd_section == NULL)
+         match_by_name = os;
+      }
+
+  /* If we didn't match an active output section, see if we matched an
+     unused one and use that.  */
+  if (os == NULL && match_by_name)
     {
-      /* We already have an output section statement with this
-        name, and its bfd section, if any, has compatible flags.  */
-      lang_add_section (&add_child, s, os, file);
+      lang_add_section (&match_by_name->children, s, NULL, match_by_name);
+      return match_by_name;
     }
-  else
+
+  if (os == NULL)
     {
+      static struct orphan_save hold[] =
+       {
+         { ".text",
+           SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE,
+           0, 0, 0, 0 },
+         { ".idata",
+           SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_DATA,
+           0, 0, 0, 0 },
+         { ".rdata",
+           SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_DATA,
+           0, 0, 0, 0 },
+         { ".data",
+           SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_DATA,
+           0, 0, 0, 0 },
+         { ".bss",
+           SEC_ALLOC,
+           0, 0, 0, 0 }
+       };
+      enum orphan_save_index
+       {
+         orphan_text = 0,
+         orphan_idata,
+         orphan_rodata,
+         orphan_data,
+         orphan_bss
+       };
+      static int orphan_init_done = 0;
       struct orphan_save *place;
-      static struct orphan_save hold_text;
-      static struct orphan_save hold_rdata;
-      static struct orphan_save hold_data;
-      static struct orphan_save hold_bss;
-      char *outsecname;
-      lang_statement_list_type *old;
-      lang_statement_list_type add;
+      lang_output_section_statement_type *after;
       etree_type *address;
+      flagword flags;
+      asection *nexts;
 
-      /* Try to put the new output section in a reasonable place based
-        on the section name and section flags.  */
-#define HAVE_SECTION(hold, name) \
-(hold.os != NULL || (hold.os = lang_output_section_find (name)) != NULL)
-
-      place = NULL;
-      if ((s->flags & SEC_ALLOC) == 0)
-       ;
-      else if ((s->flags & SEC_HAS_CONTENTS) == 0
-              && HAVE_SECTION (hold_bss, ".bss"))
-       place = &hold_bss;
-      else if ((s->flags & SEC_READONLY) == 0
-              && HAVE_SECTION (hold_data, ".data"))
-       place = &hold_data;
-      else if ((s->flags & SEC_CODE) == 0
-              && (s->flags & SEC_READONLY) != 0
-              && HAVE_SECTION (hold_rdata, ".rdata"))
-       place = &hold_rdata;
-      else if ((s->flags & SEC_READONLY) != 0
-              && HAVE_SECTION (hold_text, ".text"))
-       place = &hold_text;
-
-#undef HAVE_SECTION
-
-      /* Choose a unique name for the section.  This will be needed if
-        the same section name appears in the input file with
-        different loadable or allocatable characteristics.  */
-      outsecname = xstrdup (hold_section_name);
-      if (bfd_get_section_by_name (output_bfd, outsecname) != NULL)
-       {
-         unsigned int len;
-         char *newname;
-         unsigned int i;
-
-         len = strlen (outsecname);
-         newname = xmalloc (len + 5);
-         strcpy (newname, outsecname);
-         i = 0;
-         do
-           {
-             sprintf (newname + len, "%d", i);
-             ++i;
-           }
-         while (bfd_get_section_by_name (output_bfd, newname) != NULL);
-
-         free (outsecname);
-         outsecname = newname;
-       }
-
-      /* Start building a list of statements for this section.  */
-      old = stat_ptr;
-      stat_ptr = &add;
-      lang_list_init (stat_ptr);
-
-      if (config.build_constructors)
+      if (!orphan_init_done)
        {
-         /* If the name of the section is representable in C, then create
-            symbols to mark the start and the end of the section.  */
-         for (ps = outsecname; *ps != '\0'; ps++)
-           if (! isalnum ((unsigned char) *ps) && *ps != '_')
-             break;
-         if (*ps == '\0')
-           {
-             char *symname;
-             etree_type *e_align;
-
-             symname = (char *) xmalloc (ps - outsecname + sizeof "___start_");
-             sprintf (symname, "___start_%s", outsecname);
-             e_align = exp_unop (ALIGN_K,
-                                 exp_intop ((bfd_vma) 1 << s->alignment_power));
-             lang_add_assignment (exp_assop ('=', symname, e_align));
-           }
+         struct orphan_save *ho;
+         for (ho = hold; ho < hold + sizeof (hold) / sizeof (hold[0]); ++ho)
+           if (ho->name != NULL)
+             {
+               ho->os = lang_output_section_find (ho->name);
+               if (ho->os != NULL && ho->os->flags == 0)
+                 ho->os->flags = ho->flags;
+             }
+         orphan_init_done = 1;
        }
 
-      if (link_info.relocateable || (s->flags & (SEC_LOAD | SEC_ALLOC)) == 0)
-       address = exp_intop ((bfd_vma) 0);
-      else
+      flags = s->flags;
+      if (!bfd_link_relocatable (&link_info))
        {
-         /* All sections in an executable must be aligned to a page
-            boundary.  */
-         address = exp_unop (ALIGN_K,
-                             exp_nameop (NAME, "__section_alignment__"));
+         nexts = s;
+         while ((nexts = bfd_get_next_section_by_name (nexts->owner,
+                                                       nexts)))
+           if (nexts->output_section == NULL
+               && (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))
+             flags = (((flags ^ SEC_READONLY)
+                       | (nexts->flags ^ SEC_READONLY))
+                      ^ SEC_READONLY);
        }
 
-      os = lang_enter_output_section_statement (outsecname, address, 0,
-                                               (bfd_vma) 0,
-                                               (etree_type *) NULL,
-                                               (etree_type *) NULL,
-                                               (etree_type *) NULL);
-
-      lang_add_section (&add_child, s, os, file);
-
-      lang_leave_output_section_statement
-       ((bfd_vma) 0, "*default*",
-        (struct lang_output_section_phdr_list *) NULL, "*default*");
-
-      if (config.build_constructors && *ps == '\0')
-        {
-         char *symname;
-
-         /* lang_leave_ouput_section_statement resets stat_ptr.  Put
-            stat_ptr back where we want it.  */
-         if (place != NULL)
-           stat_ptr = &add;
+      /* Try to put the new output section in a reasonable place based
+        on the section name and section flags.  */
 
-         symname = (char *) xmalloc (ps - outsecname + sizeof "___stop_");
-         sprintf (symname, "___stop_%s", outsecname);
-         lang_add_assignment (exp_assop ('=', symname,
-                                         exp_nameop (NAME, ".")));
+      place = NULL;
+      if ((flags & SEC_ALLOC) == 0)
+       ;
+      else if ((flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
+       place = &hold[orphan_bss];
+      else if ((flags & SEC_READONLY) == 0)
+       place = &hold[orphan_data];
+      else if ((flags & SEC_CODE) == 0)
+       {
+         place = (!strncmp (secname, ".idata\$", 7) ? &hold[orphan_idata]
+                                                    : &hold[orphan_rodata]);
        }
+      else
+       place = &hold[orphan_text];
 
-      stat_ptr = old;
-
+      after = NULL;
       if (place != NULL)
        {
-         asection *snew, **pps;
-
-         snew = os->bfd_section;
-
-         /* Shuffle the bfd section list to make the output file look
-            neater.  This is really only cosmetic.  */
-         if (place->section == NULL)
-           {
-             asection *bfd_section = place->os->bfd_section;
-
-             /* If the output statement hasn't been used to place
-                any input sections (and thus doesn't have an output
-                bfd_section), look for the closest prior output statement
-                having an output section.  */
-             if (bfd_section == NULL)
-               bfd_section = output_prev_sec_find (place->os);
-
-             if (bfd_section != NULL && bfd_section != snew)
-               place->section = &bfd_section->next;
-           }
-
-         if (place->section != NULL)
-           {
-             /*  Unlink the section.  */
-             for (pps = &output_bfd->sections;
-                  *pps != snew;
-                  pps = &(*pps)->next)
-               ;
-             *pps = snew->next;
-
-             /* Now tack it on to the "place->os" section list.  */
-             snew->next = *place->section;
-             *place->section = snew;
-           }
-
-         /* Save the end of this list.  Further ophans of this type will
-            follow the one we've just added.  */
-         place->section = &snew->next;
-
-         /* The following is non-cosmetic.  We try to put the output
-            statements in some sort of reasonable order here, because
-            they determine the final load addresses of the orphan
-            sections.  In addition, placing output statements in the
-            wrong order may require extra segments.  For instance,
-            given a typical situation of all read-only sections placed
-            in one segment and following that a segment containing all
-            the read-write sections, we wouldn't want to place an orphan
-            read/write section before or amongst the read-only ones.  */
-         if (add.head != NULL)
-           {
-             if (place->stmt == NULL)
-               {
-                 /* Put the new statement list right at the head.  */
-                 *add.tail = place->os->header.next;
-                 place->os->header.next = add.head;
-               }
-             else
-               {
-                 /* Put it after the last orphan statement we added.  */
-                 *add.tail = *place->stmt;
-                 *place->stmt = add.head;
-               }
-
-             /* Fix the global list pointer if we happened to tack our
-                new list at the tail.  */
-             if (*old->tail == add.head)
-               old->tail = add.tail;
+         if (place->os == NULL)
+           place->os = lang_output_section_find (place->name);
+         after = place->os;
+         if (after == NULL)
+           after = lang_output_section_find_by_flags (s, flags, &place->os,
+                                                      NULL);
+         if (after == NULL)
+           /* *ABS* is always the first output section statement.  */
+           after = &lang_os_list.head->output_section_statement;
+       }
 
-             /* Save the end of this list.  */
-             place->stmt = add.tail;
-           }
+      /* All sections in an executable must be aligned to a page boundary.
+        In a relocatable link, just preserve the incoming alignment; the
+        address is discarded by lang_insert_orphan in that case, anyway.  */
+      address = exp_unop (ALIGN_K, exp_nameop (NAME, "__section_alignment__"));
+      os = lang_insert_orphan (s, secname, constraint, after, place, address,
+                              &add_child);
+      if (bfd_link_relocatable (&link_info))
+       {
+         os->section_alignment = exp_intop (1U << s->alignment_power);
+         os->bfd_section->alignment_power = s->alignment_power;
        }
     }
 
-  {
-    lang_statement_union_type **pl = &os->children.head;
-
-    if (dollar != NULL)
-      {
-       boolean found_dollar;
-
-       /* The section name has a '$'.  Sort it with the other '$'
-          sections.  */
-
-       found_dollar = false;
-       for ( ; *pl != NULL; pl = &(*pl)->header.next)
-         {
-           lang_input_section_type *ls;
-           const char *lname;
+  /* If the section name has a '\$', sort it with the other '\$'
+     sections.  */
+  for (pl = &os->children.head; *pl != NULL; pl = &(*pl)->header.next)
+    {
+      lang_input_section_type *ls;
+      const char *lname;
 
-           if ((*pl)->header.type != lang_input_section_enum)
-             continue;
+      if ((*pl)->header.type != lang_input_section_enum)
+       continue;
 
-           ls = &(*pl)->input_section;
+      ls = &(*pl)->input_section;
 
-           lname = bfd_get_section_name (ls->ifile->the_bfd, ls->section);
-           if (strchr (lname, '$') == NULL)
-             {
-               if (found_dollar)
-                 break;
-             }
-           else
-             {
-               found_dollar = true;
-               if (strcmp (secname, lname) < 0)
-                 break;
-             }
-         }
-      }
-
-    if (add_child.head != NULL)
-      {
-       add_child.head->header.next = *pl;
-       *pl = add_child.head;
-      }
-  }
+      lname = bfd_get_section_name (ls->section->owner, ls->section);
+      if (strchr (lname, '\$') != NULL
+         && (dollar == NULL || strcmp (orig_secname, lname) < 0))
+       break;
+    }
 
-  free (hold_section_name);
+  if (add_child.head != NULL)
+    {
+      *add_child.tail = *pl;
+      *pl = add_child.head;
+    }
 
-  return true;
+  return os;
 }
 
-static boolean
-gld_${EMULATION_NAME}_open_dynamic_archive (arch, search, entry)
-     const char * arch ATTRIBUTE_UNUSED;
-     search_dirs_type * search;
-     lang_input_statement_type * entry;
+static bfd_boolean
+gld_${EMULATION_NAME}_open_dynamic_archive
+  (const char *arch ATTRIBUTE_UNUSED,
+   search_dirs_type *search,
+   lang_input_statement_type *entry)
 {
+  static const struct
+    {
+      const char * format;
+      bfd_boolean use_prefix;
+    }
+  libname_fmt [] =
+    {
+      /* Preferred explicit import library for dll's.  */
+      { "lib%s.dll.a", FALSE },
+      /* 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.  */
+      { "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 },
+#endif
+      /* Try "libfoo.dll" (default preferred dll name).  */
+      {        "lib%s.dll", FALSE },
+      /* Finally try 'native' dll name "foo.dll".  */
+      {  "%s.dll", FALSE },
+      /* Note: If adding more formats to this table, make sure to check to
+        see if their length is longer than libname_fmt[0].format, and if
+        so, update the call to xmalloc() below.  */
+      { NULL, FALSE }
+    };
+  static unsigned int format_max_len = 0;
   const char * filename;
-  char * string;
+  char * full_string;
+  char * base_string;
+  unsigned int i;
+
 
-  if (! entry->is_archive)
-    return false;
+  if (! entry->flags.maybe_archive || entry->flags.full_name_provided)
+    return FALSE;
 
   filename = entry->filename;
 
-  string = (char *) xmalloc (strlen (search->name)
-                             + strlen (filename)
-                             + sizeof "/lib.a.dll"
+  if (format_max_len == 0)
+    /* We need to allow space in the memory that we are going to allocate
+       for the characters in the format string.  Since the format array is
+       static we only need to calculate this information once.  In theory
+       this value could also be computed statically, but this introduces
+       the possibility for a discrepancy and hence a possible memory
+       corruption.  The lengths we compute here will be too long because
+       they will include any formating characters (%s) in the strings, but
+       this will not matter.  */
+    for (i = 0; libname_fmt[i].format; i++)
+      if (format_max_len < strlen (libname_fmt[i].format))
+       format_max_len = strlen (libname_fmt[i].format);
+
+  full_string = xmalloc (strlen (search->name)
+                        + strlen (filename)
+                        + format_max_len
 #ifdef DLL_SUPPORT
-                             + (pe_dll_search_prefix ? strlen (pe_dll_search_prefix) : 0)
+                        + (pe_dll_search_prefix
+                           ? strlen (pe_dll_search_prefix) : 0)
 #endif
-                             + 1);
+                        /* Allow for the terminating NUL and for the path
+                           separator character that is inserted between
+                           search->name and the start of the format string.  */
+                        + 2);
 
-  /* Try "libfoo.dll.a" first (preferred explicit import library for dll's */
-  sprintf (string, "%s/lib%s.dll.a", search->name, filename);
+  sprintf (full_string, "%s/", search->name);
+  base_string = full_string + strlen (full_string);
 
-  if (! ldfile_try_open_bfd (string, entry))
+  for (i = 0; libname_fmt[i].format; i++)
     {
-      /* Try "foo.dll.a" next (alternate explicit import library for dll's */
-      sprintf (string, "%s/%s.dll.a", search->name, filename);
-      if (! ldfile_try_open_bfd (string, entry))
-        {
-/*
-   Try libfoo.a next. Normally, this would be interpreted as a static
-   library, but it *could* be an import library. For backwards compatibility,
-   libfoo.a needs to ==precede== libfoo.dll and foo.dll in the search,
-   or sometimes errors occur when building legacy packages.
-
-   Putting libfoo.a here means that in a failure case (i.e. the library
-   -lfoo is not found) we will search for libfoo.a twice before
-   giving up -- once here, and once when searching for a "static" lib.
-   for a "static" lib.
-*/
-          /* Try "libfoo.a" (import lib, or static lib, but must
-             take precedence over dll's) */
-          sprintf (string, "%s/lib%s.a", search->name, filename);
-          if (! ldfile_try_open_bfd (string, entry))
-            {
 #ifdef DLL_SUPPORT
-              if (pe_dll_search_prefix)
-                {
-                  /* Try "<prefix>foo.dll" (preferred dll name, if specified) */
-                  sprintf (string, "%s/%s%s.dll", search->name, pe_dll_search_prefix, filename);
-                  if (! ldfile_try_open_bfd (string, entry))
-                    {
-                      /* Try "libfoo.dll" (default preferred dll name) */
-                      sprintf (string, "%s/lib%s.dll", search->name, filename);
-                      if (! ldfile_try_open_bfd (string, entry))
-                        {
-                          /* Finally, try "foo.dll" (alternate dll name) */
-                          sprintf (string, "%s/%s.dll", search->name, filename);
-                          if (! ldfile_try_open_bfd (string, entry))
-                            {
-                              free (string);
-                              return false;
-                            }
-                        }
-                    }
-                }
-              else /* pe_dll_search_prefix not specified */
+      if (libname_fmt[i].use_prefix)
+       {
+         if (!pe_dll_search_prefix)
+           continue;
+         sprintf (base_string, libname_fmt[i].format, pe_dll_search_prefix, filename);
+       }
+      else
 #endif
-                {
-                  /* Try "libfoo.dll" (preferred dll name) */
-                  sprintf (string, "%s/lib%s.dll", search->name, filename);
-                  if (! ldfile_try_open_bfd (string, entry))
-                    {
-                      /* Finally, try "foo.dll" (alternate dll name) */
-                      sprintf (string, "%s/%s.dll", search->name, filename);
-                      if (! ldfile_try_open_bfd (string, entry))
-                        {
-                          free (string);
-                          return false;
-                        }
-                    }
-                }
-            }
-        }
+       sprintf (base_string, libname_fmt[i].format, filename);
+
+      if (ldfile_try_open_bfd (full_string, entry))
+       break;
     }
 
-  entry->filename = string;
+  if (!libname_fmt[i].format)
+    {
+      free (full_string);
+      return FALSE;
+    }
+
+  entry->filename = full_string;
 
-  return true;
+  return TRUE;
 }
 
 static int
-gld_${EMULATION_NAME}_find_potential_libraries (name, entry)
-     char * name;
-     lang_input_statement_type * entry;
+gld_${EMULATION_NAME}_find_potential_libraries
+  (char *name, lang_input_statement_type *entry)
 {
   return ldfile_open_file_search (name, entry, "", ".lib");
 }
 \f
 static char *
-gld_${EMULATION_NAME}_get_script(isfile)
-     int *isfile;
+gld_${EMULATION_NAME}_get_script (int *isfile)
 EOF
 # Scripts compiled in.
 # sed commands to quote an ld script as a C string.
 sc="-f stringify.sed"
 
-cat >>e${EMULATION_NAME}.c <<EOF
+fragment <<EOF
 {
   *isfile = 0;
 
-  if (link_info.relocateable == true && config.build_constructors == true)
+  if (bfd_link_relocatable (&link_info) && config.build_constructors)
     return
 EOF
-sed $sc ldscripts/${EMULATION_NAME}.xu                     >> e${EMULATION_NAME}.c
-echo '  ; else if (link_info.relocateable == true) return' >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xr                     >> e${EMULATION_NAME}.c
-echo '  ; else if (!config.text_read_only) return'         >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xbn                    >> e${EMULATION_NAME}.c
-echo '  ; else if (!config.magic_demand_paged) return'     >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xn                     >> e${EMULATION_NAME}.c
-echo '  ; else return'                                     >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.x                      >> e${EMULATION_NAME}.c
-echo '; }'                                                 >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xu                 >> e${EMULATION_NAME}.c
+echo '  ; else if (bfd_link_relocatable (&link_info)) return' >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xr                 >> e${EMULATION_NAME}.c
+echo '  ; else if (!config.text_read_only) return'     >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xbn                        >> e${EMULATION_NAME}.c
+echo '  ; else if (!config.magic_demand_paged) return' >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xn                 >> e${EMULATION_NAME}.c
+if test -n "$GENERATE_AUTO_IMPORT_SCRIPT" ; then
+echo '  ; else if (link_info.pei386_auto_import == 1 && (MERGE_RDATA_V2 || link_info.pei386_runtime_pseudo_reloc != 2)) return'        >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xa                 >> e${EMULATION_NAME}.c
+fi
+echo '  ; else return'                                 >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.x                  >> e${EMULATION_NAME}.c
+echo '; }'                                             >> e${EMULATION_NAME}.c
 
-cat >>e${EMULATION_NAME}.c <<EOF
+fragment <<EOF
 
 
 struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
@@ -1915,6 +2349,7 @@ 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,
   after_allocation_default,
   set_output_arch_default,
   ldemul_default_target,
@@ -1922,15 +2357,19 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
   gld_${EMULATION_NAME}_get_script,
   "${EMULATION_NAME}",
   "${OUTPUT_FORMAT}",
-  gld_${EMULATION_NAME}_finish, /* finish */
-  NULL, /* create output section statements */
+  gld_${EMULATION_NAME}_finish,
+  NULL, /* Create output section statements.  */
   gld_${EMULATION_NAME}_open_dynamic_archive,
   gld_${EMULATION_NAME}_place_orphan,
   gld_${EMULATION_NAME}_set_symbols,
-  gld_${EMULATION_NAME}_parse_args,
+  NULL, /* parse_args */
+  gld${EMULATION_NAME}_add_options,
+  gld${EMULATION_NAME}_handle_option,
   gld_${EMULATION_NAME}_unrecognized_file,
   gld_${EMULATION_NAME}_list_options,
   gld_${EMULATION_NAME}_recognized_file,
-  gld_${EMULATION_NAME}_find_potential_libraries
+  gld_${EMULATION_NAME}_find_potential_libraries,
+  NULL,        /* new_vers_pattern.  */
+  NULL /* extra_map_file_text.  */
 };
 EOF
This page took 0.103995 seconds and 4 git commands to generate.