summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2004-12-11 01:39:42 +0000
committermrg <mrg@NetBSD.org>2004-12-11 01:39:42 +0000
commitce3315ff2fe2b41be3fb022dc59c05ece2e85030 (patch)
treee4bca5d6b5784a5085625600463bcc9ea2aa8a42 /gnu
parent9741933ec5f08318f204fa6cd088eafd998f090a (diff)
redo the previous such that it works. amd64 seems to work again now.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/dist/binutils/bfd/elflink.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/dist/binutils/bfd/elflink.c b/gnu/dist/binutils/bfd/elflink.c
index a50334fde7d..db1fbc110b0 100644
--- a/gnu/dist/binutils/bfd/elflink.c
+++ b/gnu/dist/binutils/bfd/elflink.c
@@ -7058,15 +7058,17 @@ elf_reloc_link_order (bfd *output_bfd,
irel[i].r_info = 0;
irel[i].r_addend = 0;
}
-#ifdef BFD64
- if (bed->s->arch_size != 32)
+ if (bed->s->arch_size == 32)
+ irel[0].r_info = ELF32_R_INFO (indx, howto->type);
+ else
+#ifdef BFD_HOST_64_BIT
{
- u_int64_t indx64 = indx;
+ bfd_uint64_t indx64 = indx;
irel[0].r_info = ELF64_R_INFO (indx64, howto->type);
}
- else
+#else
+ BFD_FAIL();
#endif
- irel[0].r_info = ELF32_R_INFO (indx, howto->type);
rel_hdr = &elf_section_data (output_section)->rel_hdr;
erel = rel_hdr->contents;