From: Stephane Carrez Date: Sat, 4 Oct 2003 20:07:24 +0000 (+0000) Subject: * elf32-m68hc1x.c (_bfd_m68hc11_elf_merge_private_bfd_data): Fix merge X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=17e58af002ea3495592011fd3dfee63cf999aba5;p=binutils-gdb.git * elf32-m68hc1x.c (_bfd_m68hc11_elf_merge_private_bfd_data): Fix merge of flags between HC12 and HCS12. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5a18c43e577..7566d5b0596 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2003-10-04 Stephane Carrez + + * elf32-m68hc1x.c (_bfd_m68hc11_elf_merge_private_bfd_data): Fix merge + of flags between HC12 and HCS12. + 2003-10-04 Bryce McKinlay * merge.c (_bfd_merge_sections): Set SEC_EXCLUDE flag on sections diff --git a/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c index 8d71cb659e6..12426354818 100644 --- a/bfd/elf32-m68hc1x.c +++ b/bfd/elf32-m68hc1x.c @@ -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)