aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gold/ChangeLog4
-rw-r--r--gold/common.cc11
2 files changed, 5 insertions, 10 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 9eb928d..6e04f6e 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-12 Cary Coutant <ccoutant@google.com>
+
+ * common.cc (Sort_commons::operator()): Remove unnecessary code.
+
2010-08-13 Ian Lance Taylor <iant@google.com>
* testsuite/incremental_test_1.c: Add prototype to avoid warning.
diff --git a/gold/common.cc b/gold/common.cc
index d5046e5..8d122fa 100644
--- a/gold/common.cc
+++ b/gold/common.cc
@@ -88,16 +88,7 @@ bool
Sort_commons<size>::operator()(const Symbol* pa, const Symbol* pb) const
{
if (pa == NULL)
- {
- if (pb == NULL)
- {
- // Stabilize sort. The order really doesn't matter, because
- // these entries will be discarded, but we want to return
- // the same result every time we compare pa and pb.
- return pa < pb;
- }
- return false;
- }
+ return false;
if (pb == NULL)
return true;