From 0c38a3d1942067100580e9673bcf0cbe27f3d6e8 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Mon, 15 May 2017 15:59:52 -0700 Subject: [PATCH] 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 | 6 ++++++ gold/layout.cc | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/gold/ChangeLog b/gold/ChangeLog index 0f1f4e54f2c..42bd6c30c1f 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2017-05-15 Eric Christopher + + * layout.cc (Layout::segment_precedes): Add a case for testing + pointer equality when determining which segment precedes + another. + 2017-05-13 James Clarke PR gold/21444 diff --git a/gold/layout.cc b/gold/layout.cc index 07a359074e0..bb13d7136e5 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(); -- 2.30.2