espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 04:49:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use signed values for signed relocaitons.

Browse Source
This commit is contained in:
Nick Clifton
1998-12-07 13:23:17 +00:00
parent ae6130f111
commit 8f34fce550
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
1998-12-07 Nick Clifton <nickc@cygnus.com>
* elf32-fr30.c (fr30_final_link_relocate): Using signed
relocations for signed values.
Sun Dec 6 16:30:33 1998 Ian Lance Taylor <ian@cygnus.com> Sun Dec 6 16:30:33 1998 Ian Lance Taylor <ian@cygnus.com>
* mipsbsd.c (MY(set_arch_mach)): Make static. * mipsbsd.c (MY(set_arch_mach)): Make static.

32
bfd/elf32-fr30.c
View File

@ -359,6 +359,7 @@ fr30_final_link_relocate (howto, input_bfd, input_section, contents, rel, reloca
{ {
bfd_reloc_status_type r = bfd_reloc_ok; bfd_reloc_status_type r = bfd_reloc_ok;
bfd_vma x; bfd_vma x;
bfd_signed_vma srel;
switch (howto->type) switch (howto->type)
{ {
@ -383,37 +384,36 @@ fr30_final_link_relocate (howto, input_bfd, input_section, contents, rel, reloca
case R_FR30_9_PCREL: case R_FR30_9_PCREL:
contents += rel->r_offset + 1; contents += rel->r_offset + 1;
relocation += rel->r_addend; relocation += rel->r_addend;
relocation -= (input_section->output_section->vma + srel = (bfd_signed_vma) relocation;
srel -= (input_section->output_section->vma +
input_section->output_offset); input_section->output_offset);
if (relocation & 1) if (srel & 1)
return bfd_reloc_outofrange; return bfd_reloc_outofrange;
if (relocation > ((1 << 8) - 1) || (relocation < - (1 << 8))) if (srel > ((1 << 8) - 1) || (srel < - (1 << 8)))
return bfd_reloc_overflow; return bfd_reloc_overflow;
bfd_put_8 (input_bfd, relocation >> 1, contents); bfd_put_8 (input_bfd, srel >> 1, contents);
break; break;
case R_FR30_12_PCREL: case R_FR30_12_PCREL:
contents += rel->r_offset; contents += rel->r_offset;
relocation += rel->r_addend; relocation += rel->r_addend;
relocation -= (input_section->output_section->vma + srel = (bfd_signed_vma) relocation;
srel -= (input_section->output_section->vma +
input_section->output_offset); input_section->output_offset);
if (relocation & 1) if (srel & 1)
return bfd_reloc_outofrange; return bfd_reloc_outofrange;
if (relocation > ((1 << 11) - 1) || (relocation < - (1 << 11))) if (srel > ((1 << 11) - 1) || (srel < - (1 << 11)))
return bfd_reloc_overflow; return bfd_reloc_overflow;
x = bfd_get_16 (input_bfd, contents); x = bfd_get_16 (input_bfd, contents);
x = (x & 0xf800) | ((relocation >> 1) & 0x7ff); x = (x & 0xf800) | ((srel >> 1) & 0x7ff);
bfd_put_16 (input_bfd, x, contents); bfd_put_16 (input_bfd, x, contents);
break; break;
default: default:
fprintf (stderr, " type: %d offset: %x, before: %x\n",
howto->type, rel->r_offset, bfd_get_32 (input_bfd, contents + rel->r_offset));
r = _bfd_final_link_relocate (howto, input_bfd, input_section, r = _bfd_final_link_relocate (howto, input_bfd, input_section,
contents, rel->r_offset, contents, rel->r_offset,
relocation, rel->r_addend); relocation, rel->r_addend);
@ -477,8 +477,6 @@ fr30_elf_relocate_section (output_bfd, info, input_bfd, input_section,
sym_hashes = elf_sym_hashes (input_bfd); sym_hashes = elf_sym_hashes (input_bfd);
relend = relocs + input_section->reloc_count; relend = relocs + input_section->reloc_count;
fprintf (stderr, "Relocate section: %s\n", bfd_section_name (input_bfd, input_section));
for (rel = relocs; rel < relend; rel ++) for (rel = relocs; rel < relend; rel ++)
{ {
reloc_howto_type * howto; reloc_howto_type * howto;
@ -529,7 +527,7 @@ fprintf (stderr, "Relocate section: %s\n", bfd_section_name (input_bfd, input_se
name = bfd_elf_string_from_elf_section name = bfd_elf_string_from_elf_section
(input_bfd, symtab_hdr->sh_link, sym->st_name); (input_bfd, symtab_hdr->sh_link, sym->st_name);
name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name; name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
#if 1 #if 0
fprintf (stderr, "local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x\n", fprintf (stderr, "local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x\n",
sec->name, name, sym->st_name, sec->name, name, sym->st_name,
sec->output_section->vma, sec->output_offset, sec->output_section->vma, sec->output_offset,
@ -553,7 +551,7 @@ fprintf (stderr, "Relocate section: %s\n", bfd_section_name (input_bfd, input_se
relocation = (h->root.u.def.value relocation = (h->root.u.def.value
+ sec->output_section->vma + sec->output_section->vma
+ sec->output_offset); + sec->output_offset);
#if 1 #if 0
fprintf (stderr, fprintf (stderr,
"defined: sec: %s, name: %s, value: %x + %x + %x gives: %x\n", "defined: sec: %s, name: %s, value: %x + %x + %x gives: %x\n",
sec->name, name, h->root.u.def.value, sec->name, name, h->root.u.def.value,
@ -562,7 +560,7 @@ fprintf (stderr, "Relocate section: %s\n", bfd_section_name (input_bfd, input_se
} }
else if (h->root.type == bfd_link_hash_undefweak) else if (h->root.type == bfd_link_hash_undefweak)
{ {
#if 1 #if 0
fprintf (stderr, "undefined: sec: %s, name: %s\n", fprintf (stderr, "undefined: sec: %s, name: %s\n",
sec->name, name); sec->name, name);
#endif #endif
@ -574,7 +572,7 @@ fprintf (stderr, "Relocate section: %s\n", bfd_section_name (input_bfd, input_se
(info, h->root.root.string, input_bfd, (info, h->root.root.string, input_bfd,
input_section, rel->r_offset))) input_section, rel->r_offset)))
return false; return false;
#if 1 #if 0
fprintf (stderr, "unknown: name: %s\n", name); fprintf (stderr, "unknown: name: %s\n", name);
#endif #endif
relocation = 0; relocation = 0;