diff options
| author | Ian Lance Taylor <iant@google.com> | 2006-11-29 17:56:40 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@google.com> | 2006-11-29 17:56:40 +0000 |
| commit | a3ad94edd406b9abc26493761764d4034dda69fa (patch) | |
| tree | 96485e8bba91a4aa51f34b0d3738ef3e7ddcbac3 /gold/target-reloc.h | |
| parent | e1da3f5b9645750e966e471ff0db480d6450dcb7 (diff) | |
| download | binutils-gdb-a3ad94edd406b9abc26493761764d4034dda69fa.tar.gz | |
Hash tables, dynamic section, i386 PLT, gold_assert.
Diffstat (limited to 'gold/target-reloc.h')
| -rw-r--r-- | gold/target-reloc.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gold/target-reloc.h b/gold/target-reloc.h index 5b057ac0fb8..727de02e4e8 100644 --- a/gold/target-reloc.h +++ b/gold/target-reloc.h @@ -26,6 +26,7 @@ scan_relocs( Layout* layout, Target_type* target, Sized_relobj<size, big_endian>* object, + unsigned int data_shndx, const unsigned char* prelocs, size_t reloc_count, size_t local_count, @@ -47,7 +48,7 @@ scan_relocs( if (r_sym < local_count) { - assert(plocal_syms != NULL); + gold_assert(plocal_syms != NULL); typename elfcpp::Sym<size, big_endian> lsym(plocal_syms + r_sym * sym_size); const unsigned int shndx = lsym.get_st_shndx(); @@ -73,18 +74,18 @@ scan_relocs( continue; } - scan.local(options, symtab, layout, target, object, reloc, r_type, - lsym); + scan.local(options, symtab, layout, target, object, data_shndx, + reloc, r_type, lsym); } else { Symbol* gsym = global_syms[r_sym - local_count]; - assert(gsym != NULL); + gold_assert(gsym != NULL); if (gsym->is_forwarder()) gsym = symtab->resolve_forwards(gsym); - scan.global(options, symtab, layout, target, object, reloc, r_type, - gsym); + scan.global(options, symtab, layout, target, object, data_shndx, + reloc, r_type, gsym); } } } @@ -146,7 +147,7 @@ relocate_section( else { const Symbol* gsym = global_syms[r_sym - local_count]; - assert(gsym != NULL); + gold_assert(gsym != NULL); if (gsym->is_forwarder()) gsym = relinfo->symtab->resolve_forwards(gsym); |