diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2007-06-18 16:26:28 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2007-06-18 16:26:28 +0000 |
| commit | dc1f3d8a2de4b827b4b396080acad35398a70fb4 (patch) | |
| tree | ba22a0824356353f77d36e51365dfa8ac640a975 /bfd/libpei.h | |
| parent | ddefa7f50892ef835baf283217701cc9acb45418 (diff) | |
| download | fsf-binutils-gdb-dc1f3d8a2de4b827b4b396080acad35398a70fb4.zip fsf-binutils-gdb-dc1f3d8a2de4b827b4b396080acad35398a70fb4.tar.gz fsf-binutils-gdb-dc1f3d8a2de4b827b4b396080acad35398a70fb4.tar.bz2 | |
2007-06-18 H.J. Lu <hongjiu.lu@intel.com>
* libpei.h (_bfd_XXi_final_link_postscript): Remove
duplication.
(bfd_target_pei_p): New.
(bfd_target_pei_arch): New
(bfd_target_efi_p): Likewise.
(bfd_target_efi_arch): New
(bfd_pe_executable_p): Use bfd_target_pei_p and
bfd_target_efi_p.
* peicode.h (arch_type): New enum.
(pe_arch): New function.
(pe_bfd_object_p): Don't match PE/EFI target with EFI/PE file
if there is an EFI/PE target.
Diffstat (limited to 'bfd/libpei.h')
| -rw-r--r-- | bfd/libpei.h | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/bfd/libpei.h b/bfd/libpei.h index 10a2a25..0e08e03 100644 --- a/bfd/libpei.h +++ b/bfd/libpei.h @@ -224,7 +224,6 @@ #define _bfd_XX_only_swap_filehdr_out _bfd_pex64_only_swap_filehdr_out #define _bfd_XX_print_private_bfd_data_common _bfd_pex64_print_private_bfd_data_common #define _bfd_XXi_final_link_postscript _bfd_pex64i_final_link_postscript -#define _bfd_XXi_final_link_postscript _bfd_pex64i_final_link_postscript #define _bfd_XXi_only_swap_filehdr_out _bfd_pex64i_only_swap_filehdr_out #define _bfd_XXi_swap_aouthdr_in _bfd_pex64i_swap_aouthdr_in #define _bfd_XXi_swap_aouthdr_out _bfd_pex64i_swap_aouthdr_out @@ -256,7 +255,6 @@ #define _bfd_XX_only_swap_filehdr_out _bfd_pep_only_swap_filehdr_out #define _bfd_XX_print_private_bfd_data_common _bfd_pep_print_private_bfd_data_common #define _bfd_XXi_final_link_postscript _bfd_pepi_final_link_postscript -#define _bfd_XXi_final_link_postscript _bfd_pepi_final_link_postscript #define _bfd_XXi_only_swap_filehdr_out _bfd_pepi_only_swap_filehdr_out #define _bfd_XXi_swap_aouthdr_in _bfd_pepi_swap_aouthdr_in #define _bfd_XXi_swap_aouthdr_out _bfd_pepi_swap_aouthdr_out @@ -288,7 +286,6 @@ #define _bfd_XX_only_swap_filehdr_out _bfd_pe_only_swap_filehdr_out #define _bfd_XX_print_private_bfd_data_common _bfd_pe_print_private_bfd_data_common #define _bfd_XXi_final_link_postscript _bfd_pei_final_link_postscript -#define _bfd_XXi_final_link_postscript _bfd_pei_final_link_postscript #define _bfd_XXi_only_swap_filehdr_out _bfd_pei_only_swap_filehdr_out #define _bfd_XXi_swap_aouthdr_in _bfd_pei_swap_aouthdr_in #define _bfd_XXi_swap_aouthdr_out _bfd_pei_swap_aouthdr_out @@ -302,10 +299,27 @@ #endif /* !COFF_WITH_pep */ -/* Macro: Returns true if the bfd is a PE executable as opposed to a PE object file. */ +/* Returns true if the target is a PE executable target. */ +#define bfd_target_pei_p(xvec) \ + (CONST_STRNEQ ((xvec)->name, "pei-")) + +/* Return the arch string of a PE executable target. */ +#define bfd_target_pei_arch(xvec) \ + ((xvec)->name + sizeof ("pei-") - 1) + +/* Returns true if the target is an EFI target. */ +#define bfd_target_efi_p(xvec) \ + (CONST_STRNEQ ((xvec)->name, "efi-app-")) + +/* Return the arch string of an EFI target. */ +#define bfd_target_efi_arch(xvec) \ + ((xvec)->name + sizeof ("efi-app-") - 1) + +/* Macro: Returns true if the bfd is a PE executable as opposed to a + PE object file. */ #define bfd_pe_executable_p(abfd) \ - (CONST_STRNEQ ((abfd)->xvec->name, "pei-") \ - || CONST_STRNEQ ((abfd)->xvec->name, "efi-app-")) + (bfd_target_pei_p ((abfd)->xvec) \ + || bfd_target_efi_p ((abfd)->xvec)) /* These functions are architecture dependent, and are in peicode.h: coff_swap_reloc_in |