Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another conflict I didn't properly resolve.

Browse Source
This commit is contained in:
skrll 2006-02-02 22:42:50 +00:00
parent 7d0a5c3025
commit ad3568f537
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/dist/binutils/bfd/elflink.c vendored
View File

@ -7526,12 +7526,12 @@ elf_reloc_link_order (bfd *output_bfd,
irel[0].r_info = ELF32_R_INFO (indx, howto->type); irel[0].r_info = ELF32_R_INFO (indx, howto->type);
else else
#ifdef BFD64 #ifdef BFD64
{ {
bfd_uint64_t indx64 = indx; bfd_uint64_t indx64 = indx;
irel[0].r_info = ELF64_R_INFO (indx64, howto->type); irel[0].r_info = ELF64_R_INFO (indx64, howto->type);
} }
#else #else
BFD_FAIL(); BFD_FAIL();
#endif #endif
rel_hdr = &elf_section_data (output_section)->rel_hdr; rel_hdr = &elf_section_data (output_section)->rel_hdr;