Merge r357224 from the clang1000-import branch:
Fix the following -Werror warning from clang 10.0.0 in binutils: contrib/binutils/bfd/peicode.h:1356:3: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation] if (efi) ^ contrib/binutils/bfd/peicode.h:1353:8: note: previous statement is here if (pe_arch (bfd_target_efi_arch (*target_ptr)) != arch) ^ contrib/binutils/bfd/peicode.h:1370:3: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation] if (!efi) ^ contrib/binutils/bfd/peicode.h:1367:8: note: previous statement is here if (pe_arch (bfd_target_pei_arch (*target_ptr)) != arch) ^ MFC after: 3 days
This commit is contained in:
commit
8841e3fb92
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=357226
@ -1353,13 +1353,13 @@ pe_bfd_object_p (bfd * abfd)
|
|||||||
if (pe_arch (bfd_target_efi_arch (*target_ptr)) != arch)
|
if (pe_arch (bfd_target_efi_arch (*target_ptr)) != arch)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (efi)
|
if (efi)
|
||||||
{
|
{
|
||||||
/* TARGET_PTR is an EFI backend. Don't match
|
/* TARGET_PTR is an EFI backend. Don't match
|
||||||
TARGET with a EFI file. */
|
TARGET with a EFI file. */
|
||||||
bfd_set_error (bfd_error_wrong_format);
|
bfd_set_error (bfd_error_wrong_format);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (bfd_target_pei_p (*target_ptr))
|
else if (bfd_target_pei_p (*target_ptr))
|
||||||
{
|
{
|
||||||
@ -1367,13 +1367,13 @@ pe_bfd_object_p (bfd * abfd)
|
|||||||
if (pe_arch (bfd_target_pei_arch (*target_ptr)) != arch)
|
if (pe_arch (bfd_target_pei_arch (*target_ptr)) != arch)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!efi)
|
if (!efi)
|
||||||
{
|
{
|
||||||
/* TARGET_PTR is a PE backend. Don't match
|
/* TARGET_PTR is a PE backend. Don't match
|
||||||
TARGET with a PE file. */
|
TARGET with a PE file. */
|
||||||
bfd_set_error (bfd_error_wrong_format);
|
bfd_set_error (bfd_error_wrong_format);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user