From 6c3d059477783be3113d2cc54ae34748143f5499 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 10 Oct 2001 19:32:02 +0000 Subject: [PATCH] * elflink.h (elf_link_sort_cmp2): Don't mix PLT and non-PLT relocations against the same symbol in .rel{,a}.dyn section. --- bfd/ChangeLog | 5 +++++ bfd/elflink.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 80ede748a..1d81e717f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2001-10-10 Jakub Jelinek + + * elflink.h (elf_link_sort_cmp2): Don't mix PLT and non-PLT + relocations against the same symbol in .rel{,a}.dyn section. + 2001-10-10 Kazu Hirata * aout-encap.c: Fix comment typos. diff --git a/bfd/elflink.h b/bfd/elflink.h index 19fcea7d2..8a3a4ff20 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -4378,8 +4378,8 @@ elf_link_sort_cmp2 (A, B) return -1; if (a->offset > b->offset) return 1; - copya = a->type == reloc_class_copy; - copyb = b->type == reloc_class_copy; + copya = (a->type == reloc_class_copy) * 2 + (a->type == reloc_class_plt); + copyb = (b->type == reloc_class_copy) * 2 + (b->type == reloc_class_plt); if (copya < copyb) return -1; if (copya > copyb) -- 2.11.4.GIT