espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-28 15:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

* elf.c (swap_out_syms): New arg relocatable_p.

Browse Source 
Don't add section VMA to symbols for relocatable output.
	(_bfd_elf_compute_section_file_positions): Update call to
	swap_out_syms.
This commit is contained in:
Doug Evans
1998-06-12 20:37:40 +00:00
parent 199cb74149
commit 37fcafe682
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
Fri Jun 12 13:34:02 1998 Doug Evans <devans@canuck.cygnus.com>
* elf.c (swap_out_syms): New arg relocatable_p.
Don't add section VMA to symbols for relocatable output.
(_bfd_elf_compute_section_file_positions): Update call to
swap_out_syms.
Mon Jun 8 15:20:57 1998 Nick Clifton <nickc@cygnus.com> Mon Jun 8 15:20:57 1998 Nick Clifton <nickc@cygnus.com>
* elf32-v850.c (v850_elf_perform_relocation): Make comparisons * elf32-v850.c (v850_elf_perform_relocation): Make comparisons

14
bfd/elf.c
View File

@ -45,7 +45,7 @@ static int elf_sort_sections PARAMS ((const PTR, const PTR));
static boolean assign_file_positions_for_segments PARAMS ((bfd *)); static boolean assign_file_positions_for_segments PARAMS ((bfd *));
static boolean assign_file_positions_except_relocs PARAMS ((bfd *)); static boolean assign_file_positions_except_relocs PARAMS ((bfd *));
static boolean prep_headers PARAMS ((bfd *)); static boolean prep_headers PARAMS ((bfd *));
static boolean swap_out_syms PARAMS ((bfd *, struct bfd_strtab_hash **)); static boolean swap_out_syms PARAMS ((bfd *, struct bfd_strtab_hash **, int));
static boolean copy_private_bfd_data PARAMS ((bfd *, bfd *)); static boolean copy_private_bfd_data PARAMS ((bfd *, bfd *));
static char *elf_read PARAMS ((bfd *, long, unsigned int)); static char *elf_read PARAMS ((bfd *, long, unsigned int));
static void elf_fake_sections PARAMS ((bfd *, asection *, PTR)); static void elf_fake_sections PARAMS ((bfd *, asection *, PTR));
@ -1982,7 +1982,10 @@ _bfd_elf_compute_section_file_positions (abfd, link_info)
/* The backend linker builds symbol table information itself. */ /* The backend linker builds symbol table information itself. */
if (link_info == NULL && abfd->symcount > 0) if (link_info == NULL && abfd->symcount > 0)
{ {
if (! swap_out_syms (abfd, &strtab)) /* Non-zero if doing a relocatable link. */
int relocatable_p = ! (abfd->flags & (EXEC_P | DYNAMIC));
if (! swap_out_syms (abfd, &strtab, relocatable_p))
return false; return false;
} }
@ -3506,9 +3509,10 @@ _bfd_elf_copy_private_symbol_data (ibfd, isymarg, obfd, osymarg)
/* Swap out the symbols. */ /* Swap out the symbols. */
static boolean static boolean
swap_out_syms (abfd, sttp) swap_out_syms (abfd, sttp, relocatable_p)
bfd *abfd; bfd *abfd;
struct bfd_strtab_hash **sttp; struct bfd_strtab_hash **sttp;
int relocatable_p;
{ {
struct elf_backend_data *bed = get_elf_backend_data (abfd); struct elf_backend_data *bed = get_elf_backend_data (abfd);
@ -3604,7 +3608,9 @@ swap_out_syms (abfd, sttp)
value += sec->output_offset; value += sec->output_offset;
sec = sec->output_section; sec = sec->output_section;
} }
value += sec->vma; /* Don't add in the section vma for relocatable output. */
if (! relocatable_p)
value += sec->vma;
sym.st_value = value; sym.st_value = value;
sym.st_size = type_ptr ? type_ptr->internal_elf_sym.st_size : 0; sym.st_size = type_ptr ? type_ptr->internal_elf_sym.st_size : 0;