* elf32-m68hc1x.c (_bfd_m68hc11_elf_merge_private_bfd_data): Fix merge

of flags between HC12 and HCS12.
This commit is contained in:
Stephane Carrez 2003-10-04 20:07:24 +00:00
parent 3394863543
commit 17e58af002
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2003-10-04 Stephane Carrez <stcarrez@nerim.fr>
* elf32-m68hc1x.c (_bfd_m68hc11_elf_merge_private_bfd_data): Fix merge
of flags between HC12 and HCS12.
2003-10-04 Bryce McKinlay <bryce@mckinlay.net.nz>
* merge.c (_bfd_merge_sections): Set SEC_EXCLUDE flag on sections

View File

@ -1375,8 +1375,8 @@ _bfd_m68hc11_elf_merge_private_bfd_data (ibfd, obfd)
elf_elfheader (obfd)->e_flags = new_flags;
new_flags &= ~EF_M68HC11_ABI;
old_flags &= ~EF_M68HC11_ABI;
new_flags &= ~(EF_M68HC11_ABI | EF_M68HC11_MACH_MASK);
old_flags &= ~(EF_M68HC11_ABI | EF_M68HC11_MACH_MASK);
/* Warn about any other mismatches */
if (new_flags != old_flags)