From: Kai Tietz <kai.tietz@onevision.com>
Date: Fri, 6 Nov 2009 15:50:56 +0000 (+0000)
Subject: 2009-11-06  Kai Tietz  <kai.tietz@onevision.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e468a046931eb627c31071f9e520f7d1e8e7a3b5;p=binutils-gdb.git

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 bc194168427..0d10fd62947 100644
--- 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 f926502bb52..4326e7e8266 100644
--- 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
 }
 
@@ -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;