From: Cary Coutant <ccoutant@google.com>
Date: Wed, 11 May 2011 00:29:57 +0000 (+0000)
Subject: 	* object.cc (Sized_relobj::do_count_local_symbols): Check for
X-Git-Tag: sid-snapshot-20110601~242
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=403676b5704d576dfc3a663e4d55d6525053ce3f;p=external%2Fbinutils.git

	* object.cc (Sized_relobj::do_count_local_symbols): Check for
	strip_all (-s).
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index f198b80..ec9abb3 100644
--- 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 b1fc25c..a39a37c 100644
--- 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;