* 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 5a18c43e57784fed31733703b376b3c6740b88dd..7566d5b05968c4edecbed574f87065a2dd957914 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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

diff --git a/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c
index 8d71cb659e6f5f6196804c71d85cee598e13a16b..1242635481895312651d984926f67dd70a5dc732 100644 (file)
--- 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)