This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH]: Fix merge of flags for HC12 and HCS12


Hi!

Committed the attached patch to fix:

[bug #3432] -m68hcs12 option cannot be used due to link errors with provided libs
    http://savannah.gnu.org/bugs/?func=detailbug&bug_id=3432&group_id=2424

Stephane

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.

Index: elf32-m68hc1x.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-m68hc1x.c,v
retrieving revision 1.7
diff -u -p -r1.7 elf32-m68hc1x.c
--- elf32-m68hc1x.c	6 Sep 2003 21:09:40 -0000	1.7
+++ elf32-m68hc1x.c	4 Oct 2003 20:07:01 -0000
@@ -1375,8 +1375,8 @@ _bfd_m68hc11_elf_merge_private_bfd_data 
 
   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)

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]