diff options
| author | Nick Clifton <nickc@redhat.com> | 2009-12-02 14:04:17 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2009-12-02 14:04:17 +0000 |
| commit | e05da72d4d8289607dfc3f320ce28c25ed939f82 (patch) | |
| tree | a79a3020d40e6b98a23407039bd4795a2750d4d1 /binutils | |
| parent | f29dff0a0940505506d27e54afbd750b8409846b (diff) | |
| download | binutils-gdb-e05da72d4d8289607dfc3f320ce28c25ed939f82.tar.gz | |
PR binutils/11017
* dlltool.c (PAGE_SIZE): Delete.
(PAGE_MASK): Provide default definition based on COFF_PAGE_SIZE.
Check for DLLTOOL_DEFAULT_MX86_64 and DLLTOOL_DEFAULT_I386.
* coff-i386.h (COFF_PAGE_SIZE): Definition moved to coff/i386.h
* i386lh (COFF_PAGE_SIZE): Define.
* x86_64.h (COFF_PAGE_SIZE): Define.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 7 | ||||
| -rw-r--r-- | binutils/dlltool.c | 20 |
2 files changed, 21 insertions, 6 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index e1d89054075..13c917f4baf 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2009-12-02 Jerker Bäck <jerker.back@gmail.com> + + PR binutils/11017 + * dlltool.c (PAGE_SIZE): Delete. + (PAGE_MASK): Provide default definition based on COFF_PAGE_SIZE. + Check for DLLTOOL_DEFAULT_MX86_64 and DLLTOOL_DEFAULT_I386. + 2009-12-01 Joseph Myers <joseph@codesourcery.com> * readelf.c (get_machine_name, get_osabi_name): Handle more diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 72a4a7e3685..b9d717fb210 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -241,9 +241,6 @@ #define show_allnames 0 -#define PAGE_SIZE ((bfd_vma) 4096) -#define PAGE_MASK ((bfd_vma) (-4096)) - #include "sysdep.h" #include "bfd.h" #include "libiberty.h" @@ -263,11 +260,22 @@ #include "coff/arm.h" #include "coff/internal.h" #endif -#ifdef DLLTOOL_MX86_64 +#ifdef DLLTOOL_DEFAULT_MX86_64 #include "coff/x86_64.h" #endif +#ifdef DLLTOOL_DEFAULT_I386 +#include "coff/i386.h" +#endif + +#ifndef COFF_PAGE_SIZE +#define COFF_PAGE_SIZE ((bfd_vma) 4096) +#endif + +#ifndef PAGE_MASK +#define PAGE_MASK ((bfd_vma) (- COFF_PAGE_SIZE)) +#endif -/* get current BFD error message */ +/* Get current BFD error message. */ #define bfd_get_errmsg() (bfd_errmsg (bfd_get_error ())) /* Forward references. */ @@ -2119,7 +2127,7 @@ gen_exp_file (void) if (base_file) { bfd_vma addr; - bfd_vma need[PAGE_SIZE]; + bfd_vma need[COFF_PAGE_SIZE]; bfd_vma page_addr; bfd_size_type numbytes; int num_entries; |