diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-07-30 10:08:00 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-07-30 10:08:00 +0000 |
| commit | e5accae62b61a5b9cd902746e1070ceb8d8b17b6 (patch) | |
| tree | 3b5b5e9270af329ac27a01e9f4a4386a4f06bd57 /bfd/elf32-sparc.c | |
| parent | e277441f12fe41d6b0d47f0b3ef8a92b4ddaeb19 (diff) | |
| download | binutils-redhat-e5accae62b61a5b9cd902746e1070ceb8d8b17b6.tar.gz | |
* archures.c (bfd_mach_sparc_64bit_p): Define.
* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Use it.
* bfd-in2.h: Rebuilt.
Diffstat (limited to 'bfd/elf32-sparc.c')
| -rw-r--r-- | bfd/elf32-sparc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c index 15868eb54d..d87ff7a46a 100644 --- a/bfd/elf32-sparc.c +++ b/bfd/elf32-sparc.c @@ -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) |