From 4d35a0aa887f736f2c349a3f20006c8f5d773452 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 23 May 2006 01:36:07 +0000 Subject: [PATCH] * elf64-ppc.c (compare_symbols): Prefer strong dynamic global function syms over other syms. --- bfd/ChangeLog | 5 +++++ bfd/elf64-ppc.c | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 76e740c8476..b308c88a4e1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2006-05-23 Alan Modra + + * elf64-ppc.c (compare_symbols): Prefer strong dynamic global + function syms over other syms. + 2006-05-22 Daniel Jacobowitz * elflink.c (_bfd_elf_add_dynamic_entry): Remove DT_TEXTREL diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 1697d532e98..b1ec94230a5 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -2626,6 +2626,32 @@ compare_symbols (const void *ap, const void *bp) if (a->value + a->section->vma > b->value + b->section->vma) return 1; + /* For syms with the same value, prefer strong dynamic global function + syms over other syms. */ + if ((a->flags & BSF_GLOBAL) != 0 && (b->flags & BSF_GLOBAL) == 0) + return -1; + + if ((a->flags & BSF_GLOBAL) == 0 && (b->flags & BSF_GLOBAL) != 0) + return 1; + + if ((a->flags & BSF_FUNCTION) != 0 && (b->flags & BSF_FUNCTION) == 0) + return -1; + + if ((a->flags & BSF_FUNCTION) == 0 && (b->flags & BSF_FUNCTION) != 0) + return 1; + + if ((a->flags & BSF_WEAK) == 0 && (b->flags & BSF_WEAK) != 0) + return -1; + + if ((a->flags & BSF_WEAK) != 0 && (b->flags & BSF_WEAK) == 0) + return 1; + + if ((a->flags & BSF_DYNAMIC) != 0 && (b->flags & BSF_DYNAMIC) == 0) + return -1; + + if ((a->flags & BSF_DYNAMIC) == 0 && (b->flags & BSF_DYNAMIC) != 0) + return 1; + return 0; } -- 2.30.2