X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gold%2Fgold.cc;h=bdfb33d995ccd952b5b99e85d6362fa6ae566b78;hb=cfd4e875aeacf565f945c2818dbfff47807b6199;hp=0f9a228043140a9e6a3e9e18ed2f407d4153621f;hpb=e81fea4d172699b2e986bc541f812cac0995da6b;p=platform%2Fupstream%2Fbinutils.git diff --git a/gold/gold.cc b/gold/gold.cc index 0f9a228..bdfb33d 100644 --- a/gold/gold.cc +++ b/gold/gold.cc @@ -1,7 +1,6 @@ // gold.cc -- main linker functions -// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 -// Free Software Foundation, Inc. +// Copyright (C) 2006-2014 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -502,9 +501,15 @@ queue_middle_tasks(const General_options& options, if (parameters->options().gc_sections()) { // Find the start symbol if any. - Symbol* start_sym = symtab->lookup(parameters->entry()); - if (start_sym != NULL) - symtab->gc_mark_symbol(start_sym); + Symbol* sym = symtab->lookup(parameters->entry()); + if (sym != NULL) + symtab->gc_mark_symbol(sym); + sym = symtab->lookup(parameters->options().init()); + if (sym != NULL && sym->is_defined() && !sym->is_from_dynobj()) + symtab->gc_mark_symbol(sym); + sym = symtab->lookup(parameters->options().fini()); + if (sym != NULL && sym->is_defined() && !sym->is_from_dynobj()) + symtab->gc_mark_symbol(sym); // Symbols named with -u should not be considered garbage. symtab->gc_mark_undef_symbols(layout); gold_assert(symtab->gc() != NULL); @@ -647,10 +652,6 @@ queue_middle_tasks(const General_options& options, // dynamic objects that it depends upon. input_objects->check_dynamic_dependencies(); - // See if any of the input definitions violate the One Definition Rule. - // TODO: if this is too slow, do this as a task, rather than inline. - symtab->detect_odr_violations(task, options.output_file_name()); - // Do the --no-undefined-version check. if (!parameters->options().undefined_version()) { @@ -807,6 +808,8 @@ queue_final_tasks(const General_options& options, if (!any_postprocessing_sections) { input_sections_blocker = new Task_token(true); + // Write_symbols_task, Relocate_tasks. + input_sections_blocker->add_blocker(); input_sections_blocker->add_blockers(input_objects->number_of_relobjs()); } @@ -835,6 +838,7 @@ queue_final_tasks(const General_options& options, // Queue a task to write out the output sections. workqueue->queue(new Write_sections_task(layout, of, output_sections_blocker, + input_sections_blocker, final_blocker)); // Queue a task to write out everything else. @@ -872,6 +876,9 @@ queue_final_tasks(const General_options& options, final_blocker = new_final_blocker; } + // Create tasks for tree-style build ID computation, if necessary. + final_blocker = layout->queue_build_id_tasks(workqueue, final_blocker, of); + // Queue a task to close the output file. This will be blocked by // FINAL_BLOCKER. workqueue->queue(new Task_function(new Close_task_runner(&options, layout,