From b5d0b86904c382dc9823122c3fbfd44698ad7039 Mon Sep 17 00:00:00 2001 From: hjl Date: Wed, 6 Feb 2002 21:34:15 +0000 Subject: [PATCH] 2002-02-06 H.J. Lu (hjl@gnu.org) * elf32-mips.c (_bfd_mips_elf_merge_private_bfd_data): Update the mach and ISA fields if necessary. --- bfd/ChangeLog | 5 +++++ bfd/elf32-mips.c | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6f2764be7d..c3bf16d71f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2002-02-06 H.J. Lu (hjl@gnu.org) + + * elf32-mips.c (_bfd_mips_elf_merge_private_bfd_data): Update + the mach and ISA fields if necessary. + 2002-02-06 Nick Clifton * coffcode.h (coff_set_arch_mach_hook): Select the highest known diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index a84112ef8d..479ab75def 100644 --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -3169,8 +3169,21 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd) bfd_archive_filename (ibfd), new_isa, old_isa); ok = false; } - } + else + { + /* Do we need to update the mach field? */ + if (old_mach == 0 && new_mach != 0) + elf_elfheader (obfd)->e_flags |= new_mach; + /* Do we need to update the ISA field? */ + if (new_isa > old_isa) + { + elf_elfheader (obfd)->e_flags &= ~EF_MIPS_ARCH; + elf_elfheader (obfd)->e_flags + |= new_flags & EF_MIPS_ARCH; + } + } + } else { (*_bfd_error_handler) -- 2.11.0