Make elf section sorting more deterministic

At least one test (dwfl-addr-sect) depends on the order of elf sections
with equal addresses. This is not guaranteed by the code. Compare also
by end address and section index to tell entries apart.

Signed-off-by: Ulf Hermann <ulf.hermann@qt.io>
Signed-off-by: Mark Wielaard <mark@klomp.org>
This commit is contained in:
Ulf Hermann
2017-04-20 16:54:26 +02:00
committed by Mark Wielaard
parent e88787f9cd
commit d7e1e08f68
2 changed files with 13 additions and 1 deletions
+6
View File
@@ -1,3 +1,9 @@
2017-04-20 Ulf Hermann <ulf.hermann@qt.io>
Mark Wielaard <mark@klomp.org>
* derelocate.c (compare_secrefs): Compare by end address and then by
section number if addresses are equal.
2017-04-20 Ulf Hermann <ulf.hermann@qt.io>
Mark Wielaard <mark@klomp.org>
+7 -1
View File
@@ -67,7 +67,13 @@ compare_secrefs (const void *a, const void *b)
if ((*p1)->start > (*p2)->start)
return 1;
return 0;
if ((*p1)->end < (*p2)->end)
return -1;
if ((*p1)->end > (*p2)->end)
return 1;
/* Same start/end, then just compare which section came first. */
return elf_ndxscn ((*p1)->scn) - elf_ndxscn ((*p2)->scn);
}
static int