espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-21 02:24:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix building the bfd/elf32-msp430.c file on a 32-bit host.

Browse Source 
* elf32-msp430.c (msp430_final_link_relocate): Always use longs
	for addresses in print statements.
	(msp430_elf_relax_delete_bytes): Likewise.
	(msp430_elf_relax_add_words): Likewise.
	(msp430_elf_relax_section): Likewise.
This commit is contained in:
Nick Clifton
2020-02-11 12:38:41 +00:00
parent 1d07a805c8
commit c675ec1e76
2 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,3 +1,11 @@
2020-02-11 Nick Clifton <nickc@redhat.com>
* elf32-msp430.c (msp430_final_link_relocate): Always use longs
for addresses in print statements.
(msp430_elf_relax_delete_bytes): Likewise.
(msp430_elf_relax_add_words): Likewise.
(msp430_elf_relax_section): Likewise.
2020-02-11 H.J. Lu <hongjiu.lu@intel.com> 2020-02-11 H.J. Lu <hongjiu.lu@intel.com>
* plugin.c (add_symbols): Clear plugin_data memory. * plugin.c (add_symbols): Clear plugin_data memory.

46
bfd/elf32-msp430.c
View File

@ -746,8 +746,8 @@ msp430_final_link_relocate (reloc_howto_type * howto,
if (debug_relocs) if (debug_relocs)
printf ("writing relocation (%p) at 0x%lx type: %d\n", rel, printf ("writing relocation (%p) at 0x%lx type: %d\n", rel,
input_section->output_section->vma + input_section->output_offset (long) (input_section->output_section->vma + input_section->output_offset
+ rel->r_offset, howto->type); + rel->r_offset), howto->type);
if (sym_diff_section != NULL) if (sym_diff_section != NULL)
{ {
BFD_ASSERT (sym_diff_section == input_section); BFD_ASSERT (sym_diff_section == input_section);
@ -1671,7 +1671,7 @@ msp430_elf_relax_delete_bytes (bfd * abfd, asection * sec, bfd_vma addr,
toaddr = sec->size; toaddr = sec->size;
if (debug_relocs) if (debug_relocs)
printf (" deleting %d bytes between 0x%lx to 0x%lx\n", printf (" deleting %d bytes between 0x%lx to 0x%lx\n",
count, addr, toaddr); count, (long) addr, (long) toaddr);
irel = elf_section_data (sec)->relocs; irel = elf_section_data (sec)->relocs;
irelend = irel + sec->reloc_count; irelend = irel + sec->reloc_count;
@ -1721,13 +1721,13 @@ msp430_elf_relax_delete_bytes (bfd * abfd, asection * sec, bfd_vma addr,
{ {
if (debug_relocs) if (debug_relocs)
printf (" adjusting value of local symbol %s from 0x%lx ", printf (" adjusting value of local symbol %s from 0x%lx ",
name, isym->st_value); name, (long) isym->st_value);
if (isym->st_value < addr + count) if (isym->st_value < addr + count)
isym->st_value = addr; isym->st_value = addr;
else else
isym->st_value -= count; isym->st_value -= count;
if (debug_relocs) if (debug_relocs)
printf ("to 0x%lx\n", isym->st_value); printf ("to 0x%lx\n", (long) isym->st_value);
} }
/* Adjust the function symbol's size as well. */ /* Adjust the function symbol's size as well. */
else if (ELF_ST_TYPE (isym->st_info) == STT_FUNC else if (ELF_ST_TYPE (isym->st_info) == STT_FUNC
@ -1788,7 +1788,7 @@ msp430_elf_relax_add_words (bfd * abfd, asection * sec, bfd_vma addr,
asection *p; asection *p;
if (debug_relocs) if (debug_relocs)
printf (" adding %d words at 0x%lx\n", num_words, printf (" adding %d words at 0x%lx\n", num_words,
sec->output_section->vma + sec->output_offset + addr); (long) (sec->output_section->vma + sec->output_offset + addr));
contents = elf_section_data (sec)->this_hdr.contents; contents = elf_section_data (sec)->this_hdr.contents;
sec_end = sec->size; sec_end = sec->size;
@ -1832,7 +1832,7 @@ msp430_elf_relax_add_words (bfd * abfd, asection * sec, bfd_vma addr,
printf (" adjusting value of local symbol %s from 0x%lx to " printf (" adjusting value of local symbol %s from 0x%lx to "
"0x%lx\n", bfd_elf_string_from_elf_section "0x%lx\n", bfd_elf_string_from_elf_section
(abfd, symtab_hdr->sh_link, isym->st_name), (abfd, symtab_hdr->sh_link, isym->st_name),
isym->st_value, isym->st_value + num_bytes); (long) isym->st_value, (long)(isym->st_value + num_bytes));
isym->st_value += num_bytes; isym->st_value += num_bytes;
} }
@ -1881,7 +1881,7 @@ msp430_elf_relax_section (bfd * abfd, asection * sec,
if (debug_relocs) if (debug_relocs)
printf ("Relaxing %s (%p), output_offset: 0x%lx sec size: 0x%lx\n", printf ("Relaxing %s (%p), output_offset: 0x%lx sec size: 0x%lx\n",
sec->name, sec, sec->output_offset, sec->size); sec->name, sec, (long) sec->output_offset, (long) sec->size);
symtab_hdr = & elf_tdata (abfd)->symtab_hdr; symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
@ -1955,11 +1955,12 @@ msp430_elf_relax_section (bfd * abfd, asection * sec,
if (debug_relocs) if (debug_relocs)
printf (" processing reloc at 0x%lx for local sym: %s " printf (" processing reloc at 0x%lx for local sym: %s "
"st_value: 0x%lx adj value: 0x%lx\n", sec->output_offset "st_value: 0x%lx adj value: 0x%lx\n",
+ sec->output_section->vma + irel->r_offset, (long) (sec->output_offset + sec->output_section->vma
+ irel->r_offset),
bfd_elf_string_from_elf_section (abfd, symtab_hdr->sh_link, bfd_elf_string_from_elf_section (abfd, symtab_hdr->sh_link,
isym->st_name), isym->st_name),
isym->st_value, symval); (long) isym->st_value, (long) symval);
} }
else else
{ {
@ -1983,9 +1984,11 @@ msp430_elf_relax_section (bfd * abfd, asection * sec,
+ h->root.u.def.section->output_offset); + h->root.u.def.section->output_offset);
if (debug_relocs) if (debug_relocs)
printf (" processing reloc at 0x%lx for global sym: %s " printf (" processing reloc at 0x%lx for global sym: %s "
"st_value: 0x%lx adj value: 0x%lx\n", sec->output_offset "st_value: 0x%lx adj value: 0x%lx\n",
+ sec->output_section->vma + irel->r_offset, (long) (sec->output_offset + sec->output_section->vma
h->root.root.string, h->root.u.def.value, symval); + irel->r_offset),
h->root.root.string, (long) h->root.u.def.value,
(long) symval);
} }
/* For simplicity of coding, we are going to modify the section /* For simplicity of coding, we are going to modify the section
@ -2176,11 +2179,12 @@ msp430_elf_relax_section (bfd * abfd, asection * sec,
if (debug_relocs) if (debug_relocs)
printf (" processing reloc at 0x%lx for local sym: %s " printf (" processing reloc at 0x%lx for local sym: %s "
"st_value: 0x%lx adj value: 0x%lx\n", sec->output_offset "st_value: 0x%lx adj value: 0x%lx\n",
+ sec->output_section->vma + irel->r_offset, (long) (sec->output_offset + sec->output_section->vma
+ irel->r_offset),
bfd_elf_string_from_elf_section bfd_elf_string_from_elf_section
(abfd, symtab_hdr->sh_link, isym->st_name), (abfd, symtab_hdr->sh_link, isym->st_name),
isym->st_value, symval); (long) isym->st_value, (long) symval);
} }
else else
{ {
@ -2204,9 +2208,11 @@ msp430_elf_relax_section (bfd * abfd, asection * sec,
+ h->root.u.def.section->output_offset); + h->root.u.def.section->output_offset);
if (debug_relocs) if (debug_relocs)
printf (" processing reloc at 0x%lx for global sym: %s " printf (" processing reloc at 0x%lx for global sym: %s "
"st_value: 0x%lx adj value: 0x%lx\n", sec->output_offset "st_value: 0x%lx adj value: 0x%lx\n", (long)
+ sec->output_section->vma + irel->r_offset, (sec->output_offset + sec->output_section->vma
h->root.root.string, h->root.u.def.value, symval); + irel->r_offset),
h->root.root.string, (long) h->root.u.def.value,
(long) symval);
} }
/* For simplicity of coding, we are going to modify the section /* For simplicity of coding, we are going to modify the section