diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/emultempl/pe.em | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index bc19416..0d10fd6 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 f926502..4326e7e 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; |