bfd/

[deliverable/binutils-gdb.git] / gold / gold.cc

diff --git a/gold/gold.cc b/gold/gold.cc
index 3073b1869e615a1aa98803e33293036f20f8fd66..e7b7ae2939d7d470c5d6506a68eae7c1ab3dd217 100644 (file)
--- a/gold/gold.cc
+++ b/gold/gold.cc
@@ -1,4 +1,4 @@
-// ld.c -- linker main function
+// gold.cc -- main linker functions
 
 #include "gold.h"
 
@@ -52,10 +52,14 @@ gold_nomem()
   gold_exit(false);
 }
 
+// Handle an unreachable case.
+
 void
-gold_unreachable()
+do_gold_unreachable(const char* filename, int lineno, const char* function)
 {
-  abort();
+  fprintf(stderr, "%s: internal error in %s, at %s:%d\n",
+         program_name, function, filename, lineno);
+  gold_exit(false);
 }
 
 // This class arranges to run the functions done in the middle of the
@@ -136,6 +140,10 @@ queue_middle_tasks(const General_options& options,
                   Layout* layout,
                   Workqueue* workqueue)
 {
+  // Define some sections and symbols needed for a dynamic link.  This
+  // handles some cases we want to see before we read the relocs.
+  layout->create_initial_dynamic_sections(input_objects, symtab);
+
   // Predefine standard symbols.  This should be fast, so we don't
   // bother to create a task for it.
   define_standard_symbols(symtab, layout, input_objects->target());
@@ -209,13 +217,18 @@ queue_final_tasks(const General_options& options,
 
   // Queue a task to write out the symbol table.
   final_blocker->add_blocker();
-  workqueue->queue(new Write_symbols_task(symtab, input_objects->target(),
-                                         layout->sympool(), of,
+  workqueue->queue(new Write_symbols_task(symtab,
+                                         input_objects->target(),
+                                         layout->sympool(),
+                                         layout->dynpool(),
+                                         of,
                                          final_blocker));
 
   // Queue a task to write out everything else.
   final_blocker->add_blocker();
-  workqueue->queue(new Write_data_task(layout, of, final_blocker));
+  workqueue->queue(new Write_data_task(layout, symtab,
+                                      input_objects->target(),
+                                      of, final_blocker));
 
   // Queue a task to close the output file.  This will be blocked by
   // FINAL_BLOCKER.
@@ -224,50 +237,3 @@ queue_final_tasks(const General_options& options,
 }
 
 } // End namespace gold.
-
-using namespace gold;
-
-int
-main(int argc, char** argv)
-{
-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
-  setlocale (LC_MESSAGES, "");
-#endif
-#if defined (HAVE_SETLOCALE)
-  setlocale (LC_CTYPE, "");
-#endif
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  gold::program_name = argv[0];
-
-  // Handle the command line options.
-  gold::Command_line command_line;
-  command_line.process(argc - 1, argv + 1);
-
-  // The work queue.
-  gold::Workqueue workqueue(command_line.options());
-
-  // The list of input objects.
-  Input_objects input_objects;
-
-  // The symbol table.
-  Symbol_table symtab;
-
-  // The layout object.
-  Layout layout(command_line.options());
-
-  // Get the search path from the -L options.
-  Dirsearch search_path;
-  search_path.add(&workqueue, command_line.options().search_path());
-
-  // Queue up the first set of tasks.
-  queue_initial_tasks(command_line.options(), search_path,
-                     command_line, &workqueue, &input_objects,
-                     &symtab, &layout);
-
-  // Run the main task processing loop.
-  workqueue.process();
-
-  gold::gold_exit(true);
-}