2009-04-06 H.J. Lu <hongjiu.lu@intel.com>

* coff-x86_64.c (bfd_pe_print_pdata): Defined to
	_bfd_pex64_print_pdata only if PE is defined.

	* libpei.h (_bfd_pep_print_x64_pdata): Renamed to ...
	(_bfd_pex64_print_pdata): This.

	* peXXigen.c (_bfd_pep_print_x64_pdata): Renamed to ...
	(_bfd_pex64_print_pdata): This.  Defined only if COFF_WITH_pex64
	is defined.
This commit is contained in:
H.J. Lu 2009-04-06 16:48:36 +00:00
parent 32252ac19e
commit db1fe6e9e5
4 changed files with 23 additions and 3 deletions

View File

@ -1,3 +1,15 @@
2009-04-06 H.J. Lu <hongjiu.lu@intel.com>
* coff-x86_64.c (bfd_pe_print_pdata): Defined to
_bfd_pex64_print_pdata only if PE is defined.
* libpei.h (_bfd_pep_print_x64_pdata): Renamed to ...
(_bfd_pex64_print_pdata): This.
* peXXigen.c (_bfd_pep_print_x64_pdata): Renamed to ...
(_bfd_pex64_print_pdata): This. Defined only if COFF_WITH_pex64
is defined.
2009-04-05 Kai Tietz <kai.tietz@onevision.com>
* coff-x86_64.c (bfd_pe_print_pdata): Define as

View File

@ -711,8 +711,14 @@ coff_amd64_is_local_label_name (bfd *abfd, const char *name)
#endif /* TARGET_UNDERSCORE */
#ifdef PE
#undef bfd_pe_print_pdata
#define bfd_pe_print_pdata _bfd_pep_print_x64_pdata
#define bfd_pe_print_pdata _bfd_pex64_print_pdata
#else /* PE */
#ifndef bfd_pe_print_pdata
#define bfd_pe_print_pdata NULL
#endif
#endif /* PE */
#include "coffcode.h"

View File

@ -393,5 +393,5 @@ bfd_boolean _bfd_pe_print_ce_compressed_pdata (bfd *, void *);
bfd_boolean _bfd_pe64_print_ce_compressed_pdata (bfd *, void *);
bfd_boolean _bfd_pex64_print_ce_compressed_pdata (bfd *, void *);
bfd_boolean _bfd_pep_print_ce_compressed_pdata (bfd *, void *);
bfd_boolean _bfd_pep_print_x64_pdata (bfd *, void *);
bfd_boolean _bfd_pex64_print_pdata (bfd *, void *);

View File

@ -1895,9 +1895,10 @@ _bfd_XX_print_ce_compressed_pdata (bfd * abfd, void * vfile)
#undef PDATA_ROW_SIZE
}
#ifdef COFF_WITH_pex64
/* The PE+ x64 variant. */
bfd_boolean
_bfd_pep_print_x64_pdata (bfd *abfd, void *vfile)
_bfd_pex64_print_pdata (bfd *abfd, void *vfile)
{
# define PDATA_ROW_SIZE (3 * 4)
FILE *file = (FILE *) vfile;
@ -1974,6 +1975,7 @@ _bfd_pep_print_x64_pdata (bfd *abfd, void *vfile)
return TRUE;
#undef PDATA_ROW_SIZE
}
#endif
#define IMAGE_REL_BASED_HIGHADJ 4
static const char * const tbl[] =