From bf4b4662b33e136b27b7e9020f6b45de85d90494 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Mon, 15 May 2017 15:59:52 -0700 Subject: 2017-06-21 Eric Christopher Apply from master 2017-05-15 Eric Christopher * layout.cc (Layout::segment_precedes): Add a case for testing pointer equality when determining which segment precedes another. --- gold/ChangeLog | 9 +++++++++ gold/layout.cc | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/gold/ChangeLog b/gold/ChangeLog index 98adcbb..4323d78 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,12 @@ +2017-06-21 Eric Christopher + + Apply from master + 2017-05-15 Eric Christopher + + * layout.cc (Layout::segment_precedes): Add a case for testing + pointer equality when determining which segment precedes + another. + 2017-06-20 James Clarke * powerpc.cc (Stub_table::define_stub_syms): Always include object's diff --git a/gold/layout.cc b/gold/layout.cc index 07a3590..bb13d71 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -3300,6 +3300,11 @@ bool Layout::segment_precedes(const Output_segment* seg1, const Output_segment* seg2) { + // In order to produce a stable ordering if we're called with the same pointer + // return false. + if (seg1 == seg2) + return false; + elfcpp::Elf_Word type1 = seg1->type(); elfcpp::Elf_Word type2 = seg2->type(); -- cgit v1.1