espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 03:22:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not initialise private data in output BFD if the input BFD is the default

Browse Source 
architecture - instead allow future merges to do this.
This commit is contained in:
Nick Clifton
1998-02-07 01:06:49 +00:00
parent b67a3a96ad
commit 8b6dcc1bb9
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bfd/ChangeLog
View File

@ -2,7 +2,8 @@ start-sanitize-v850e
Fri Feb 6 14:48:20 1998 Nick Clifton <nickc@cygnus.com> Fri Feb 6 14:48:20 1998 Nick Clifton <nickc@cygnus.com>
* elf32-v850.c (v850_elf_merge_private_bfd_data): Do not complain * elf32-v850.c (v850_elf_merge_private_bfd_data): Do not complain
when merging v850 code into v850e/v850ea code. when merging v850 code into v850e/v850ea code. Do not initialise
output flags if the input is the default architecture. PR14732.
end-sanitize-v850e end-sanitize-v850e
Fri Feb 6 11:50:22 1998 Jeffrey A Law (law@cygnus.com) Fri Feb 6 11:50:22 1998 Jeffrey A Law (law@cygnus.com)

32
bfd/elf32-v850.c
View File

@ -1564,20 +1564,29 @@ v850_elf_merge_private_bfd_data (ibfd, obfd)
bfd * ibfd; bfd * ibfd;
bfd * obfd; bfd * obfd;
{ {
flagword old_flags; flagword out_flags;
flagword new_flags; flagword in_flags;
if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour
|| bfd_get_flavour (obfd) != bfd_target_elf_flavour) || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
return true; return true;
new_flags = elf_elfheader (ibfd)->e_flags; in_flags = elf_elfheader (ibfd)->e_flags;
old_flags = elf_elfheader (obfd)->e_flags; out_flags = elf_elfheader (obfd)->e_flags;
if (! elf_flags_init (obfd)) if (! elf_flags_init (obfd))
{ {
/* If the input is the default architecture then do not
bother setting the flags for the output architecture,
instead allow future merges to do this. If no future
merges ever set these flags then they will retain their
unitialised values, which surprise surprise, correspond
to the default values. */
if (bfd_get_arch_info (ibfd)->the_default)
return true;
elf_flags_init (obfd) = true; elf_flags_init (obfd) = true;
elf_elfheader (obfd)->e_flags = new_flags; elf_elfheader (obfd)->e_flags = in_flags;
if (bfd_get_arch (obfd) == bfd_get_arch (ibfd) if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
&& bfd_get_arch_info (obfd)->the_default) && bfd_get_arch_info (obfd)->the_default)
@ -1589,16 +1598,13 @@ v850_elf_merge_private_bfd_data (ibfd, obfd)
} }
/* Check flag compatibility. */ /* Check flag compatibility. */
if (new_flags == old_flags) if (in_flags == out_flags)
return true; return true;
if ((new_flags & EF_V850_ARCH) != (old_flags & EF_V850_ARCH)) if ((in_flags & EF_V850_ARCH) != (out_flags & EF_V850_ARCH)
{ && (in_flags & EF_V850_ARCH) != E_V850_ARCH)
if ((old_flags & EF_V850_ARCH) != E_V850_ARCH) _bfd_error_handler ("%s: Architecture mismatch with previous modules",
_bfd_error_handler ("%s: Architecture mismatch with previous modules", bfd_get_filename (ibfd));
bfd_get_filename (ibfd));
return true;
}
return true; return true;
} }