Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

* archures.c (bfd_mach_sparc_64bit_p): Define.

Browse Source 
* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Use it.
	* bfd-in2.h: Rebuilt.
This commit is contained in:
Jakub Jelinek
2004-07-30 10:08:00 +00:00
parent ff636ee388
commit 7946e94a55
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/elf32-sparc.c
View File

@@ -3303,6 +3303,7 @@ elf32_sparc_merge_private_bfd_data (ibfd, obfd)
bfd *obfd;
{
bfd_boolean error;
unsigned long ibfd_mach;
/* FIXME: This should not be static. */
static unsigned long previous_ibfd_e_flags = (unsigned long) -1;
@@ -3312,7 +3313,8 @@ elf32_sparc_merge_private_bfd_data (ibfd, obfd)
error = FALSE;
if (bfd_get_mach (ibfd) >= bfd_mach_sparc_v9)
ibfd_mach = bfd_get_mach (ibfd);
if (bfd_mach_sparc_64bit_p (ibfd_mach))
{
error = TRUE;
(*_bfd_error_handler)
@@ -3321,8 +3323,8 @@ elf32_sparc_merge_private_bfd_data (ibfd, obfd)
}
else if ((ibfd->flags & DYNAMIC) == 0)
{
if (bfd_get_mach (obfd) < bfd_get_mach (ibfd))
bfd_set_arch_mach (obfd, bfd_arch_sparc, bfd_get_mach (ibfd));
if (bfd_get_mach (obfd) < ibfd_mach)
bfd_set_arch_mach (obfd, bfd_arch_sparc, ibfd_mach);
}
if (((elf_elfheader (ibfd)->e_flags & EF_SPARC_LEDATA)