X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fldexp.c;h=4e9c03fc554df55d192a7ac4fbb557c14e6ff9f6;hb=8b8c7c9f49992750f66f81b4601d593a3858d98c;hp=f70634c5c616bf935e8dd53d4eeee21160aa2dea;hpb=2f65ac726a5ab50287d1ea4525852e29f69a1bbd;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/ldexp.c b/ld/ldexp.c index f70634c5c6..4e9c03fc55 100644 --- a/ld/ldexp.c +++ b/ld/ldexp.c @@ -1,7 +1,5 @@ /* This module handles expression trees. - Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 1991-2016 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support . This file is part of the GNU Binutils. @@ -50,6 +48,31 @@ segment_type *segments; struct ldexp_control expld; +/* This structure records symbols for which we need to keep track of + definedness for use in the DEFINED () test. It is also used in + making absolute symbols section relative late in the link. */ + +struct definedness_hash_entry +{ + struct bfd_hash_entry root; + + /* If this symbol was assigned from "dot" outside of an output + section statement, the section we'd like it relative to. */ + asection *final_sec; + + /* Symbol was defined by an object file. */ + unsigned int by_object : 1; + + /* Symbols was defined by a script. */ + unsigned int by_script : 1; + + /* Low bit of iteration count. Symbols with matching iteration have + been defined in this pass over the script. */ + unsigned int iteration : 1; +}; + +static struct bfd_hash_table definedness_table; + /* Print the string representation of the given token. Surround it with spaces if INFIX_P is TRUE. */ @@ -59,7 +82,7 @@ exp_print_token (token_code_type code, int infix_p) static const struct { token_code_type code; - char * name; + const char *name; } table[] = { @@ -81,6 +104,7 @@ exp_print_token (token_code_type code, int infix_p) { GE, ">=" }, { LSHIFT, "<<" }, { RSHIFT, ">>" }, + { LOG2CEIL, "LOG2CEIL" }, { ALIGN_K, "ALIGN" }, { BLOCK, "BLOCK" }, { QUAD, "QUAD" }, @@ -134,12 +158,35 @@ exp_print_token (token_code_type code, int infix_p) fputc (' ', config.map_file); } +static void +make_log2ceil (void) +{ + bfd_vma value = expld.result.value; + bfd_vma result = -1; + bfd_boolean round_up = FALSE; + + do + { + result++; + /* If more than one bit is set in the value we will need to round up. */ + if ((value > 1) && (value & 1)) + round_up = TRUE; + } + while (value >>= 1); + + if (round_up) + result += 1; + expld.result.section = NULL; + expld.result.value = result; +} + static void make_abs (void) { if (expld.result.section != NULL) expld.result.value += expld.result.section->vma; expld.result.section = bfd_abs_section_ptr; + expld.rel_from_abs = FALSE; } static void @@ -156,6 +203,7 @@ exp_intop (bfd_vma value) { etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->value)); new_e->type.node_code = INT; + new_e->type.filename = ldlex_filename (); new_e->type.lineno = lineno; new_e->value.value = value; new_e->value.str = NULL; @@ -168,6 +216,7 @@ exp_bigintop (bfd_vma value, char *str) { etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->value)); new_e->type.node_code = INT; + new_e->type.filename = ldlex_filename (); new_e->type.lineno = lineno; new_e->value.value = value; new_e->value.str = str; @@ -182,6 +231,7 @@ exp_relop (asection *section, bfd_vma value) { etree_type *new_e = (etree_type *) stat_alloc (sizeof (new_e->rel)); new_e->type.node_code = REL; + new_e->type.filename = ldlex_filename (); new_e->type.lineno = lineno; new_e->type.node_class = etree_rel; new_e->rel.section = section; @@ -210,10 +260,86 @@ new_rel (bfd_vma value, asection *section) static void new_rel_from_abs (bfd_vma value) { + asection *s = expld.section; + + expld.rel_from_abs = TRUE; expld.result.valid_p = TRUE; - expld.result.value = value - expld.section->vma; + expld.result.value = value - s->vma; expld.result.str = NULL; - expld.result.section = expld.section; + expld.result.section = s; +} + +/* New-function for the definedness hash table. */ + +static struct bfd_hash_entry * +definedness_newfunc (struct bfd_hash_entry *entry, + struct bfd_hash_table *table ATTRIBUTE_UNUSED, + const char *name ATTRIBUTE_UNUSED) +{ + struct definedness_hash_entry *ret = (struct definedness_hash_entry *) entry; + + if (ret == NULL) + ret = (struct definedness_hash_entry *) + bfd_hash_allocate (table, sizeof (struct definedness_hash_entry)); + + if (ret == NULL) + einfo (_("%P%F: bfd_hash_allocate failed creating symbol %s\n"), name); + + ret->by_object = 0; + ret->by_script = 0; + ret->iteration = 0; + return &ret->root; +} + +/* Called during processing of linker script script expressions. + For symbols assigned in a linker script, return a struct describing + where the symbol is defined relative to the current expression, + otherwise return NULL. */ + +static struct definedness_hash_entry * +symbol_defined (const char *name) +{ + return ((struct definedness_hash_entry *) + bfd_hash_lookup (&definedness_table, name, FALSE, FALSE)); +} + +/* Update the definedness state of NAME. Return FALSE if script symbol + is multiply defining a strong symbol in an object. */ + +static bfd_boolean +update_definedness (const char *name, struct bfd_link_hash_entry *h) +{ + bfd_boolean ret; + struct definedness_hash_entry *defentry + = (struct definedness_hash_entry *) + bfd_hash_lookup (&definedness_table, name, TRUE, FALSE); + + if (defentry == NULL) + einfo (_("%P%F: bfd_hash_lookup failed creating symbol %s\n"), name); + + /* If the symbol was already defined, and not by a script, then it + must be defined by an object file or by the linker target code. */ + ret = TRUE; + if (!defentry->by_script + && (h->type == bfd_link_hash_defined + || h->type == bfd_link_hash_defweak + || h->type == bfd_link_hash_common)) + { + defentry->by_object = 1; + if (h->type == bfd_link_hash_defined + && h->u.def.section->output_section != NULL + && !h->linker_def) + ret = FALSE; + } + + defentry->by_script = 1; + defentry->iteration = lang_statement_iteration; + defentry->final_sec = bfd_abs_section_ptr; + if (expld.phase == lang_final_phase_enum + && expld.rel_from_abs + && expld.result.section == bfd_abs_section_ptr) + defentry->final_sec = section_for_dot (); + return ret; } static void @@ -235,6 +361,10 @@ fold_unary (etree_type *tree) make_abs (); break; + case LOG2CEIL: + make_log2ceil (); + break; + case '~': expld.result.value = ~expld.result.value; break; @@ -305,13 +435,14 @@ fold_binary (etree_type *tree) /* Check to see if the user has overridden the default value. */ segment_name = tree->binary.rhs->name.name; - for (seg = segments; seg; seg = seg->next) + for (seg = segments; seg; seg = seg->next) if (strcmp (seg->name, segment_name) == 0) { if (!seg->used && config.magic_demand_paged && (seg->value % config.maxpagesize) != 0) - einfo (_("%P: warning: address of `%s' isn't multiple of maximum page size\n"), + einfo (_("%P: warning: address of `%s' " + "isn't multiple of maximum page size\n"), segment_name); seg->used = TRUE; new_rel_from_abs (seg->value); @@ -404,7 +535,7 @@ fold_binary (etree_type *tree) expld.result.value = ((bfd_signed_vma) lhs.value % (bfd_signed_vma) expld.result.value); else if (expld.phase != lang_mark_phase_enum) - einfo (_("%F%S %% by zero\n")); + einfo (_("%F%S %% by zero\n"), tree->binary.rhs); if (expld.result.section == lhs.section) expld.result.section = NULL; break; @@ -414,7 +545,7 @@ fold_binary (etree_type *tree) expld.result.value = ((bfd_signed_vma) lhs.value / (bfd_signed_vma) expld.result.value); else if (expld.phase != lang_mark_phase_enum) - einfo (_("%F%S / by zero\n")); + einfo (_("%F%S / by zero\n"), tree->binary.rhs); if (expld.result.section == lhs.section) expld.result.section = NULL; break; @@ -462,7 +593,6 @@ fold_binary (etree_type *tree) else if (expld.dataseg.phase == exp_dataseg_none) { expld.dataseg.phase = exp_dataseg_align_seen; - expld.dataseg.min_base = expld.dot; expld.dataseg.base = expld.result.value; expld.dataseg.pagesize = commonpage; expld.dataseg.maxpagesize = maxpage; @@ -475,7 +605,10 @@ fold_binary (etree_type *tree) break; case DATA_SEGMENT_RELRO_END: + /* Operands swapped! DATA_SEGMENT_RELRO_END(offset,exp) + has offset in expld.result and exp in lhs. */ expld.dataseg.relro = exp_dataseg_relro_end; + expld.dataseg.relro_offset = expld.result.value; if (expld.phase == lang_first_phase_enum || expld.section != bfd_abs_section_ptr) expld.result.valid_p = FALSE; @@ -543,13 +676,10 @@ fold_name (etree_type *tree) break; case DEFINED: - if (expld.phase == lang_first_phase_enum) - lang_track_definedness (tree->name.name); - else + if (expld.phase != lang_first_phase_enum) { struct bfd_link_hash_entry *h; - int def_iteration - = lang_symbol_definition_iteration (tree->name.name); + struct definedness_hash_entry *def; h = bfd_wrapped_link_hash_lookup (link_info.output_bfd, &link_info, @@ -559,12 +689,33 @@ fold_name (etree_type *tree) && (h->type == bfd_link_hash_defined || h->type == bfd_link_hash_defweak || h->type == bfd_link_hash_common) - && (def_iteration == lang_statement_iteration - || def_iteration == -1)); + && ((def = symbol_defined (tree->name.name)) == NULL + || def->by_object + || def->iteration == (lang_statement_iteration & 1))); } break; case NAME: + if (expld.assign_name != NULL + && strcmp (expld.assign_name, tree->name.name) == 0) + { + /* Self-assignment is only allowed for absolute symbols + defined in a linker script. */ + struct bfd_link_hash_entry *h; + struct definedness_hash_entry *def; + + h = bfd_wrapped_link_hash_lookup (link_info.output_bfd, + &link_info, + tree->name.name, + FALSE, FALSE, TRUE); + if (!(h != NULL + && (h->type == bfd_link_hash_defined + || h->type == bfd_link_hash_defweak) + && h->u.def.section == bfd_abs_section_ptr + && (def = symbol_defined (tree->name.name)) != NULL + && def->iteration == (lang_statement_iteration & 1))) + expld.assign_name = NULL; + } if (expld.phase == lang_first_phase_enum) ; else if (tree->name.name[0] == '.' && tree->name.name[1] == 0) @@ -587,10 +738,12 @@ fold_name (etree_type *tree) output_section = h->u.def.section->output_section; if (output_section == NULL) { - if (expld.phase != lang_mark_phase_enum) + if (expld.phase == lang_mark_phase_enum) + new_rel (h->u.def.value, h->u.def.section); + else einfo (_("%X%S: unresolvable symbol `%s'" " referenced in expression\n"), - tree->name.name); + tree, tree->name.name); } else if (output_section == bfd_abs_section_ptr && (expld.section != bfd_abs_section_ptr @@ -601,9 +754,11 @@ fold_name (etree_type *tree) output_section); } else if (expld.phase == lang_final_phase_enum - || expld.assigning_to_dot) - einfo (_("%F%S: undefined symbol `%s' referenced in expression\n"), - tree->name.name); + || (expld.phase != lang_mark_phase_enum + && expld.assigning_to_dot)) + einfo (_("%F%S: undefined symbol `%s'" + " referenced in expression\n"), + tree, tree->name.name); else if (h->type == bfd_link_hash_new) { h->type = bfd_link_hash_undefined; @@ -623,8 +778,9 @@ fold_name (etree_type *tree) if (os == NULL) { if (expld.phase == lang_final_phase_enum) - einfo (_("%F%S: undefined section `%s' referenced in expression\n"), - tree->name.name); + einfo (_("%F%S: undefined section `%s'" + " referenced in expression\n"), + tree, tree->name.name); } else if (os->processed_vma) new_rel (0, os->bfd_section); @@ -640,8 +796,9 @@ fold_name (etree_type *tree) if (os == NULL) { if (expld.phase == lang_final_phase_enum) - einfo (_("%F%S: undefined section `%s' referenced in expression\n"), - tree->name.name); + einfo (_("%F%S: undefined section `%s'" + " referenced in expression\n"), + tree, tree->name.name); } else if (os->processed_lma) { @@ -667,11 +824,12 @@ fold_name (etree_type *tree) if (os == NULL) { if (expld.phase == lang_final_phase_enum) - einfo (_("%F%S: undefined section `%s' referenced in expression\n"), - tree->name.name); + einfo (_("%F%S: undefined section `%s'" + " referenced in expression\n"), + tree, tree->name.name); new_number (0); } - else if (os->processed_vma) + else if (os->bfd_section != NULL) { bfd_vma val; @@ -680,22 +838,28 @@ fold_name (etree_type *tree) / bfd_octets_per_byte (link_info.output_bfd)); else val = (bfd_vma)1 << os->bfd_section->alignment_power; - + new_number (val); } + else + new_number (0); } break; case LENGTH: { - lang_memory_region_type *mem; - - mem = lang_memory_region_lookup (tree->name.name, FALSE); - if (mem != NULL) - new_number (mem->length); - else - einfo (_("%F%S: undefined MEMORY region `%s'" - " referenced in expression\n"), tree->name.name); + if (expld.phase != lang_first_phase_enum) + { + lang_memory_region_type *mem; + + mem = lang_memory_region_lookup (tree->name.name, FALSE); + if (mem != NULL) + new_number (mem->length); + else + einfo (_("%F%S: undefined MEMORY region `%s'" + " referenced in expression\n"), + tree, tree->name.name); + } } break; @@ -703,13 +867,14 @@ fold_name (etree_type *tree) if (expld.phase != lang_first_phase_enum) { lang_memory_region_type *mem; - - mem = lang_memory_region_lookup (tree->name.name, FALSE); - if (mem != NULL) + + mem = lang_memory_region_lookup (tree->name.name, FALSE); + if (mem != NULL) new_rel_from_abs (mem->origin); - else + else einfo (_("%F%S: undefined MEMORY region `%s'" - " referenced in expression\n"), tree->name.name); + " referenced in expression\n"), + tree, tree->name.name); } break; @@ -720,7 +885,7 @@ fold_name (etree_type *tree) new_number (config.commonpagesize); else einfo (_("%F%S: unknown constant `%s' referenced in expression\n"), - tree->name.name); + tree, tree->name.name); break; default: @@ -729,6 +894,106 @@ fold_name (etree_type *tree) } } +/* Return true if TREE is '.'. */ + +static bfd_boolean +is_dot (const etree_type *tree) +{ + return (tree->type.node_class == etree_name + && tree->type.node_code == NAME + && tree->name.name[0] == '.' + && tree->name.name[1] == 0); +} + +/* Return true if TREE is a constant equal to VAL. */ + +static bfd_boolean +is_value (const etree_type *tree, bfd_vma val) +{ + return (tree->type.node_class == etree_value + && tree->value.value == val); +} + +/* Return true if TREE is an absolute symbol equal to VAL defined in + a linker script. */ + +static bfd_boolean +is_sym_value (const etree_type *tree, bfd_vma val) +{ + struct bfd_link_hash_entry *h; + struct definedness_hash_entry *def; + + return (tree->type.node_class == etree_name + && tree->type.node_code == NAME + && (def = symbol_defined (tree->name.name)) != NULL + && def->by_script + && def->iteration == (lang_statement_iteration & 1) + && (h = bfd_wrapped_link_hash_lookup (link_info.output_bfd, + &link_info, + tree->name.name, + FALSE, FALSE, TRUE)) != NULL + && h->type == bfd_link_hash_defined + && h->u.def.section == bfd_abs_section_ptr + && h->u.def.value == val); +} + +/* Return true if TREE is ". != 0". */ + +static bfd_boolean +is_dot_ne_0 (const etree_type *tree) +{ + return (tree->type.node_class == etree_binary + && tree->type.node_code == NE + && is_dot (tree->binary.lhs) + && is_value (tree->binary.rhs, 0)); +} + +/* Return true if TREE is ". = . + 0" or ". = . + sym" where sym is an + absolute constant with value 0 defined in a linker script. */ + +static bfd_boolean +is_dot_plus_0 (const etree_type *tree) +{ + return (tree->type.node_class == etree_binary + && tree->type.node_code == '+' + && is_dot (tree->binary.lhs) + && (is_value (tree->binary.rhs, 0) + || is_sym_value (tree->binary.rhs, 0))); +} + +/* Return true if TREE is "ALIGN (. != 0 ? some_expression : 1)". */ + +static bfd_boolean +is_align_conditional (const etree_type *tree) +{ + if (tree->type.node_class == etree_unary + && tree->type.node_code == ALIGN_K) + { + tree = tree->unary.child; + return (tree->type.node_class == etree_trinary + && is_dot_ne_0 (tree->trinary.cond) + && is_value (tree->trinary.rhs, 1)); + } + return FALSE; +} + +/* Subroutine of exp_fold_tree_1 for copying a symbol type. */ + +static void +try_copy_symbol_type (struct bfd_link_hash_entry *h, etree_type *src) +{ + if (src->type.node_class == etree_name) + { + struct bfd_link_hash_entry *hsrc; + + hsrc = bfd_link_hash_lookup (link_info.hash, src->name.name, + FALSE, FALSE, TRUE); + if (hsrc) + bfd_copy_link_hash_symbol_type (link_info.output_bfd, h, + hsrc); + } +} + static void exp_fold_tree_1 (etree_type *tree) { @@ -784,30 +1049,50 @@ exp_fold_tree_1 (etree_type *tree) if (tree->assign.dst[0] == '.' && tree->assign.dst[1] == 0) { if (tree->type.node_class != etree_assign) - einfo (_("%F%S can not PROVIDE assignment to location counter\n")); - /* After allocation, assignment to dot should not be done inside - an output section since allocation adds a padding statement - that effectively duplicates the assignment. */ - if (expld.phase == lang_mark_phase_enum - || expld.phase == lang_allocating_phase_enum - || ((expld.phase == lang_assigning_phase_enum - || expld.phase == lang_final_phase_enum) - && expld.section == bfd_abs_section_ptr)) + einfo (_("%F%S can not PROVIDE assignment to" + " location counter\n"), tree); + if (expld.phase != lang_first_phase_enum) { /* Notify the folder that this is an assignment to dot. */ expld.assigning_to_dot = TRUE; exp_fold_tree_1 (tree->assign.src); expld.assigning_to_dot = FALSE; + /* If we are assigning to dot inside an output section + arrange to keep the section, except for certain + expressions that evaluate to zero. We ignore . = 0, + . = . + 0, and . = ALIGN (. != 0 ? expr : 1). + We can't ignore all expressions that evaluate to zero + because an otherwise empty section might have padding + added by an alignment expression that changes with + relaxation. Such a section might have zero size + before relaxation and so be stripped incorrectly. */ + if (expld.phase == lang_mark_phase_enum + && expld.section != bfd_abs_section_ptr + && !(expld.result.valid_p + && expld.result.value == 0 + && (is_value (tree->assign.src, 0) + || is_sym_value (tree->assign.src, 0) + || is_dot_plus_0 (tree->assign.src) + || is_align_conditional (tree->assign.src)))) + expld.section->flags |= SEC_KEEP; + if (!expld.result.valid_p) { if (expld.phase != lang_mark_phase_enum) - einfo (_("%F%S invalid assignment to location counter\n")); + einfo (_("%F%S invalid assignment to" + " location counter\n"), tree); } else if (expld.dotp == NULL) einfo (_("%F%S assignment to location counter" - " invalid outside of SECTION\n")); - else + " invalid outside of SECTIONS\n"), tree); + + /* After allocation, assignment to dot should not be + done inside an output section since allocation adds a + padding statement that effectively duplicates the + assignment. */ + else if (expld.phase <= lang_allocating_phase_enum + || expld.section == bfd_abs_section_ptr) { bfd_vma nextdot; @@ -819,7 +1104,8 @@ exp_fold_tree_1 (etree_type *tree) if (nextdot < expld.dot && expld.section != bfd_abs_section_ptr) einfo (_("%F%S cannot move location counter backwards" - " (from %V to %V)\n"), expld.dot, nextdot); + " (from %V to %V)\n"), + tree, expld.dot, nextdot); else { expld.dot = nextdot; @@ -839,21 +1125,37 @@ exp_fold_tree_1 (etree_type *tree) h = bfd_link_hash_lookup (link_info.hash, tree->assign.dst, FALSE, FALSE, TRUE); if (h == NULL - || (h->type != bfd_link_hash_new - && h->type != bfd_link_hash_undefined - && h->type != bfd_link_hash_common)) + || !(h->type == bfd_link_hash_new + || h->type == bfd_link_hash_undefined + || h->type == bfd_link_hash_undefweak + || h->linker_def)) { - /* Do nothing. The symbol was never referenced, or was - defined by some object. */ + /* Do nothing. The symbol was never referenced, or + was defined in some object file. Note that + undefweak symbols are defined by PROVIDE. This + is to support glibc use of __rela_iplt_start and + similar weak references. */ break; } } + expld.assign_name = tree->assign.dst; exp_fold_tree_1 (tree->assign.src); - if (expld.result.valid_p - || (expld.phase == lang_first_phase_enum + /* expld.assign_name remaining equal to tree->assign.dst + below indicates the evaluation of tree->assign.src did + not use the value of tree->assign.dst. We don't allow + self assignment until the final phase for two reasons: + 1) Expressions are evaluated multiple times. With + relaxation, the number of times may vary. + 2) Section relative symbol values cannot be correctly + converted to absolute values, as is required by many + expressions, until final section sizing is complete. */ + if ((expld.result.valid_p + && (expld.phase == lang_final_phase_enum + || expld.assign_name != NULL)) + || (expld.phase <= lang_mark_phase_enum && tree->type.node_class == etree_assign - && tree->assign.hidden)) + && tree->assign.defsym)) { if (h == NULL) { @@ -864,29 +1166,46 @@ exp_fold_tree_1 (etree_type *tree) tree->assign.dst); } - /* FIXME: Should we worry if the symbol is already - defined? */ - lang_update_definedness (tree->assign.dst, h); - h->type = bfd_link_hash_defined; - h->u.def.value = expld.result.value; if (expld.result.section == NULL) expld.result.section = expld.section; + if (!update_definedness (tree->assign.dst, h) && 0) + { + /* Symbol was already defined. For now this error + is disabled because it causes failures in the ld + testsuite: ld-elf/var1, ld-scripts/defined5, and + ld-scripts/pr14962. Some of these no doubt + reflect scripts used in the wild. */ + (*link_info.callbacks->multiple_definition) + (&link_info, h, link_info.output_bfd, + expld.result.section, expld.result.value); + } + h->type = bfd_link_hash_defined; + h->u.def.value = expld.result.value; h->u.def.section = expld.result.section; + h->linker_def = 0; if (tree->type.node_class == etree_provide) tree->type.node_class = etree_provided; /* Copy the symbol type if this is a simple assignment of - one symbol to annother. */ + one symbol to another. Also, handle the case of a foldable + ternary conditional with names on either side. */ if (tree->assign.src->type.node_class == etree_name) + try_copy_symbol_type (h, tree->assign.src); + else if (tree->assign.src->type.node_class == etree_trinary) { - struct bfd_link_hash_entry *hsrc; - - hsrc = bfd_link_hash_lookup (link_info.hash, - tree->assign.src->name.name, - FALSE, FALSE, TRUE); - if (hsrc) - bfd_copy_link_hash_symbol_type (link_info.output_bfd, h, - hsrc); + exp_fold_tree_1 (tree->assign.src->trinary.cond); + if (expld.result.valid_p) + { + if (expld.result.value + && tree->assign.src->trinary.lhs->type.node_class + == etree_name) + try_copy_symbol_type (h, tree->assign.src->trinary.lhs); + + if (!expld.result.value + && tree->assign.src->trinary.rhs->type.node_class + == etree_name) + try_copy_symbol_type (h, tree->assign.src->trinary.rhs); + } } } else if (expld.phase == lang_final_phase_enum) @@ -897,6 +1216,7 @@ exp_fold_tree_1 (etree_type *tree) && h->type == bfd_link_hash_new) h->type = bfd_link_hash_undefined; } + expld.assign_name = NULL; } break; @@ -914,6 +1234,7 @@ exp_fold_tree_1 (etree_type *tree) void exp_fold_tree (etree_type *tree, asection *current_section, bfd_vma *dotp) { + expld.rel_from_abs = FALSE; expld.dot = *dotp; expld.dotp = dotp; expld.section = current_section; @@ -923,6 +1244,7 @@ exp_fold_tree (etree_type *tree, asection *current_section, bfd_vma *dotp) void exp_fold_tree_no_dot (etree_type *tree) { + expld.rel_from_abs = FALSE; expld.dot = 0; expld.dotp = NULL; expld.section = bfd_abs_section_ptr; @@ -935,6 +1257,7 @@ exp_binop (int code, etree_type *lhs, etree_type *rhs) etree_type value, *new_e; value.type.node_code = code; + value.type.filename = lhs->type.filename; value.type.lineno = lhs->type.lineno; value.binary.lhs = lhs; value.binary.rhs = rhs; @@ -954,7 +1277,8 @@ exp_trinop (int code, etree_type *cond, etree_type *lhs, etree_type *rhs) etree_type value, *new_e; value.type.node_code = code; - value.type.lineno = lhs->type.lineno; + value.type.filename = cond->type.filename; + value.type.lineno = cond->type.lineno; value.trinary.lhs = lhs; value.trinary.cond = cond; value.trinary.rhs = rhs; @@ -974,6 +1298,7 @@ exp_unop (int code, etree_type *child) etree_type value, *new_e; value.unary.type.node_code = code; + value.unary.type.filename = child->type.filename; value.unary.type.lineno = child->type.lineno; value.unary.child = child; value.unary.type.node_class = etree_unary; @@ -992,6 +1317,7 @@ exp_nameop (int code, const char *name) etree_type value, *new_e; value.name.type.node_code = code; + value.name.type.filename = ldlex_filename (); value.name.type.lineno = lineno; value.name.name = name; value.name.type.node_class = etree_name; @@ -1010,30 +1336,37 @@ static etree_type * exp_assop (const char *dst, etree_type *src, enum node_tree_enum class, + bfd_boolean defsym, bfd_boolean hidden) { etree_type *n; n = (etree_type *) stat_alloc (sizeof (n->assign)); n->assign.type.node_code = '='; + n->assign.type.filename = src->type.filename; n->assign.type.lineno = src->type.lineno; n->assign.type.node_class = class; n->assign.src = src; n->assign.dst = dst; + n->assign.defsym = defsym; n->assign.hidden = hidden; return n; } +/* Handle linker script assignments and HIDDEN. */ + etree_type * -exp_assign (const char *dst, etree_type *src) +exp_assign (const char *dst, etree_type *src, bfd_boolean hidden) { - return exp_assop (dst, src, etree_assign, FALSE); + return exp_assop (dst, src, etree_assign, FALSE, hidden); } +/* Handle --defsym command-line option. */ + etree_type * exp_defsym (const char *dst, etree_type *src) { - return exp_assop (dst, src, etree_assign, TRUE); + return exp_assop (dst, src, etree_assign, TRUE, FALSE); } /* Handle PROVIDE. */ @@ -1041,7 +1374,7 @@ exp_defsym (const char *dst, etree_type *src) etree_type * exp_provide (const char *dst, etree_type *src, bfd_boolean hidden) { - return exp_assop (dst, src, etree_provide, hidden); + return exp_assop (dst, src, etree_provide, FALSE, hidden); } /* Handle ASSERT. */ @@ -1053,6 +1386,7 @@ exp_assert (etree_type *exp, const char *message) n = (etree_type *) stat_alloc (sizeof (n->assert_s)); n->assert_s.type.node_code = '!'; + n->assert_s.type.filename = exp->type.filename; n->assert_s.type.lineno = exp->type.lineno; n->assert_s.type.node_class = etree_assert; n->assert_s.child = exp; @@ -1105,6 +1439,17 @@ exp_print_tree (etree_type *tree) case DATA_SEGMENT_ALIGN: case DATA_SEGMENT_RELRO_END: function_like = TRUE; + break; + case SEGMENT_START: + /* Special handling because arguments are in reverse order and + the segment name is quoted. */ + exp_print_token (tree->type.node_code, FALSE); + fputs (" (\"", config.map_file); + exp_print_tree (tree->binary.rhs); + fputs ("\", ", config.map_file); + exp_print_tree (tree->binary.lhs); + fputc (')', config.map_file); + return; } if (function_like) { @@ -1168,7 +1513,8 @@ exp_get_vma (etree_type *tree, bfd_vma def, char *name) if (expld.result.valid_p) return expld.result.value; else if (name != NULL && expld.phase != lang_mark_phase_enum) - einfo (_("%F%S: nonconstant expression for %s\n"), name); + einfo (_("%F%S: nonconstant expression for %s\n"), + tree, name); } return def; } @@ -1193,7 +1539,8 @@ exp_get_fill (etree_type *tree, fill_type *def, char *name) if (!expld.result.valid_p) { if (name != NULL && expld.phase != lang_mark_phase_enum) - einfo (_("%F%S: nonconstant expression for %s\n"), name); + einfo (_("%F%S: nonconstant expression for %s\n"), + tree, name); return def; } @@ -1252,8 +1599,8 @@ exp_get_abs_int (etree_type *tree, int def, char *name) } else if (name != NULL && expld.phase != lang_mark_phase_enum) { - lineno = tree->type.lineno; - einfo (_("%F%S: nonconstant expression for %s\n"), name); + einfo (_("%F%S: nonconstant expression for %s\n"), + tree, name); } } return def; @@ -1268,3 +1615,51 @@ align_n (bfd_vma value, bfd_vma align) value = (value + align - 1) / align; return value * align; } + +void +ldexp_init (void) +{ + /* The value "13" is ad-hoc, somewhat related to the expected number of + assignments in a linker script. */ + if (!bfd_hash_table_init_n (&definedness_table, + definedness_newfunc, + sizeof (struct definedness_hash_entry), + 13)) + einfo (_("%P%F: can not create hash table: %E\n")); +} + +/* Convert absolute symbols defined by a script from "dot" (also + SEGMENT_START or ORIGIN) outside of an output section statement, + to section relative. */ + +static bfd_boolean +set_sym_sections (struct bfd_hash_entry *bh, void *inf ATTRIBUTE_UNUSED) +{ + struct definedness_hash_entry *def = (struct definedness_hash_entry *) bh; + if (def->final_sec != bfd_abs_section_ptr) + { + struct bfd_link_hash_entry *h; + h = bfd_link_hash_lookup (link_info.hash, bh->string, + FALSE, FALSE, TRUE); + if (h != NULL + && h->type == bfd_link_hash_defined + && h->u.def.section == bfd_abs_section_ptr) + { + h->u.def.value -= def->final_sec->vma; + h->u.def.section = def->final_sec; + } + } + return TRUE; +} + +void +ldexp_finalize_syms (void) +{ + bfd_hash_traverse (&definedness_table, set_sym_sections, NULL); +} + +void +ldexp_finish (void) +{ + bfd_hash_table_free (&definedness_table); +}