darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2007-07-04 H.J. Lu <hongjiu.lu@intel.com>

Browse source 
* peicode.h (pe_bfd_object_p): Don't check PE vs. EFI target
	if arch is unknown.
This commit is contained in:
H.J. Lu 2007-07-05 02:50:02 +00:00
parent e4e4a5d1f4
commit a93221e521
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,3 +1,8 @@
2007-07-04 H.J. Lu <hongjiu.lu@intel.com>
* peicode.h (pe_bfd_object_p): Don't check PE vs. EFI target
if arch is unknown.
2007-07-04 Nick Clifton <nickc@redhat.com>
Import this patch from an internal tree:

32
bfd/peicode.h
View file

@ -1342,6 +1342,10 @@ pe_bfd_object_p (bfd * abfd)
else
arch = pe_arch (bfd_target_pei_arch (abfd->xvec));
/* Don't check PE vs. EFI if arch is unknown. */
if (arch == arch_type_unknown)
return target;
for (target_ptr = bfd_target_vector; *target_ptr != NULL;
target_ptr++)
{
@ -1355,13 +1359,13 @@ pe_bfd_object_p (bfd * abfd)
if (pe_arch (bfd_target_efi_arch (*target_ptr)) != arch)
continue;
if (efi)
{
/* TARGET_PTR is an EFI backend. Don't match
TARGET with a EFI file. */
bfd_set_error (bfd_error_wrong_format);
return NULL;
}
if (efi)
{
/* TARGET_PTR is an EFI backend. Don't match
TARGET with a EFI file. */
bfd_set_error (bfd_error_wrong_format);
return NULL;
}
}
else if (bfd_target_pei_p (*target_ptr))
{
@ -1369,13 +1373,13 @@ pe_bfd_object_p (bfd * abfd)
if (pe_arch (bfd_target_pei_arch (*target_ptr)) != arch)
continue;
if (!efi)
{
/* TARGET_PTR is a PE backend. Don't match
TARGET with a PE file. */
bfd_set_error (bfd_error_wrong_format);
return NULL;
}
if (!efi)
{
/* TARGET_PTR is a PE backend. Don't match
TARGET with a PE file. */
bfd_set_error (bfd_error_wrong_format);
return NULL;
}
}
}
}