* object.cc (Sized_relobj::do_count_local_symbols): Check for

	strip_all (-s).

diff --git a/gold/ChangeLog b/gold/ChangeLog
index f198b806cd9406f0807230529f86ab585ba8898b..ec9abb33ed2b990bb654eb3d37e4a5336d5bf957 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-10 Cary Coutant  <ccoutant@google.com>
+
+       * object.cc (Sized_relobj::do_count_local_symbols): Check for
+       strip_all (-s).
+
 2011-05-06  Ian Lance Taylor  <iant@google.com>
 
        * layout.cc (Layout::layout): If the output section flags change,

diff --git a/gold/object.cc b/gold/object.cc
index b1fc25cedcdcd5f7a31e7a2986002478f406970f..a39a37c9a4f190d8cc7f6dd1ebddefc6fa6ab10c 100644 (file)
--- a/gold/object.cc
+++ b/gold/object.cc
@@ -1824,6 +1824,7 @@ Sized_relobj<size, big_endian>::do_count_local_symbols(Stringpool* pool,
   unsigned int dyncount = 0;
   // Skip the first, dummy, symbol.
   psyms += sym_size;
+  bool strip_all = parameters->options().strip_all();
   bool discard_all = parameters->options().discard_all();
   bool discard_locals = parameters->options().discard_locals();
   for (unsigned int i = 1; i < loccount; ++i, psyms += sym_size)
@@ -1882,7 +1883,8 @@ Sized_relobj<size, big_endian>::do_count_local_symbols(Stringpool* pool,
           ++dyncount;
         }
 
-      if (discard_all && lv.may_be_discarded_from_output_symtab())
+      if (strip_all
+         || (discard_all && lv.may_be_discarded_from_output_symtab()))
        {
          lv.set_no_output_symtab_entry();
          continue;