From cfc9dfb12363672b07c883a07a752e188d84a7b8 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 5 Jul 2006 10:21:39 +0000 Subject: [PATCH] PR ld/2659 * cofflink.c (_bfd_coff_link_input_bfd): Fix selection of aux entry when multiple definitions of a symbol are encountered. --- bfd/ChangeLog | 6 ++++++ bfd/cofflink.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 760e5d4a8b3..55b13326fbf 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2006-07-05 Nick Clifton + + PR ld/2659 + * cofflink.c (_bfd_coff_link_input_bfd): Fix selection of aux + entry when multiple definitions of a symbol are encountered. + 2006-06-30 H.J. Lu * elf32-i386.c (elf_i386_relocate_section): Use xchg %ax,%ax diff --git a/bfd/cofflink.c b/bfd/cofflink.c index c17701c16e8..40f5a700929 100644 --- a/bfd/cofflink.c +++ b/bfd/cofflink.c @@ -1921,6 +1921,7 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *finfo, bfd *input_bfd) generate two symbols with the same name, but only one will have aux entries. */ BFD_ASSERT (isymp->n_numaux == 0 + || h->numaux == 0 || h->numaux == isymp->n_numaux); } @@ -1936,7 +1937,7 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *finfo, bfd *input_bfd) union internal_auxent aux; union internal_auxent *auxp; - if (h != NULL) + if (h != NULL && h->aux != NULL && (h->numaux > i)) auxp = h->aux + i; else { -- 2.30.2