2009-11-06 Kai Tietz <kai.tietz@onevision.com>

        * pe.em (DEFAULT_PSEUDO_RELOC_VERSION): New macro.
        (gld_XXX_before_parse): Set pseudo-relocation default
        version to DEFAULT_PSEUDO_RELOC_VERSION.
        (gldXXX_handle_option): Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index bc194168427e1dff33774536fa2dcff088fb2c0b..0d10fd62947fac2c93769fee2658bce14a87a89e 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-06  Kai Tietz  <kai.tietz@onevision.com>
+
+       * pe.em (DEFAULT_PSEUDO_RELOC_VERSION): New macro.
+       (gld_XXX_before_parse): Set pseudo-relocation default
+       version to DEFAULT_PSEUDO_RELOC_VERSION.
+       (gldXXX_handle_option): Likewise.
+
+
 2009-11-05  Nick Clifton  <nickc@redhat.com>
 
        * lexsup.c: Rename --add-needed to --copy-dt-needed-entries.

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index f926502bb52d0ad3aa1e2b1b7e68b0495bfcc551..4326e7e8266b758640a775d664cc5b7e3e64a85d 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -99,6 +99,12 @@ fragment <<EOF
 #define DLL_SUPPORT
 #endif
 
+#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)
 #define        PE_DEF_SUBSYSTEM                3
 #else
@@ -161,7 +167,8 @@ esac
 
 fragment <<EOF
   link_info.pei386_auto_import = ${default_auto_import};
-  link_info.pei386_runtime_pseudo_reloc = 1; /* Use by default version 1.  */
+  /* Use by default version.  */
+  link_info.pei386_runtime_pseudo_reloc = DEFAULT_PSEUDO_RELOC_VERSION;
 #endif
 }
 \f
@@ -746,7 +753,8 @@ gld${EMULATION_NAME}_handle_option (int optc)
       link_info.pei386_auto_import = 0;
       break;
     case OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC:
-      link_info.pei386_runtime_pseudo_reloc = 1;
+      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;