* emultempl/pe.em [cygwin]: Do not merge rdata with v2

[binutils-gdb.git] / ld / emultempl / pe.em

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index b8290b3435bf3e02794f3600c48a671d9d625d21..7a11396f1286569463637ae5ddc2027286b37ce9 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -8,8 +8,7 @@ fi
 rm -f e${EMULATION_NAME}.c
 (echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-)
 fragment <<EOF
-/* Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright 1995-2013 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -164,16 +163,19 @@ gld_${EMULATION_NAME}_before_parse (void)
   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;
 EOF
 
 # 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=1
+    default_merge_rdata=0
     ;;
   i[3-7]86-*-mingw* | x86_64-*-mingw*)
     default_auto_import=1
@@ -260,7 +262,7 @@ fragment <<EOF
 #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_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)
@@ -275,8 +277,9 @@ gld${EMULATION_NAME}_add_options
    int nrl ATTRIBUTE_UNUSED,
    struct option **really_longopts ATTRIBUTE_UNUSED)
 {
-  static const struct option xtra_long[] = {
-    /* PE options */
+  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},
@@ -943,7 +946,7 @@ gld_${EMULATION_NAME}_set_symbols (void)
       lang_assignment_statement_type *rv;
 
       rv = lang_add_assignment (exp_assign (GET_INIT_SYMBOL_NAME (j),
-                                           exp_intop (val)));
+                                           exp_intop (val), FALSE));
       if (init[j].size == sizeof (short))
        *(short *) init[j].ptr = val;
       else if (init[j].size == sizeof (int))
@@ -1197,14 +1200,13 @@ This should work unless it involves constant data structures referencing symbols
 static bfd_boolean
 pr_sym (struct bfd_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
 {
-  if (pe_dll_extra_pe_debug)
-    printf ("+%s\n", h->string);
+  printf ("+%s\n", h->string);
 
   return TRUE;
 }
 #endif /* DLL_SUPPORT */
 
-static void 
+static void
 debug_section_p (bfd *abfd ATTRIBUTE_UNUSED, asection *sect, void *obj)
 {
   int *found = (int *) obj;
@@ -1590,8 +1592,10 @@ gld_${EMULATION_NAME}_after_open (void)
                        /* If the symbol in the stub section has no other
                           undefined references, exclude the stub section
                           from the final link.  */
-                       if (blhe && (blhe->type == bfd_link_hash_defined)
-                           && (blhe->u.undef.next == NULL))
+                       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;
                      }
                  }
@@ -1719,8 +1723,9 @@ gld_${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry ATTRIB
                = 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));
+               image_base_statement->exp
+                 = exp_assign ("__image_base__", exp_intop (pe.ImageBase),
+                               FALSE);
            }
 
          if (pe_def_file->stack_reserve != -1
@@ -1913,7 +1918,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
               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, os);
+           lang_add_section (&add_child, s, NULL, os);
            break;
          }
 
@@ -1927,7 +1932,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
      unused one and use that.  */
   if (os == NULL && match_by_name)
     {
-      lang_add_section (&match_by_name->children, s, match_by_name);
+      lang_add_section (&match_by_name->children, s, NULL, match_by_name);
       return match_by_name;
     }
 
@@ -2092,7 +2097,7 @@ gld_${EMULATION_NAME}_open_dynamic_archive
   unsigned int i;
 
 
-  if (! entry->maybe_archive)
+  if (! entry->flags.maybe_archive)
     return FALSE;
 
   filename = entry->filename;