FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARC/BFD: Fix a build error from `index' shadowing a global declaration

Browse source 
bfd/
	* elf32-arc.c (elf_arc_finish_dynamic_symbol): Rename `index' to
	`dynindx'.
This commit is contained in:
Maciej W. Rozycki 2016-01-25 16:06:46 +00:00
parent 5bc5ae8810
commit 840855c5ed
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,3 +1,8 @@
2016-01-25 Maciej W. Rozycki <macro@imgtec.com>
* elf32-arc.c (elf_arc_finish_dynamic_symbol): Rename `index' to
`dynindx'.
2016-01-25 Nick Clifton <nickc@redhat.com> 2016-01-25 Nick Clifton <nickc@redhat.com>
PR target/19435 PR target/19435

10
bfd/elf32-arc.c
View file

@ -2192,10 +2192,10 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd,
BFD_ASSERT (list->type != GOT_TLS_GD BFD_ASSERT (list->type != GOT_TLS_GD
|| list->existing_entries == MOD_AND_OFF); || list->existing_entries == MOD_AND_OFF);
bfd_vma index = h->dynindx == -1 ? 0 : h->dynindx; bfd_vma dynindx = h->dynindx == -1 ? 0 : h->dynindx;
if (e == MOD_AND_OFF || e == MOD) if (e == MOD_AND_OFF || e == MOD)
{ {
ADD_RELA (output_bfd, got, got_offset, index, ADD_RELA (output_bfd, got, got_offset, dynindx,
R_ARC_TLS_DTPMOD, 0); R_ARC_TLS_DTPMOD, 0);
ARC_DEBUG ("arc_info: TLS_DYNRELOC: type = %d, \ ARC_DEBUG ("arc_info: TLS_DYNRELOC: type = %d, \
GOT_OFFSET = 0x%x, GOT_VMA = 0x%x, INDEX = %d, ADDEND = 0x%x\n", GOT_OFFSET = 0x%x, GOT_VMA = 0x%x, INDEX = %d, ADDEND = 0x%x\n",
@ -2203,7 +2203,7 @@ GOT_OFFSET = 0x%x, GOT_VMA = 0x%x, INDEX = %d, ADDEND = 0x%x\n",
got_offset, got_offset,
htab->sgot->output_section->vma htab->sgot->output_section->vma
+ htab->sgot->output_offset + got_offset, + htab->sgot->output_offset + got_offset,
index, 0); dynindx, 0);
} }
if (e == MOD_AND_OFF || e == OFF) if (e == MOD_AND_OFF || e == OFF)
{ {
@ -2214,7 +2214,7 @@ GOT_OFFSET = 0x%x, GOT_VMA = 0x%x, INDEX = %d, ADDEND = 0x%x\n",
ADD_RELA (output_bfd, got, ADD_RELA (output_bfd, got,
got_offset + (e == MOD_AND_OFF ? 4 : 0), got_offset + (e == MOD_AND_OFF ? 4 : 0),
index, dynindx,
(list->type == GOT_TLS_IE ? (list->type == GOT_TLS_IE ?
R_ARC_TLS_TPOFF : R_ARC_TLS_DTPOFF), R_ARC_TLS_TPOFF : R_ARC_TLS_DTPOFF),
addend); addend);
@ -2225,7 +2225,7 @@ GOT_OFFSET = 0x%x, GOT_VMA = 0x%x, INDEX = %d, ADDEND = 0x%x\n",
got_offset, got_offset,
htab->sgot->output_section->vma htab->sgot->output_section->vma
+ htab->sgot->output_offset + got_offset, + htab->sgot->output_offset + got_offset,
index, addend); dynindx, addend);
} }
} }