X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=ld%2Fldctor.c;h=881ca258cbc2d403eeaa1da2c70ee858da5adead;hb=610cfd618e4ea43a106d2b24ae4fe52af72de1f5;hp=28e5ddb1f0b5ad5c4ea9e1494791b3e1d42b3d43;hpb=bde18da45e5dea021d600aadeab702a6f7e31cb2;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/ldctor.c b/ld/ldctor.c index 28e5ddb1f0..881ca258cb 100644 --- a/ld/ldctor.c +++ b/ld/ldctor.c @@ -1,7 +1,5 @@ /* ldctor.c -- constructor support routines - Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2006, 2007, 2008, 2009 - Free Software Foundation, Inc. + Copyright (C) 1991-2019 Free Software Foundation, Inc. By Steve Chamberlain This file is part of the GNU Binutils. @@ -25,6 +23,7 @@ #include "bfd.h" #include "bfdlink.h" #include "safe-ctype.h" +#include "ctf-api.h" #include "ld.h" #include "ldexp.h" @@ -70,7 +69,7 @@ ldctor_add_set_entry (struct bfd_link_hash_entry *h, if (p == NULL) { - p = xmalloc (sizeof (struct set_info)); + p = (struct set_info *) xmalloc (sizeof (struct set_info)); p->next = sets; sets = p; p->h = h; @@ -82,37 +81,37 @@ ldctor_add_set_entry (struct bfd_link_hash_entry *h, { if (p->reloc != reloc) { - einfo (_("%P%X: Different relocs used in set %s\n"), + einfo (_("%X%P: different relocs used in set %s\n"), h->root.string); return; } /* Don't permit a set to be constructed from different object - file formats. The same reloc may have different results. We - actually could sometimes handle this, but the case is - unlikely to ever arise. Sometimes constructor symbols are in - unusual sections, such as the absolute section--this appears - to be the case in Linux a.out--and in such cases we just - assume everything is OK. */ + file formats. The same reloc may have different results. We + actually could sometimes handle this, but the case is + unlikely to ever arise. Sometimes constructor symbols are in + unusual sections, such as the absolute section--this appears + to be the case in Linux a.out--and in such cases we just + assume everything is OK. */ if (p->elements != NULL && section->owner != NULL && p->elements->section->owner != NULL && strcmp (bfd_get_target (section->owner), bfd_get_target (p->elements->section->owner)) != 0) { - einfo (_("%P%X: Different object file formats composing set %s\n"), + einfo (_("%X%P: different object file formats composing set %s\n"), h->root.string); return; } } - e = xmalloc (sizeof (struct set_element)); - e->next = NULL; + e = (struct set_element *) xmalloc (sizeof (struct set_element)); + e->u.next = NULL; e->name = name; e->section = section; e->value = value; - for (epp = &p->elements; *epp != NULL; epp = &(*epp)->next) + for (epp = &p->elements; *epp != NULL; epp = &(*epp)->u.next) ; *epp = e; @@ -132,7 +131,7 @@ ctor_prio (const char *name) while (*name == '_') ++name; - if (! CONST_STRNEQ (name, "GLOBAL_")) + if (!CONST_STRNEQ (name, "GLOBAL_")) return -1; name += sizeof "GLOBAL_" - 1; @@ -141,7 +140,7 @@ ctor_prio (const char *name) return -1; if (name[1] != 'I' && name[1] != 'D') return -1; - if (! ISDIGIT (name[3])) + if (!ISDIGIT (name[3])) return -1; return atoi (name + 3); @@ -153,17 +152,17 @@ ctor_prio (const char *name) static int ctor_cmp (const void *p1, const void *p2) { - const struct set_element * const *pe1 = p1; - const struct set_element * const *pe2 = p2; + const struct set_element *pe1 = *(const struct set_element **) p1; + const struct set_element *pe2 = *(const struct set_element **) p2; const char *n1; const char *n2; int prio1; int prio2; - n1 = (*pe1)->name; + n1 = pe1->name; if (n1 == NULL) n1 = ""; - n2 = (*pe2)->name; + n2 = pe2->name; if (n2 == NULL) n2 = ""; @@ -177,17 +176,15 @@ ctor_cmp (const void *p1, const void *p2) /* We sort in reverse order because that is what g++ expects. */ if (prio1 < prio2) return 1; - else if (prio1 > prio2) + if (prio1 > prio2) return -1; /* Force a stable sort. */ - - if (pe1 < pe2) + if (pe1->u.idx < pe2->u.idx) return -1; - else if (pe1 > pe2) + if (pe1->u.idx > pe2->u.idx) return 1; - else - return 0; + return 0; } /* This function is called after the first phase of the link and @@ -213,22 +210,24 @@ ldctor_build_sets (void) for (p = sets; p != NULL; p = p->next) { int c, i; - struct set_element *e; + struct set_element *e, *enext; struct set_element **array; if (p->elements == NULL) continue; c = 0; - for (e = p->elements; e != NULL; e = e->next) + for (e = p->elements; e != NULL; e = e->u.next) ++c; - array = xmalloc (c * sizeof *array); + array = (struct set_element **) xmalloc (c * sizeof *array); i = 0; - for (e = p->elements; e != NULL; e = e->next) + for (e = p->elements; e != NULL; e = enext) { array[i] = e; + enext = e->u.next; + e->u.idx = i; ++i; } @@ -237,8 +236,8 @@ ldctor_build_sets (void) e = array[0]; p->elements = e; for (i = 0; i < c - 1; i++) - array[i]->next = array[i + 1]; - array[i]->next = NULL; + array[i]->u.next = array[i + 1]; + array[i]->u.next = NULL; free (array); } @@ -274,9 +273,9 @@ ldctor_build_sets (void) howto = bfd_reloc_type_lookup (link_info.output_bfd, p->reloc); if (howto == NULL) { - if (link_info.relocatable) + if (bfd_link_relocatable (&link_info)) { - einfo (_("%P%X: %s does not support reloc %s for set %s\n"), + einfo (_("%X%P: %s does not support reloc %s for set %s\n"), bfd_get_target (link_info.output_bfd), bfd_get_reloc_code_name (p->reloc), p->h->root.string); @@ -290,10 +289,17 @@ ldctor_build_sets (void) p->reloc); if (howto == NULL) { - einfo (_("%P%X: %s does not support reloc %s for set %s\n"), - bfd_get_target (p->elements->section->owner), - bfd_get_reloc_code_name (p->reloc), - p->h->root.string); + /* See PR 20911 for a reproducer. */ + if (p->elements->section->owner == NULL) + einfo (_("%X%P: special section %s does not support reloc %s for set %s\n"), + bfd_section_name (p->elements->section), + bfd_get_reloc_code_name (p->reloc), + p->h->root.string); + else + einfo (_("%X%P: %s does not support reloc %s for set %s\n"), + bfd_get_target (p->elements->section->owner), + bfd_get_reloc_code_name (p->reloc), + p->h->root.string); continue; } } @@ -311,26 +317,28 @@ ldctor_build_sets (void) size = QUAD; break; default: - einfo (_("%P%X: Unsupported size %d for set %s\n"), + einfo (_("%X%P: unsupported size %d for set %s\n"), bfd_get_reloc_size (howto), p->h->root.string); size = LONG; break; } - lang_add_assignment (exp_assop ('=', ".", - exp_unop (ALIGN_K, - exp_intop (reloc_size)))); - lang_add_assignment (exp_assop ('=', p->h->root.string, - exp_nameop (NAME, "."))); + lang_add_assignment (exp_assign (".", + exp_unop (ALIGN_K, + exp_intop (reloc_size)), + FALSE)); + lang_add_assignment (exp_assign (p->h->root.string, + exp_nameop (NAME, "."), + FALSE)); lang_add_data (size, exp_intop (p->count)); - for (e = p->elements; e != NULL; e = e->next) + for (e = p->elements; e != NULL; e = e->u.next) { if (config.map_file != NULL) { int len; - if (! header_printed) + if (!header_printed) { minfo (_("\nSet Symbol\n\n")); header_printed = TRUE; @@ -351,16 +359,16 @@ ldctor_build_sets (void) } if (e->name != NULL) - minfo ("%T\n", e->name); + minfo ("%pT\n", e->name); else minfo ("%G\n", e->section->owner, e->section, e->value); } /* Need SEC_KEEP for --gc-sections. */ - if (! bfd_is_abs_section (e->section)) + if (!bfd_is_abs_section (e->section)) e->section->flags |= SEC_KEEP; - if (link_info.relocatable) + if (bfd_link_relocatable (&link_info)) lang_add_reloc (p->reloc, howto, e->section, e->name, exp_intop (e->value)); else