aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
authorChris Demetriou <cgd@google.com>2008-07-23 16:19:59 +0000
committerChris Demetriou <cgd@google.com>2008-07-23 16:19:59 +0000
commit58e54ac21d936303bd34112d12b5ac5690df8b2e (patch)
tree0963d474e46b3b79ae218c9f17fc75d5010e113a /gold
parent * symtab.cc (Symbol_table::resolve): Remove version parameter. (diff)
downloadbinutils-gdb-58e54ac21d936303bd34112d12b5ac5690df8b2e.tar.gz
binutils-gdb-58e54ac21d936303bd34112d12b5ac5690df8b2e.tar.bz2
binutils-gdb-58e54ac21d936303bd34112d12b5ac5690df8b2e.zip
2008-07-23 Simon Baldwin <simonb@google.com>
* symtab.cc (Symbol_table::sized_write_symbol): Only set st_size to zero for undefined symbols from dynamic libraries.
Diffstat (limited to 'gold')
-rw-r--r--gold/ChangeLog5
-rw-r--r--gold/symtab.cc7
2 files changed, 10 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 8693c76f4a6..cb28b253562 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-23 Simon Baldwin <simonb@google.com>
+
+ * symtab.cc (Symbol_table::sized_write_symbol): Only set st_size
+ to zero for undefined symbols from dynamic libraries.
+
2008-07-23 Ian Lance Taylor <iant@google.com>
* symtab.cc (Symbol_table::resolve): Remove version parameter.
diff --git a/gold/symtab.cc b/gold/symtab.cc
index e3b0d9d0354..259004ee590 100644
--- a/gold/symtab.cc
+++ b/gold/symtab.cc
@@ -2354,8 +2354,11 @@ Symbol_table::sized_write_symbol(
elfcpp::Sym_write<size, big_endian> osym(p);
osym.put_st_name(pool->get_offset(sym->name()));
osym.put_st_value(value);
- // Use a symbol size of zero for undefined symbols.
- osym.put_st_size(shndx == elfcpp::SHN_UNDEF ? 0 : sym->symsize());
+ // Use a symbol size of zero for undefined symbols from shared libraries.
+ if (shndx == elfcpp::SHN_UNDEF && sym->is_from_dynobj())
+ osym.put_st_size(0);
+ else
+ osym.put_st_size(sym->symsize());
// A version script may have overridden the default binding.
if (sym->is_forced_local())
osym.put_st_info(elfcpp::elf_st_info(elfcpp::STB_LOCAL, sym->type()));