diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-03-05 11:54:28 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-03-05 11:54:28 +0000 |
| commit | 4b29db47adc4bb7487afbd28a1485981608e3734 (patch) | |
| tree | dced573230385ae41364e47d784c85e8893faa9a /ld/emultempl | |
| parent | a179050c730a746ccf9ff66fc2d5e0a910cdc9db (diff) | |
| download | binutils-redhat-4b29db47adc4bb7487afbd28a1485981608e3734.tar.gz | |
* configure.host: Add x86_64-*-cygwin* as valid host.
* configure.tgt: Add x86_64-*-cygwin* as valid target.
* emultempl/pep.em: Handle different requirements for Cygwin in terms
of start addresses for executables and DLLs, based on memory model in
http://cygwin.com/ml/cygwin-developers/2013-02/msg00027.html
Diffstat (limited to 'ld/emultempl')
| -rw-r--r-- | ld/emultempl/pep.em | 44 |
1 files changed, 42 insertions, 2 deletions
diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em index 12b7598bf5..3e8b65e19a 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em @@ -5,6 +5,16 @@ if [ -z "$MACHINE" ]; then else OUTPUT_ARCH=${ARCH}:${MACHINE} fi + +case ${target} in + *-*-cygwin*) + move_default_addr_high=1 + ;; + *) + move_default_addr_high=0; + ;; +esac + rm -f e${EMULATION_NAME}.c (echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-) fragment <<EOF @@ -89,9 +99,39 @@ fragment <<EOF #if defined(TARGET_IS_i386pep) || ! defined(DLL_SUPPORT) #define PE_DEF_SUBSYSTEM 3 +#undef NT_EXE_IMAGE_BASE +#define NT_EXE_IMAGE_BASE \ + ((bfd_vma) (${move_default_addr_high} ? 0x100400000LL \ + : 0x400000LL)) +#undef NT_DLL_IMAGE_BASE +#define NT_DLL_IMAGE_BASE \ + ((bfd_vma) (${move_default_addr_high} ? 0x400000000LL \ + : 0x10000000LL)) +#undef NT_DLL_AUTO_IMAGE_BASE +#define NT_DLL_AUTO_IMAGE_BASE \ + ((bfd_vma) (${move_default_addr_high} ? 0x400000000LL \ + : 0x61300000LL)) +#undef NT_DLL_AUTO_IMAGE_MASK +#define NT_DLL_AUTO_IMAGE_MASK \ + ((bfd_vma) (${move_default_addr_high} ? 0x1ffff0000LL \ + : 0x0ffc0000LL)) #else #undef NT_EXE_IMAGE_BASE -#define NT_EXE_IMAGE_BASE 0x00010000 +#define NT_EXE_IMAGE_BASE \ + ((bfd_vma) (${move_default_addr_high} ? 0x100010000LL \ + : 0x10000LL)) +#undef NT_DLL_IMAGE_BASE +#define NT_DLL_IMAGE_BASE \ + ((bfd_vma) (${move_default_addr_high} ? 0x110000000LL \ + : 0x10000000LL)) +#undef NT_DLL_AUTO_IMAGE_BASE +#define NT_DLL_AUTO_IMAGE_BASE \ + ((bfd_vma) (${move_default_addr_high} ? 0x120000000LL \ + : 0x61300000LL)) +#undef NT_DLL_AUTO_IMAGE_MASK +#define NT_DLL_AUTO_IMAGE_MASK \ + ((bfd_vma) (${move_default_addr_high} ? 0x0ffff0000LL \ + : 0x0ffc0000LL)) #undef PE_DEF_SECTION_ALIGNMENT #define PE_DEF_SUBSYSTEM 2 #undef PE_DEF_FILE_ALIGNMENT @@ -808,7 +848,7 @@ static bfd_vma compute_dll_image_base (const char *ofile) { bfd_vma hash = (bfd_vma) strhash (ofile); - return 0x61300000 + ((hash << 16) & 0x0FFC0000); + return NT_DLL_AUTO_IMAGE_BASE + ((hash << 16) & NT_DLL_AUTO_IMAGE_MASK); } #endif |