* symtab.cc (add_from_pluginobj): Pass correct value for is_ordinary.
[deliverable/binutils-gdb.git] / gold / script.cc
index 16c0cc0d866e5a425c7451b7f8c70b7f80ca6e47..8839213bc2558f740cd00a960fdbb6679a261aff 100644 (file)
@@ -1,6 +1,6 @@
 // script.cc -- handle linker scripts for gold.
 
-// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
 
 #include "gold.h"
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <fnmatch.h>
 #include <string>
 #include <vector>
-#include <cstdio>
-#include <cstdlib>
 #include "filenames.h"
 
 #include "elfcpp.h"
 #include "parameters.h"
 #include "layout.h"
 #include "symtab.h"
+#include "target-select.h"
 #include "script.h"
 #include "script-c.h"
+#include "incremental.h"
 
 namespace gold
 {
@@ -183,7 +186,9 @@ class Lex
     // Reading an expression in a linker script.
     EXPRESSION,
     // Reading a version script.
-    VERSION_SCRIPT
+    VERSION_SCRIPT,
+    // Reading a --dynamic-list file.
+    DYNAMIC_LIST
   };
 
   Lex(const char* input_string, size_t input_length, int parsing_token)
@@ -392,8 +397,11 @@ Lex::can_start_name(char c, char c2)
     case '~':
       return this->mode_ == LINKER_SCRIPT && can_continue_name(&c2);
 
-    case '*': case '[': 
-      return this->mode_ == VERSION_SCRIPT;
+    case '*': case '[':
+      return (this->mode_ == VERSION_SCRIPT
+              || this->mode_ == DYNAMIC_LIST
+             || (this->mode_ == LINKER_SCRIPT
+                 && can_continue_name(&c2)));
 
     default:
       return false;
@@ -426,27 +434,31 @@ Lex::can_continue_name(const char* c)
     case '5': case '6': case '7': case '8': case '9':
       return c + 1;
 
+    // TODO(csilvers): why not allow ~ in names for version-scripts?
     case '/': case '\\': case '~':
     case '=': case '+':
-    case ',': case '?': 
+    case ',':
       if (this->mode_ == LINKER_SCRIPT)
         return c + 1;
       return NULL;
 
-    case '[': case ']': case '*': case '-':
-      if (this->mode_ == LINKER_SCRIPT || this->mode_ == VERSION_SCRIPT)
+    case '[': case ']': case '*': case '?': case '-':
+      if (this->mode_ == LINKER_SCRIPT || this->mode_ == VERSION_SCRIPT
+          || this->mode_ == DYNAMIC_LIST)
         return c + 1;
       return NULL;
 
+    // TODO(csilvers): why allow this?  ^ is meaningless in version scripts.
     case '^':
-      if (this->mode_ == VERSION_SCRIPT)
+      if (this->mode_ == VERSION_SCRIPT || this->mode_ == DYNAMIC_LIST)
         return c + 1;
       return NULL;
 
     case ':':
       if (this->mode_ == LINKER_SCRIPT)
         return c + 1;
-      else if (this->mode_ == VERSION_SCRIPT && (c[1] == ':'))
+      else if ((this->mode_ == VERSION_SCRIPT || this->mode_ == DYNAMIC_LIST)
+               && (c[1] == ':'))
         {
           // A name can have '::' in it, as that's a c++ namespace
           // separator. But a single colon is not part of a name.
@@ -731,7 +743,7 @@ Lex::get_token(const char** pp)
        }
 
       // Skip whitespace quickly.
-      while (*p == ' ' || *p == '\t')
+      while (*p == ' ' || *p == '\t' || *p == '\r')
        ++p;
 
       if (*p == '\n')
@@ -844,95 +856,139 @@ Lex::next_token()
   return &this->token_;
 }
 
-// A trivial task which waits for THIS_BLOCKER to be clear and then
-// clears NEXT_BLOCKER.  THIS_BLOCKER may be NULL.
-
-class Script_unblock : public Task
-{
- public:
-  Script_unblock(Task_token* this_blocker, Task_token* next_blocker)
-    : this_blocker_(this_blocker), next_blocker_(next_blocker)
-  { }
-
-  ~Script_unblock()
-  {
-    if (this->this_blocker_ != NULL)
-      delete this->this_blocker_;
-  }
+// class Symbol_assignment.
 
-  Task_token*
-  is_runnable()
-  {
-    if (this->this_blocker_ != NULL && this->this_blocker_->is_blocked())
-      return this->this_blocker_;
-    return NULL;
-  }
+// Add the symbol to the symbol table.  This makes sure the symbol is
+// there and defined.  The actual value is stored later.  We can't
+// determine the actual value at this point, because we can't
+// necessarily evaluate the expression until all ordinary symbols have
+// been finalized.
 
-  void
-  locks(Task_locker* tl)
-  { tl->add(this, this->next_blocker_); }
+// The GNU linker lets symbol assignments in the linker script
+// silently override defined symbols in object files.  We are
+// compatible.  FIXME: Should we issue a warning?
 
-  void
-  run(Workqueue*)
-  { }
+void
+Symbol_assignment::add_to_table(Symbol_table* symtab)
+{
+  elfcpp::STV vis = this->hidden_ ? elfcpp::STV_HIDDEN : elfcpp::STV_DEFAULT;
+  this->sym_ = symtab->define_as_constant(this->name_.c_str(),
+                                         NULL, // version
+                                         0, // value
+                                         0, // size
+                                         elfcpp::STT_NOTYPE,
+                                         elfcpp::STB_GLOBAL,
+                                         vis,
+                                         0, // nonvis
+                                         this->provide_,
+                                          true); // force_override
+}
 
-  std::string
-  get_name() const
-  { return "Script_unblock"; }
+// Finalize a symbol value.
 
- private:
-  Task_token* this_blocker_;
-  Task_token* next_blocker_;
-};
+void
+Symbol_assignment::finalize(Symbol_table* symtab, const Layout* layout)
+{
+  this->finalize_maybe_dot(symtab, layout, false, 0, NULL);
+}
 
-// Class Script_options.
+// Finalize a symbol value which can refer to the dot symbol.
 
-Script_options::Script_options()
-  : entry_(), symbol_assignments_()
+void
+Symbol_assignment::finalize_with_dot(Symbol_table* symtab,
+                                    const Layout* layout,
+                                    uint64_t dot_value,
+                                    Output_section* dot_section)
 {
+  this->finalize_maybe_dot(symtab, layout, true, dot_value, dot_section);
 }
 
-// Add any symbols we are defining to the symbol table.
+// Finalize a symbol value, internal version.
 
 void
-Script_options::add_symbols_to_table(Symbol_table* symtab,
-                                    const Target* target)
+Symbol_assignment::finalize_maybe_dot(Symbol_table* symtab,
+                                     const Layout* layout,
+                                     bool is_dot_available,
+                                     uint64_t dot_value,
+                                     Output_section* dot_section)
 {
-  for (Symbol_assignments::iterator p = this->symbol_assignments_.begin();
-       p != this->symbol_assignments_.end();
-       ++p)
+  // If we were only supposed to provide this symbol, the sym_ field
+  // will be NULL if the symbol was not referenced.
+  if (this->sym_ == NULL)
     {
-      elfcpp::STV vis = p->hidden ? elfcpp::STV_HIDDEN : elfcpp::STV_DEFAULT;
-      p->sym = symtab->define_as_constant(target,
-                                         p->name.c_str(),
-                                         NULL, // version
-                                         0, // value
-                                         0, // size
-                                         elfcpp::STT_NOTYPE,
-                                         elfcpp::STB_GLOBAL,
-                                         vis,
-                                         0, // nonvis
-                                         p->provide);
+      gold_assert(this->provide_);
+      return;
+    }
+
+  if (parameters->target().get_size() == 32)
+    {
+#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG)
+      this->sized_finalize<32>(symtab, layout, is_dot_available, dot_value,
+                              dot_section);
+#else
+      gold_unreachable();
+#endif
+    }
+  else if (parameters->target().get_size() == 64)
+    {
+#if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG)
+      this->sized_finalize<64>(symtab, layout, is_dot_available, dot_value,
+                              dot_section);
+#else
+      gold_unreachable();
+#endif
     }
+  else
+    gold_unreachable();
+}
+
+template<int size>
+void
+Symbol_assignment::sized_finalize(Symbol_table* symtab, const Layout* layout,
+                                 bool is_dot_available, uint64_t dot_value,
+                                 Output_section* dot_section)
+{
+  Output_section* section;
+  uint64_t final_val = this->val_->eval_maybe_dot(symtab, layout, true,
+                                                 is_dot_available,
+                                                 dot_value, dot_section,
+                                                 &section);
+  Sized_symbol<size>* ssym = symtab->get_sized_symbol<size>(this->sym_);
+  ssym->set_value(final_val);
+  if (section != NULL)
+    ssym->set_output_section(section);
 }
 
-// Finalize symbol values.
+// Set the symbol value if the expression yields an absolute value.
 
 void
-Script_options::finalize_symbols(Symbol_table* symtab, const Layout* layout)
+Symbol_assignment::set_if_absolute(Symbol_table* symtab, const Layout* layout,
+                                  bool is_dot_available, uint64_t dot_value)
 {
-  if (parameters->get_size() == 32)
+  if (this->sym_ == NULL)
+    return;
+
+  Output_section* val_section;
+  uint64_t val = this->val_->eval_maybe_dot(symtab, layout, false,
+                                           is_dot_available, dot_value,
+                                           NULL, &val_section);
+  if (val_section != NULL)
+    return;
+
+  if (parameters->target().get_size() == 32)
     {
 #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG)
-      this->sized_finalize_symbols<32>(symtab, layout);
+      Sized_symbol<32>* ssym = symtab->get_sized_symbol<32>(this->sym_);
+      ssym->set_value(val);
 #else
       gold_unreachable();
 #endif
     }
-  else if (parameters->get_size() == 64)
+  else if (parameters->target().get_size() == 64)
     {
 #if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG)
-      this->sized_finalize_symbols<64>(symtab, layout);
+      Sized_symbol<64>* ssym = symtab->get_sized_symbol<64>(this->sym_);
+      ssym->set_value(val);
 #else
       gold_unreachable();
 #endif
@@ -941,21 +997,159 @@ Script_options::finalize_symbols(Symbol_table* symtab, const Layout* layout)
     gold_unreachable();
 }
 
-template<int size>
+// Print for debugging.
+
 void
-Script_options::sized_finalize_symbols(Symbol_table* symtab,
-                                      const Layout* layout)
+Symbol_assignment::print(FILE* f) const
 {
-  for (Symbol_assignments::iterator p = this->symbol_assignments_.begin();
-       p != this->symbol_assignments_.end();
-       ++p)
+  if (this->provide_ && this->hidden_)
+    fprintf(f, "PROVIDE_HIDDEN(");
+  else if (this->provide_)
+    fprintf(f, "PROVIDE(");
+  else if (this->hidden_)
+    gold_unreachable();
+
+  fprintf(f, "%s = ", this->name_.c_str());
+  this->val_->print(f);
+
+  if (this->provide_ || this->hidden_)
+    fprintf(f, ")");
+
+  fprintf(f, "\n");
+}
+
+// Class Script_assertion.
+
+// Check the assertion.
+
+void
+Script_assertion::check(const Symbol_table* symtab, const Layout* layout)
+{
+  if (!this->check_->eval(symtab, layout, true))
+    gold_error("%s", this->message_.c_str());
+}
+
+// Print for debugging.
+
+void
+Script_assertion::print(FILE* f) const
+{
+  fprintf(f, "ASSERT(");
+  this->check_->print(f);
+  fprintf(f, ", \"%s\")\n", this->message_.c_str());
+}
+
+// Class Script_options.
+
+Script_options::Script_options()
+  : entry_(), symbol_assignments_(), version_script_info_(),
+    script_sections_()
+{
+}
+
+// Add a symbol to be defined.
+
+void
+Script_options::add_symbol_assignment(const char* name, size_t length,
+                                     Expression* value, bool provide,
+                                     bool hidden)
+{
+  if (length != 1 || name[0] != '.')
     {
-      if (p->sym != NULL)
+      if (this->script_sections_.in_sections_clause())
+       this->script_sections_.add_symbol_assignment(name, length, value,
+                                                    provide, hidden);
+      else
        {
-         Sized_symbol<size>* ssym = symtab->get_sized_symbol<size>(p->sym);
-         ssym->set_value(p->value->eval(symtab, layout));
+         Symbol_assignment* p = new Symbol_assignment(name, length, value,
+                                                      provide, hidden);
+         this->symbol_assignments_.push_back(p);
        }
     }
+  else
+    {
+      if (provide || hidden)
+       gold_error(_("invalid use of PROVIDE for dot symbol"));
+
+      // The GNU linker permits assignments to dot outside of SECTIONS
+      // clauses and treats them as occurring inside, so we don't
+      // check in_sections_clause here.
+      this->script_sections_.add_dot_assignment(value);
+    }
+}
+
+// Add an assertion.
+
+void
+Script_options::add_assertion(Expression* check, const char* message,
+                             size_t messagelen)
+{
+  if (this->script_sections_.in_sections_clause())
+    this->script_sections_.add_assertion(check, message, messagelen);
+  else
+    {
+      Script_assertion* p = new Script_assertion(check, message, messagelen);
+      this->assertions_.push_back(p);
+    }
+}
+
+// Create sections required by any linker scripts.
+
+void
+Script_options::create_script_sections(Layout* layout)
+{
+  if (this->saw_sections_clause())
+    this->script_sections_.create_sections(layout);
+}
+
+// Add any symbols we are defining to the symbol table.
+
+void
+Script_options::add_symbols_to_table(Symbol_table* symtab)
+{
+  for (Symbol_assignments::iterator p = this->symbol_assignments_.begin();
+       p != this->symbol_assignments_.end();
+       ++p)
+    (*p)->add_to_table(symtab);
+  this->script_sections_.add_symbols_to_table(symtab);
+}
+
+// Finalize symbol values.  Also check assertions.
+
+void
+Script_options::finalize_symbols(Symbol_table* symtab, const Layout* layout)
+{
+  // We finalize the symbols defined in SECTIONS first, because they
+  // are the ones which may have changed.  This way if symbol outside
+  // SECTIONS are defined in terms of symbols inside SECTIONS, they
+  // will get the right value.
+  this->script_sections_.finalize_symbols(symtab, layout);
+
+  for (Symbol_assignments::iterator p = this->symbol_assignments_.begin();
+       p != this->symbol_assignments_.end();
+       ++p)
+    (*p)->finalize(symtab, layout);
+
+  for (Assertions::iterator p = this->assertions_.begin();
+       p != this->assertions_.end();
+       ++p)
+    (*p)->check(symtab, layout);
+}
+
+// Set section addresses.  We set all the symbols which have absolute
+// values.  Then we let the SECTIONS clause do its thing.  This
+// returns the segment which holds the file header and segment
+// headers, if any.
+
+Output_segment*
+Script_options::set_section_addresses(Symbol_table* symtab, Layout* layout)
+{
+  for (Symbol_assignments::iterator p = this->symbol_assignments_.begin();
+       p != this->symbol_assignments_.end();
+       ++p)
+    (*p)->set_if_absolute(symtab, layout, false, 0);
+
+  return this->script_sections_.set_section_addresses(symtab, layout);
 }
 
 // This class holds data passed through the parser to the lexer and to
@@ -971,13 +1165,16 @@ class Parser_closure
                 bool in_group, bool is_in_sysroot,
                  Command_line* command_line,
                 Script_options* script_options,
-                Lex* lex)
+                Lex* lex,
+                bool skip_on_incompatible_target)
     : filename_(filename), posdep_options_(posdep_options),
       in_group_(in_group), is_in_sysroot_(is_in_sysroot),
+      skip_on_incompatible_target_(skip_on_incompatible_target),
+      found_incompatible_target_(false),
       command_line_(command_line), script_options_(script_options),
       version_script_info_(script_options->version_script_info()),
       lex_(lex), lineno_(0), charpos_(0), lex_mode_stack_(), inputs_(NULL)
-  { 
+  {
     // We start out processing C symbols in the default lex mode.
     language_stack_.push_back("");
     lex_mode_stack_.push_back(lex->mode());
@@ -1005,6 +1202,30 @@ class Parser_closure
   is_in_sysroot() const
   { return this->is_in_sysroot_; }
 
+  // Whether to skip to the next file with the same name if we find an
+  // incompatible target in an OUTPUT_FORMAT statement.
+  bool
+  skip_on_incompatible_target() const
+  { return this->skip_on_incompatible_target_; }
+
+  // Stop skipping to the next file on an incompatible target.  This
+  // is called when we make some unrevocable change to the data
+  // structures.
+  void
+  clear_skip_on_incompatible_target()
+  { this->skip_on_incompatible_target_ = false; }
+
+  // Whether we found an incompatible target in an OUTPUT_FORMAT
+  // statement.
+  bool
+  found_incompatible_target() const
+  { return this->found_incompatible_target_; }
+
+  // Note that we found an incompatible target.
+  void
+  set_found_incompatible_target()
+  { this->found_incompatible_target_ = true; }
+
   // Returns the Command_line structure passed in at constructor time.
   // This value may be NULL.  The caller may modify this, which modifies
   // the passed-in Command_line object (not a copy).
@@ -1105,6 +1326,12 @@ class Parser_closure
   bool in_group_;
   // Whether the script was found in a sysrooted directory.
   bool is_in_sysroot_;
+  // If this is true, then if we find an OUTPUT_FORMAT with an
+  // incompatible target, then we tell the parser to abort so that we
+  // can search for the next file with the same name.
+  bool skip_on_incompatible_target_;
+  // True if we found an OUTPUT_FORMAT with an incompatible target.
+  bool found_incompatible_target_;
   // May be NULL if the user chooses not to pass one in.
   Command_line* command_line_;
   // Options which may be set from any linker script.
@@ -1127,18 +1354,19 @@ class Parser_closure
 };
 
 // FILE was found as an argument on the command line.  Try to read it
-// as a script.  We've already read BYTES of data into P, but we
-// ignore that.  Return true if the file was handled.
+// as a script.  Return true if the file was handled.
 
 bool
-read_input_script(Workqueue* workqueue, const General_options& options,
-                 Symbol_table* symtab, Layout* layout,
-                 Dirsearch* dirsearch, Input_objects* input_objects,
+read_input_script(Workqueue* workqueue, Symbol_table* symtab, Layout* layout,
+                 Dirsearch* dirsearch, int dirindex,
+                 Input_objects* input_objects, Mapfile* mapfile,
                  Input_group* input_group,
                  const Input_argument* input_argument,
-                 Input_file* input_file, const unsigned char*, off_t,
-                 Task_token* this_blocker, Task_token* next_blocker)
+                 Input_file* input_file, Task_token* next_blocker,
+                 bool* used_next_blocker)
 {
+  *used_next_blocker = false;
+
   std::string input_string;
   Lex::read_file(input_file, &input_string);
 
@@ -1150,25 +1378,26 @@ read_input_script(Workqueue* workqueue, const General_options& options,
                         input_file->is_in_sysroot(),
                          NULL,
                         layout->script_options(),
-                        &lex);
+                        &lex,
+                        input_file->will_search_for());
 
   if (yyparse(&closure) != 0)
-    return false;
-
-  // THIS_BLOCKER must be clear before we may add anything to the
-  // symbol table.  We are responsible for unblocking NEXT_BLOCKER
-  // when we are done.  We are responsible for deleting THIS_BLOCKER
-  // when it is unblocked.
-
-  if (!closure.saw_inputs())
     {
-      // The script did not add any files to read.  Note that we are
-      // not permitted to call NEXT_BLOCKER->unblock() here even if
-      // THIS_BLOCKER is NULL, as we do not hold the workqueue lock.
-      workqueue->queue(new Script_unblock(this_blocker, next_blocker));
-      return true;
+      if (closure.found_incompatible_target())
+       {
+         Read_symbols::incompatible_warning(input_argument, input_file);
+         Read_symbols::requeue(workqueue, input_objects, symtab, layout,
+                               dirsearch, dirindex, mapfile, input_argument,
+                               input_group, next_blocker);
+         return true;
+       }
+      return false;
     }
 
+  if (!closure.saw_inputs())
+    return true;
+
+  Task_token* this_blocker = NULL;
   for (Input_arguments::const_iterator p = closure.inputs()->begin();
        p != closure.inputs()->end();
        ++p)
@@ -1181,12 +1410,24 @@ read_input_script(Workqueue* workqueue, const General_options& options,
          nb = new Task_token(true);
          nb->add_blocker();
        }
-      workqueue->queue(new Read_symbols(options, input_objects, symtab,
-                                       layout, dirsearch, &*p,
-                                       input_group, this_blocker, nb));
+      workqueue->queue_soon(new Read_symbols(input_objects, symtab,
+                                            layout, dirsearch, 0, mapfile, &*p,
+                                            input_group, this_blocker, nb));
       this_blocker = nb;
     }
 
+  if (layout->incremental_inputs())
+    {
+      // Like new Read_symbols(...) above, we rely on close.inputs()
+      // getting leaked by closure.
+      Script_info* info = new Script_info(closure.inputs());
+      layout->incremental_inputs()->report_script(
+          input_argument,
+          input_file->file().get_mtime(),
+          info);
+    }
+  *used_next_blocker = true;
+
   return true;
 }
 
@@ -1196,6 +1437,7 @@ read_input_script(Workqueue* workqueue, const General_options& options,
 
 static bool
 read_script_file(const char* filename, Command_line* cmdline,
+                 Script_options* script_options,
                  int first_token, Lex::Mode lex_mode)
 {
   // TODO: if filename is a relative filename, search for it manually
@@ -1207,10 +1449,16 @@ read_script_file(const char* filename, Command_line* cmdline,
   // so we invent a fake value.
   const Task* task = reinterpret_cast<const Task*>(-1);
 
-  Input_file_argument input_argument(filename, false, "",
-                                    cmdline->position_dependent_options());
+  // We don't want this file to be opened in binary mode.
+  Position_dependent_options posdep = cmdline->position_dependent_options();
+  if (posdep.format_enum() == General_options::OBJECT_FORMAT_BINARY)
+    posdep.set_format_enum(General_options::OBJECT_FORMAT_ELF);
+  Input_file_argument input_argument(filename,
+                                    Input_file_argument::INPUT_FILE_TYPE_FILE,
+                                    "", false, posdep);
   Input_file input_file(&input_argument);
-  if (!input_file.open(cmdline->options(), dirsearch, task))
+  int dummy = 0;
+  if (!input_file.open(dirsearch, task, &dummy))
     return false;
 
   std::string input_string;
@@ -1224,8 +1472,9 @@ read_script_file(const char* filename, Command_line* cmdline,
                         false,
                         input_file.is_in_sysroot(),
                          cmdline,
-                        cmdline->script_options(),
-                        &lex);
+                        script_options,
+                        &lex,
+                        false);
   if (yyparse(&closure) != 0)
     {
       input_file.file().unlock(task);
@@ -1245,21 +1494,32 @@ read_script_file(const char* filename, Command_line* cmdline,
 bool
 read_commandline_script(const char* filename, Command_line* cmdline)
 {
-  return read_script_file(filename, cmdline,
+  return read_script_file(filename, cmdline, &cmdline->script_options(),
                           PARSING_LINKER_SCRIPT, Lex::LINKER_SCRIPT);
 }
 
-// FILE was found as an argument to --version-script.  Read it as a
-// version script, and store its contents in
+// FILENAME was found as an argument to --version-script.  Read it as
+// version script, and store its contents in
 // cmdline->script_options()->version_script_info().
 
 bool
 read_version_script(const char* filename, Command_line* cmdline)
 {
-  return read_script_file(filename, cmdline,
+  return read_script_file(filename, cmdline, &cmdline->script_options(),
                           PARSING_VERSION_SCRIPT, Lex::VERSION_SCRIPT);
 }
 
+// FILENAME was found as an argument to --dynamic-list.  Read it as a
+// list of symbols, and store its contents in DYNAMIC_LIST.
+
+bool
+read_dynamic_list(const char* filename, Command_line* cmdline,
+                  Script_options* dynamic_list)
+{
+  return read_script_file(filename, cmdline, dynamic_list,
+                          PARSING_DYNAMIC_LIST, Lex::DYNAMIC_LIST);
+}
+
 // Implement the --defsym option on the command line.  Return true if
 // all is well.
 
@@ -1273,7 +1533,7 @@ Script_options::define_symbol(const char* definition)
   Position_dependent_options posdep_options;
 
   Parser_closure closure("command line", posdep_options, false, false, NULL,
-                        this, &lex);
+                        this, &lex, false);
 
   if (yyparse(&closure) != 0)
     return false;
@@ -1283,6 +1543,32 @@ Script_options::define_symbol(const char* definition)
   return true;
 }
 
+// Print the script to F for debugging.
+
+void
+Script_options::print(FILE* f) const
+{
+  fprintf(f, "%s: Dumping linker script\n", program_name);
+
+  if (!this->entry_.empty())
+    fprintf(f, "ENTRY(%s)\n", this->entry_.c_str());
+
+  for (Symbol_assignments::const_iterator p =
+        this->symbol_assignments_.begin();
+       p != this->symbol_assignments_.end();
+       ++p)
+    (*p)->print(f);
+
+  for (Assertions::const_iterator p = this->assertions_.begin();
+       p != this->assertions_.end();
+       ++p)
+    (*p)->print(f);
+
+  this->script_sections_.print(f);
+
+  this->version_script_info_.print(f);
+}
+
 // Manage mapping from keywords to the codes expected by the bison
 // parser.  We construct one global object for each lex mode with
 // keywords.
@@ -1333,13 +1619,11 @@ script_keyword_parsecodes[] =
   { "BYTE", BYTE },
   { "CONSTANT", CONSTANT },
   { "CONSTRUCTORS", CONSTRUCTORS },
-  { "COPY", COPY },
   { "CREATE_OBJECT_SYMBOLS", CREATE_OBJECT_SYMBOLS },
   { "DATA_SEGMENT_ALIGN", DATA_SEGMENT_ALIGN },
   { "DATA_SEGMENT_END", DATA_SEGMENT_END },
   { "DATA_SEGMENT_RELRO_END", DATA_SEGMENT_RELRO_END },
   { "DEFINED", DEFINED },
-  { "DSECT", DSECT },
   { "ENTRY", ENTRY },
   { "EXCLUDE_FILE", EXCLUDE_FILE },
   { "EXTERN", EXTERN },
@@ -1349,7 +1633,6 @@ script_keyword_parsecodes[] =
   { "GROUP", GROUP },
   { "HLL", HLL },
   { "INCLUDE", INCLUDE },
-  { "INFO", INFO },
   { "INHIBIT_COMMON_ALLOCATION", INHIBIT_COMMON_ALLOCATION },
   { "INPUT", INPUT },
   { "KEEP", KEEP },
@@ -1363,7 +1646,6 @@ script_keyword_parsecodes[] =
   { "NEXT", NEXT },
   { "NOCROSSREFS", NOCROSSREFS },
   { "NOFLOAT", NOFLOAT },
-  { "NOLOAD", NOLOAD },
   { "ONLY_IF_RO", ONLY_IF_RO },
   { "ONLY_IF_RW", ONLY_IF_RW },
   { "OPTION", OPTION },
@@ -1382,6 +1664,7 @@ script_keyword_parsecodes[] =
   { "SHORT", SHORT },
   { "SIZEOF", SIZEOF },
   { "SIZEOF_HEADERS", SIZEOF_HEADERS },
+  { "SORT", SORT_BY_NAME },
   { "SORT_BY_ALIGNMENT", SORT_BY_ALIGNMENT },
   { "SORT_BY_NAME", SORT_BY_NAME },
   { "SPECIAL", SPECIAL },
@@ -1419,6 +1702,19 @@ version_script_keywords(&version_script_keyword_parsecodes[0],
                         (sizeof(version_script_keyword_parsecodes)
                          / sizeof(version_script_keyword_parsecodes[0])));
 
+static const Keyword_to_parsecode::Keyword_parsecode
+dynamic_list_keyword_parsecodes[] =
+{
+  { "extern", EXTERN },
+};
+
+static const Keyword_to_parsecode
+dynamic_list_keywords(&dynamic_list_keyword_parsecodes[0],
+                      (sizeof(dynamic_list_keyword_parsecodes)
+                       / sizeof(dynamic_list_keyword_parsecodes[0])));
+
+
+
 // Comparison function passed to bsearch.
 
 extern "C"
@@ -1464,71 +1760,370 @@ Keyword_to_parsecode::keyword_to_parsecode(const char* keyword,
   return ktt->parsecode;
 }
 
-} // End namespace gold.
-
-// The remaining functions are extern "C", so it's clearer to not put
-// them in namespace gold.
-
-using namespace gold;
-
-// This function is called by the bison parser to return the next
-// token.
+// Helper class that calls cplus_demangle when needed and takes care of freeing
+// the result.
 
-extern "C" int
-yylex(YYSTYPE* lvalp, void* closurev)
+class Lazy_demangler
 {
-  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
-  const Token* token = closure->next_token();
-  switch (token->classification())
-    {
-    default:
-      gold_unreachable();
+ public:
+  Lazy_demangler(const char* symbol, int options)
+    : symbol_(symbol), options_(options), demangled_(NULL), did_demangle_(false)
+  { }
 
-    case Token::TOKEN_INVALID:
-      yyerror(closurev, "invalid character");
-      return 0;
+  ~Lazy_demangler()
+  { free(this->demangled_); }
 
-    case Token::TOKEN_EOF:
-      return 0;
+  // Return the demangled name. The actual demangling happens on the first call,
+  // and the result is later cached.
 
-    case Token::TOKEN_STRING:
-      {
-       // This is either a keyword or a STRING.
-       size_t len;
-       const char* str = token->string_value(&len);
-       int parsecode = 0;
-        switch (closure->lex_mode())
-          {
-          case Lex::LINKER_SCRIPT:
-            parsecode = script_keywords.keyword_to_parsecode(str, len);
-            break;
-          case Lex::VERSION_SCRIPT:
-            parsecode = version_script_keywords.keyword_to_parsecode(str, len);
-            break;
-          default:
-            break;
-          }
-       if (parsecode != 0)
-         return parsecode;
-       lvalp->string.value = str;
-       lvalp->string.length = len;
-       return STRING;
-      }
+  inline char*
+  get();
 
-    case Token::TOKEN_QUOTED_STRING:
-      lvalp->string.value = token->string_value(&lvalp->string.length);
-      return STRING;
+ private:
+  // The symbol to demangle.
+  const char *symbol_;
+  // Option flags to pass to cplus_demagle.
+  const int options_;
+  // The cached demangled value, or NULL if demangling didn't happen yet or
+  // failed.
+  char *demangled_;
+  // Whether we already called cplus_demangle
+  bool did_demangle_;
+};
 
-    case Token::TOKEN_OPERATOR:
-      return token->operator_value();
+// Return the demangled name. The actual demangling happens on the first call,
+// and the result is later cached. Returns NULL if the symbol cannot be
+// demangled.
 
-    case Token::TOKEN_INTEGER:
-      lvalp->integer = token->integer_value();
-      return INTEGER;
+inline char*
+Lazy_demangler::get()
+{
+  if (!this->did_demangle_)
+    {
+      this->demangled_ = cplus_demangle(this->symbol_, this->options_);
+      this->did_demangle_ = true;
     }
+  return this->demangled_;
 }
 
-// This function is called by the bison parser to report an error.
+// The following structs are used within the VersionInfo class as well
+// as in the bison helper functions.  They store the information
+// parsed from the version script.
+
+// A single version expression.
+// For example, pattern="std::map*" and language="C++".
+// pattern and language should be from the stringpool
+struct Version_expression {
+  Version_expression(const std::string& pattern,
+                     const std::string& language,
+                     bool exact_match)
+      : pattern(pattern), language(language), exact_match(exact_match) {}
+
+  std::string pattern;
+  std::string language;
+  // If false, we use glob() to match pattern.  If true, we use strcmp().
+  bool exact_match;
+};
+
+
+// A list of expressions.
+struct Version_expression_list {
+  std::vector<struct Version_expression> expressions;
+};
+
+
+// A list of which versions upon which another version depends.
+// Strings should be from the Stringpool.
+struct Version_dependency_list {
+  std::vector<std::string> dependencies;
+};
+
+
+// The total definition of a version.  It includes the tag for the
+// version, its global and local expressions, and any dependencies.
+struct Version_tree {
+  Version_tree()
+      : tag(), global(NULL), local(NULL), dependencies(NULL) {}
+
+  std::string tag;
+  const struct Version_expression_list* global;
+  const struct Version_expression_list* local;
+  const struct Version_dependency_list* dependencies;
+};
+
+Version_script_info::~Version_script_info()
+{
+  this->clear();
+}
+
+void
+Version_script_info::clear()
+{
+  for (size_t k = 0; k < dependency_lists_.size(); ++k)
+    delete dependency_lists_[k];
+  this->dependency_lists_.clear();
+  for (size_t k = 0; k < version_trees_.size(); ++k)
+    delete version_trees_[k];
+  this->version_trees_.clear();
+  for (size_t k = 0; k < expression_lists_.size(); ++k)
+    delete expression_lists_[k];
+  this->expression_lists_.clear();
+}
+
+std::vector<std::string>
+Version_script_info::get_versions() const
+{
+  std::vector<std::string> ret;
+  for (size_t j = 0; j < version_trees_.size(); ++j)
+    if (!this->version_trees_[j]->tag.empty())
+      ret.push_back(this->version_trees_[j]->tag);
+  return ret;
+}
+
+std::vector<std::string>
+Version_script_info::get_dependencies(const char* version) const
+{
+  std::vector<std::string> ret;
+  for (size_t j = 0; j < version_trees_.size(); ++j)
+    if (version_trees_[j]->tag == version)
+      {
+        const struct Version_dependency_list* deps =
+          version_trees_[j]->dependencies;
+        if (deps != NULL)
+          for (size_t k = 0; k < deps->dependencies.size(); ++k)
+            ret.push_back(deps->dependencies[k]);
+        return ret;
+      }
+  return ret;
+}
+
+// Look up SYMBOL_NAME in the list of versions.  If CHECK_GLOBAL is
+// true look at the globally visible symbols, otherwise look at the
+// symbols listed as "local:".  Return true if the symbol is found,
+// false otherwise.  If the symbol is found, then if PVERSION is not
+// NULL, set *PVERSION to the version.
+
+bool
+Version_script_info::get_symbol_version_helper(const char* symbol_name,
+                                               bool check_global,
+                                              std::string* pversion) const
+{
+  Lazy_demangler cpp_demangled_name(symbol_name, DMGL_ANSI | DMGL_PARAMS);
+  Lazy_demangler java_demangled_name(symbol_name,
+                                     DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA);
+  for (size_t j = 0; j < version_trees_.size(); ++j)
+    {
+      // Is it a global symbol for this version?
+      const Version_expression_list* explist =
+          check_global ? version_trees_[j]->global : version_trees_[j]->local;
+      if (explist != NULL)
+        for (size_t k = 0; k < explist->expressions.size(); ++k)
+          {
+            const char* name_to_match = symbol_name;
+            const struct Version_expression& exp = explist->expressions[k];
+            if (exp.language == "C++")
+              {
+                name_to_match = cpp_demangled_name.get();
+                // This isn't a C++ symbol.
+                if (name_to_match == NULL)
+                  continue;
+              }
+            else if (exp.language == "Java")
+              {
+                name_to_match = java_demangled_name.get();
+                // This isn't a Java symbol.
+                if (name_to_match == NULL)
+                  continue;
+              }
+            bool matched;
+            if (exp.exact_match)
+              matched = strcmp(exp.pattern.c_str(), name_to_match) == 0;
+            else
+              matched = fnmatch(exp.pattern.c_str(), name_to_match,
+                                FNM_NOESCAPE) == 0;
+            if (matched)
+             {
+               if (pversion != NULL)
+                 *pversion = this->version_trees_[j]->tag;
+               return true;
+             }
+          }
+    }
+  return false;
+}
+
+struct Version_dependency_list*
+Version_script_info::allocate_dependency_list()
+{
+  dependency_lists_.push_back(new Version_dependency_list);
+  return dependency_lists_.back();
+}
+
+struct Version_expression_list*
+Version_script_info::allocate_expression_list()
+{
+  expression_lists_.push_back(new Version_expression_list);
+  return expression_lists_.back();
+}
+
+struct Version_tree*
+Version_script_info::allocate_version_tree()
+{
+  version_trees_.push_back(new Version_tree);
+  return version_trees_.back();
+}
+
+// Print for debugging.
+
+void
+Version_script_info::print(FILE* f) const
+{
+  if (this->empty())
+    return;
+
+  fprintf(f, "VERSION {");
+
+  for (size_t i = 0; i < this->version_trees_.size(); ++i)
+    {
+      const Version_tree* vt = this->version_trees_[i];
+
+      if (vt->tag.empty())
+       fprintf(f, "  {\n");
+      else
+       fprintf(f, "  %s {\n", vt->tag.c_str());
+
+      if (vt->global != NULL)
+       {
+         fprintf(f, "    global :\n");
+         this->print_expression_list(f, vt->global);
+       }
+
+      if (vt->local != NULL)
+       {
+         fprintf(f, "    local :\n");
+         this->print_expression_list(f, vt->local);
+       }
+
+      fprintf(f, "  }");
+      if (vt->dependencies != NULL)
+       {
+         const Version_dependency_list* deps = vt->dependencies;
+         for (size_t j = 0; j < deps->dependencies.size(); ++j)
+           {
+             if (j < deps->dependencies.size() - 1)
+               fprintf(f, "\n");
+             fprintf(f, "    %s", deps->dependencies[j].c_str());
+           }
+       }
+      fprintf(f, ";\n");
+    }
+
+  fprintf(f, "}\n");
+}
+
+void
+Version_script_info::print_expression_list(
+    FILE* f,
+    const Version_expression_list* vel) const
+{
+  std::string current_language;
+  for (size_t i = 0; i < vel->expressions.size(); ++i)
+    {
+      const Version_expression& ve(vel->expressions[i]);
+
+      if (ve.language != current_language)
+       {
+         if (!current_language.empty())
+           fprintf(f, "      }\n");
+         fprintf(f, "      extern \"%s\" {\n", ve.language.c_str());
+         current_language = ve.language;
+       }
+
+      fprintf(f, "      ");
+      if (!current_language.empty())
+       fprintf(f, "  ");
+
+      if (ve.exact_match)
+       fprintf(f, "\"");
+      fprintf(f, "%s", ve.pattern.c_str());
+      if (ve.exact_match)
+       fprintf(f, "\"");
+
+      fprintf(f, "\n");
+    }
+
+  if (!current_language.empty())
+    fprintf(f, "      }\n");
+}
+
+} // End namespace gold.
+
+// The remaining functions are extern "C", so it's clearer to not put
+// them in namespace gold.
+
+using namespace gold;
+
+// This function is called by the bison parser to return the next
+// token.
+
+extern "C" int
+yylex(YYSTYPE* lvalp, void* closurev)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  const Token* token = closure->next_token();
+  switch (token->classification())
+    {
+    default:
+      gold_unreachable();
+
+    case Token::TOKEN_INVALID:
+      yyerror(closurev, "invalid character");
+      return 0;
+
+    case Token::TOKEN_EOF:
+      return 0;
+
+    case Token::TOKEN_STRING:
+      {
+       // This is either a keyword or a STRING.
+       size_t len;
+       const char* str = token->string_value(&len);
+       int parsecode = 0;
+        switch (closure->lex_mode())
+          {
+          case Lex::LINKER_SCRIPT:
+            parsecode = script_keywords.keyword_to_parsecode(str, len);
+            break;
+          case Lex::VERSION_SCRIPT:
+            parsecode = version_script_keywords.keyword_to_parsecode(str, len);
+            break;
+          case Lex::DYNAMIC_LIST:
+            parsecode = dynamic_list_keywords.keyword_to_parsecode(str, len);
+            break;
+          default:
+            break;
+          }
+       if (parsecode != 0)
+         return parsecode;
+       lvalp->string.value = str;
+       lvalp->string.length = len;
+       return STRING;
+      }
+
+    case Token::TOKEN_QUOTED_STRING:
+      lvalp->string.value = token->string_value(&lvalp->string.length);
+      return QUOTED_STRING;
+
+    case Token::TOKEN_OPERATOR:
+      return token->operator_value();
+
+    case Token::TOKEN_INTEGER:
+      lvalp->integer = token->integer_value();
+      return INTEGER;
+    }
+}
+
+// This function is called by the bison parser to report an error.
 
 extern "C" void
 yyerror(void* closurev, const char* message)
@@ -1538,6 +2133,19 @@ yyerror(void* closurev, const char* message)
             closure->charpos(), message);
 }
 
+// Called by the bison parser to add an external symbol to the link.
+
+extern "C" void
+script_add_extern(void* closurev, const char* name, size_t length)
+{
+  // We treat exactly like -u NAME.  FIXME: If it seems useful, we
+  // could handle this after the command line has been read, by adding
+  // entries to the symbol table directly.
+  std::string arg("--undefined=");
+  arg.append(name, length);
+  script_parse_option(closurev, arg.c_str(), arg.size());
+}
+
 // Called by the bison parser to add a file to the link.
 
 extern "C" void
@@ -1556,7 +2164,7 @@ script_add_file(void* closurev, const char* name, size_t length)
     {
       if (closure->is_in_sysroot())
        {
-         const std::string& sysroot(parameters->sysroot());
+         const std::string& sysroot(parameters->options().sysroot());
          gold_assert(!sysroot.empty());
          name_string = sysroot + name_string;
        }
@@ -1574,7 +2182,9 @@ script_add_file(void* closurev, const char* name, size_t length)
        }
     }
 
-  Input_file_argument file(name_string.c_str(), false, extra_search_path,
+  Input_file_argument file(name_string.c_str(),
+                          Input_file_argument::INPUT_FILE_TYPE_FILE,
+                          extra_search_path, false,
                           closure->position_dependent_options());
   closure->inputs()->add_file(file);
 }
@@ -1614,7 +2224,7 @@ extern "C" void
 script_start_as_needed(void* closurev)
 {
   Parser_closure* closure = static_cast<Parser_closure*>(closurev);
-  closure->position_dependent_options().set_as_needed();
+  closure->position_dependent_options().set_as_needed(true);
 }
 
 // Called by the bison parser at the end of an AS_NEEDED list.
@@ -1623,7 +2233,7 @@ extern "C" void
 script_end_as_needed(void* closurev)
 {
   Parser_closure* closure = static_cast<Parser_closure*>(closurev);
-  closure->position_dependent_options().clear_as_needed();
+  closure->position_dependent_options().set_as_needed(false);
 }
 
 // Called by the bison parser to set the entry symbol.
@@ -1631,8 +2241,20 @@ script_end_as_needed(void* closurev)
 extern "C" void
 script_set_entry(void* closurev, const char* entry, size_t length)
 {
-  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
-  closure->script_options()->set_entry(entry, length);
+  // We'll parse this exactly the same as --entry=ENTRY on the commandline
+  // TODO(csilvers): FIXME -- call set_entry directly.
+  std::string arg("--entry=");
+  arg.append(entry, length);
+  script_parse_option(closurev, arg.c_str(), arg.size());
+}
+
+// Called by the bison parser to set whether to define common symbols.
+
+extern "C" void
+script_set_common_allocation(void* closurev, int set)
+{
+  const char* arg = set != 0 ? "--define-common" : "--no-define-common";
+  script_parse_option(closurev, arg, strlen(arg));
 }
 
 // Called by the bison parser to define a symbol.
@@ -1646,6 +2268,18 @@ script_set_symbol(void* closurev, const char* name, size_t length,
   const bool hidden = hiddeni != 0;
   closure->script_options()->add_symbol_assignment(name, length, value,
                                                   provide, hidden);
+  closure->clear_skip_on_incompatible_target();
+}
+
+// Called by the bison parser to add an assertion.
+
+extern "C" void
+script_add_assertion(void* closurev, Expression* check, const char* message,
+                    size_t messagelen)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  closure->script_options()->add_assertion(check, message, messagelen);
+  closure->clear_skip_on_incompatible_target();
 }
 
 // Called by the bison parser to parse an OPTION.
@@ -1667,185 +2301,101 @@ script_parse_option(void* closurev, const char* option, size_t length)
   else
     {
       bool past_a_double_dash_option = false;
-      char* mutable_option = strndup(option, length);
+      const char* mutable_option = strndup(option, length);
       gold_assert(mutable_option != NULL);
       closure->command_line()->process_one_option(1, &mutable_option, 0,
                                                   &past_a_double_dash_option);
-      free(mutable_option);
+      // The General_options class will quite possibly store a pointer
+      // into mutable_option, so we can't free it.  In cases the class
+      // does not store such a pointer, this is a memory leak.  Alas. :(
     }
+  closure->clear_skip_on_incompatible_target();
 }
 
-/* Called by the bison parser to push the lexer into expression
-   mode.  */
+// Called by the bison parser to handle OUTPUT_FORMAT.  OUTPUT_FORMAT
+// takes either one or three arguments.  In the three argument case,
+// the format depends on the endianness option, which we don't
+// currently support (FIXME).  If we see an OUTPUT_FORMAT for the
+// wrong format, then we want to search for a new file.  Returning 0
+// here will cause the parser to immediately abort.
 
-extern void
-script_push_lex_into_expression_mode(void* closurev)
+extern "C" int
+script_check_output_format(void* closurev,
+                          const char* default_name, size_t default_length,
+                          const char*, size_t, const char*, size_t)
 {
   Parser_closure* closure = static_cast<Parser_closure*>(closurev);
-  closure->push_lex_mode(Lex::EXPRESSION);
+  std::string name(default_name, default_length);
+  Target* target = select_target_by_name(name.c_str());
+  if (target == NULL || !parameters->is_compatible_target(target))
+    {
+      if (closure->skip_on_incompatible_target())
+       {
+         closure->set_found_incompatible_target();
+         return 0;
+       }
+      // FIXME: Should we warn about the unknown target?
+    }
+  return 1;
 }
 
-/* Called by the bison parser to push the lexer into version
-   mode.  */
+// Called by the bison parser to handle TARGET.
 
-extern void
-script_push_lex_into_version_mode(void* closurev)
+extern "C" void
+script_set_target(void* closurev, const char* target, size_t len)
 {
   Parser_closure* closure = static_cast<Parser_closure*>(closurev);
-  closure->push_lex_mode(Lex::VERSION_SCRIPT);
+  std::string s(target, len);
+  General_options::Object_format format_enum;
+  format_enum = General_options::string_to_object_format(s.c_str());
+  closure->position_dependent_options().set_format_enum(format_enum);
 }
 
-/* Called by the bison parser to pop the lexer mode.  */
+// Called by the bison parser to handle SEARCH_DIR.  This is handled
+// exactly like a -L option.
 
-extern void
-script_pop_lex_mode(void* closurev)
+extern "C" void
+script_add_search_dir(void* closurev, const char* option, size_t length)
 {
   Parser_closure* closure = static_cast<Parser_closure*>(closurev);
-  closure->pop_lex_mode();
-}
-
-// The following structs are used within the VersionInfo class as well
-// as in the bison helper functions.  They store the information
-// parsed from the version script.
-
-// A single version expression.
-// For example, pattern="std::map*" and language="C++".
-// pattern and language should be from the stringpool
-struct Version_expression {
-  Version_expression(const std::string& pattern,
-                     const std::string& language)
-      : pattern(pattern), language(language) {}
-
-  std::string pattern;
-  std::string language;
-};
-
-
-// A list of expressions.
-struct Version_expression_list {
-  std::vector<struct Version_expression> expressions;
-};
-
-
-// A list of which versions upon which another version depends.
-// Strings should be from the Stringpool.
-struct Version_dependency_list {
-  std::vector<std::string> dependencies;
-};
-
-
-// The total definition of a version.  It includes the tag for the
-// version, its global and local expressions, and any dependencies.
-struct Version_tree {
-  Version_tree()
-      : tag(), global(NULL), local(NULL), dependencies(NULL) {}
-
-  std::string tag;
-  const struct Version_expression_list* global;
-  const struct Version_expression_list* local;
-  const struct Version_dependency_list* dependencies;
-};
-
-Version_script_info::~Version_script_info()
-{
-  for (size_t k = 0; k < dependency_lists_.size(); ++k)
-    delete dependency_lists_[k];
-  for (size_t k = 0; k < version_trees_.size(); ++k)
-    delete version_trees_[k];
-  for (size_t k = 0; k < expression_lists_.size(); ++k)
-    delete expression_lists_[k];
+  if (closure->command_line() == NULL)
+    gold_warning(_("%s:%d:%d: ignoring SEARCH_DIR; SEARCH_DIR is only valid"
+                  " for scripts specified via -T/--script"),
+                closure->filename(), closure->lineno(), closure->charpos());
+  else
+    {
+      std::string s = "-L" + std::string(option, length);
+      script_parse_option(closurev, s.c_str(), s.size());
+    }
 }
 
-std::vector<std::string>
-Version_script_info::get_versions() const
-{
-  std::vector<std::string> ret;
-  for (size_t j = 0; j < version_trees_.size(); ++j)
-    ret.push_back(version_trees_[j]->tag);
-  return ret;
-}
+/* Called by the bison parser to push the lexer into expression
+   mode.  */
 
-std::vector<std::string>
-Version_script_info::get_dependencies(const char* version) const
+extern "C" void
+script_push_lex_into_expression_mode(void* closurev)
 {
-  std::vector<std::string> ret;
-  for (size_t j = 0; j < version_trees_.size(); ++j)
-    if (version_trees_[j]->tag == version)
-      {
-        const struct Version_dependency_list* deps =
-          version_trees_[j]->dependencies;
-        if (deps != NULL)
-          for (size_t k = 0; k < deps->dependencies.size(); ++k)
-            ret.push_back(deps->dependencies[k]);
-        return ret;
-      }
-  return ret;
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  closure->push_lex_mode(Lex::EXPRESSION);
 }
 
-const std::string&
-Version_script_info::get_symbol_version_helper(const char* symbol_name,
-                                               bool check_global) const
-{
-  for (size_t j = 0; j < version_trees_.size(); ++j)
-    {
-      // Is it a global symbol for this version?
-      const Version_expression_list* exp =
-          check_global ? version_trees_[j]->global : version_trees_[j]->local;
-      if (exp != NULL)
-        for (size_t k = 0; k < exp->expressions.size(); ++k)
-          {
-            const char* name_to_match = symbol_name;
-            char* demangled_name = NULL;
-            if (exp->expressions[k].language == "C++")
-              {
-                demangled_name = cplus_demangle(symbol_name,
-                                                DMGL_ANSI | DMGL_PARAMS);
-                // This isn't a C++ symbol.
-                if (demangled_name == NULL)
-                  continue;
-                name_to_match = demangled_name;
-              }
-            else if (exp->expressions[k].language == "Java")
-              {
-                demangled_name = cplus_demangle(symbol_name,
-                                                (DMGL_ANSI | DMGL_PARAMS
-                                                | DMGL_JAVA));
-                // This isn't a Java symbol.
-                if (demangled_name == NULL)
-                  continue;
-                name_to_match = demangled_name;
-              }
-            bool matched = fnmatch(exp->expressions[k].pattern.c_str(),
-                                   name_to_match, FNM_NOESCAPE) == 0;
-            if (demangled_name != NULL)
-              free(demangled_name);
-            if (matched)
-              return version_trees_[j]->tag;
-          }
-    }
-  static const std::string empty = "";
-  return empty;
-}
+/* Called by the bison parser to push the lexer into version
+   mode.  */
 
-struct Version_dependency_list*
-Version_script_info::allocate_dependency_list()
+extern "C" void
+script_push_lex_into_version_mode(void* closurev)
 {
-  dependency_lists_.push_back(new Version_dependency_list);
-  return dependency_lists_.back();
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  closure->push_lex_mode(Lex::VERSION_SCRIPT);
 }
 
-struct Version_expression_list*
-Version_script_info::allocate_expression_list()
-{
-  expression_lists_.push_back(new Version_expression_list);
-  return expression_lists_.back();
-}
+/* Called by the bison parser to pop the lexer mode.  */
 
-struct Version_tree*
-Version_script_info::allocate_version_tree()
+extern "C" void
+script_pop_lex_mode(void* closurev)
 {
-  version_trees_.push_back(new Version_tree);
-  return version_trees_.back();
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  closure->pop_lex_mode();
 }
 
 // Register an entire version node. For example:
@@ -1866,9 +2416,9 @@ script_register_vers_node(void*,
                          struct Version_dependency_list *deps)
 {
   gold_assert(tree != NULL);
-  gold_assert(tag != NULL);
   tree->dependencies = deps;
-  tree->tag = std::string(tag, taglen);
+  if (tag != NULL)
+    tree->tag = std::string(tag, taglen);
 }
 
 // Add a dependencies to the list of existing dependencies, if any,
@@ -1893,17 +2443,32 @@ script_add_vers_depend(void* closurev,
 extern "C" struct Version_expression_list *
 script_new_vers_pattern(void* closurev,
                        struct Version_expression_list *expressions,
-                       const char *pattern, int patlen)
+                       const char *pattern, int patlen, int exact_match)
 {
   Parser_closure* closure = static_cast<Parser_closure*>(closurev);
   if (expressions == NULL)
     expressions = closure->version_script()->allocate_expression_list();
   expressions->expressions.push_back(
       Version_expression(std::string(pattern, patlen),
-                         closure->get_current_language()));
+                         closure->get_current_language(),
+                         static_cast<bool>(exact_match)));
   return expressions;
 }
 
+// Attaches b to the end of a, and clears b.  So a = a + b and b = {}.
+
+extern "C" struct Version_expression_list*
+script_merge_expressions(struct Version_expression_list *a,
+                         struct Version_expression_list *b)
+{
+  a->expressions.insert(a->expressions.end(),
+                        b->expressions.begin(), b->expressions.end());
+  // We could delete b and remove it from expressions_lists_, but
+  // that's a lot of work.  This works just as well.
+  b->expressions.clear();
+  return a;
+}
+
 // Combine the global and local expressions into a a Version_tree.
 
 extern "C" struct Version_tree *
@@ -1918,7 +2483,7 @@ script_new_vers_node(void* closurev,
   return tree;
 }
 
-// Handle a transition in language, such as at the 
+// Handle a transition in language, such as at the
 // start or end of 'extern "C++"'
 
 extern "C" void
@@ -1934,3 +2499,251 @@ version_script_pop_lang(void* closurev)
   Parser_closure* closure = static_cast<Parser_closure*>(closurev);
   closure->pop_language();
 }
+
+// Called by the bison parser to start a SECTIONS clause.
+
+extern "C" void
+script_start_sections(void* closurev)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  closure->script_options()->script_sections()->start_sections();
+  closure->clear_skip_on_incompatible_target();
+}
+
+// Called by the bison parser to finish a SECTIONS clause.
+
+extern "C" void
+script_finish_sections(void* closurev)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  closure->script_options()->script_sections()->finish_sections();
+}
+
+// Start processing entries for an output section.
+
+extern "C" void
+script_start_output_section(void* closurev, const char* name, size_t namelen,
+                           const struct Parser_output_section_header* header)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  closure->script_options()->script_sections()->start_output_section(name,
+                                                                    namelen,
+                                                                    header);
+}
+
+// Finish processing entries for an output section.
+
+extern "C" void
+script_finish_output_section(void* closurev,
+                            const struct Parser_output_section_trailer* trail)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  closure->script_options()->script_sections()->finish_output_section(trail);
+}
+
+// Add a data item (e.g., "WORD (0)") to the current output section.
+
+extern "C" void
+script_add_data(void* closurev, int data_token, Expression* val)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  int size;
+  bool is_signed = true;
+  switch (data_token)
+    {
+    case QUAD:
+      size = 8;
+      is_signed = false;
+      break;
+    case SQUAD:
+      size = 8;
+      break;
+    case LONG:
+      size = 4;
+      break;
+    case SHORT:
+      size = 2;
+      break;
+    case BYTE:
+      size = 1;
+      break;
+    default:
+      gold_unreachable();
+    }
+  closure->script_options()->script_sections()->add_data(size, is_signed, val);
+}
+
+// Add a clause setting the fill value to the current output section.
+
+extern "C" void
+script_add_fill(void* closurev, Expression* val)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  closure->script_options()->script_sections()->add_fill(val);
+}
+
+// Add a new input section specification to the current output
+// section.
+
+extern "C" void
+script_add_input_section(void* closurev,
+                        const struct Input_section_spec* spec,
+                        int keepi)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  bool keep = keepi != 0;
+  closure->script_options()->script_sections()->add_input_section(spec, keep);
+}
+
+// When we see DATA_SEGMENT_ALIGN we record that following output
+// sections may be relro.
+
+extern "C" void
+script_data_segment_align(void* closurev)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  if (!closure->script_options()->saw_sections_clause())
+    gold_error(_("%s:%d:%d: DATA_SEGMENT_ALIGN not in SECTIONS clause"),
+              closure->filename(), closure->lineno(), closure->charpos());
+  else
+    closure->script_options()->script_sections()->data_segment_align();
+}
+
+// When we see DATA_SEGMENT_RELRO_END we know that all output sections
+// since DATA_SEGMENT_ALIGN should be relro.
+
+extern "C" void
+script_data_segment_relro_end(void* closurev)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  if (!closure->script_options()->saw_sections_clause())
+    gold_error(_("%s:%d:%d: DATA_SEGMENT_ALIGN not in SECTIONS clause"),
+              closure->filename(), closure->lineno(), closure->charpos());
+  else
+    closure->script_options()->script_sections()->data_segment_relro_end();
+}
+
+// Create a new list of string/sort pairs.
+
+extern "C" String_sort_list_ptr
+script_new_string_sort_list(const struct Wildcard_section* string_sort)
+{
+  return new String_sort_list(1, *string_sort);
+}
+
+// Add an entry to a list of string/sort pairs.  The way the parser
+// works permits us to simply modify the first parameter, rather than
+// copy the vector.
+
+extern "C" String_sort_list_ptr
+script_string_sort_list_add(String_sort_list_ptr pv,
+                           const struct Wildcard_section* string_sort)
+{
+  if (pv == NULL)
+    return script_new_string_sort_list(string_sort);
+  else
+    {
+      pv->push_back(*string_sort);
+      return pv;
+    }
+}
+
+// Create a new list of strings.
+
+extern "C" String_list_ptr
+script_new_string_list(const char* str, size_t len)
+{
+  return new String_list(1, std::string(str, len));
+}
+
+// Add an element to a list of strings.  The way the parser works
+// permits us to simply modify the first parameter, rather than copy
+// the vector.
+
+extern "C" String_list_ptr
+script_string_list_push_back(String_list_ptr pv, const char* str, size_t len)
+{
+  if (pv == NULL)
+    return script_new_string_list(str, len);
+  else
+    {
+      pv->push_back(std::string(str, len));
+      return pv;
+    }
+}
+
+// Concatenate two string lists.  Either or both may be NULL.  The way
+// the parser works permits us to modify the parameters, rather than
+// copy the vector.
+
+extern "C" String_list_ptr
+script_string_list_append(String_list_ptr pv1, String_list_ptr pv2)
+{
+  if (pv1 == NULL)
+    return pv2;
+  if (pv2 == NULL)
+    return pv1;
+  pv1->insert(pv1->end(), pv2->begin(), pv2->end());
+  return pv1;
+}
+
+// Add a new program header.
+
+extern "C" void
+script_add_phdr(void* closurev, const char* name, size_t namelen,
+               unsigned int type, const Phdr_info* info)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  bool includes_filehdr = info->includes_filehdr != 0;
+  bool includes_phdrs = info->includes_phdrs != 0;
+  bool is_flags_valid = info->is_flags_valid != 0;
+  Script_sections* ss = closure->script_options()->script_sections();
+  ss->add_phdr(name, namelen, type, includes_filehdr, includes_phdrs,
+              is_flags_valid, info->flags, info->load_address);
+  closure->clear_skip_on_incompatible_target();
+}
+
+// Convert a program header string to a type.
+
+#define PHDR_TYPE(NAME) { #NAME, sizeof(#NAME) - 1, elfcpp::NAME }
+
+static struct
+{
+  const char* name;
+  size_t namelen;
+  unsigned int val;
+} phdr_type_names[] =
+{
+  PHDR_TYPE(PT_NULL),
+  PHDR_TYPE(PT_LOAD),
+  PHDR_TYPE(PT_DYNAMIC),
+  PHDR_TYPE(PT_INTERP),
+  PHDR_TYPE(PT_NOTE),
+  PHDR_TYPE(PT_SHLIB),
+  PHDR_TYPE(PT_PHDR),
+  PHDR_TYPE(PT_TLS),
+  PHDR_TYPE(PT_GNU_EH_FRAME),
+  PHDR_TYPE(PT_GNU_STACK),
+  PHDR_TYPE(PT_GNU_RELRO)
+};
+
+extern "C" unsigned int
+script_phdr_string_to_type(void* closurev, const char* name, size_t namelen)
+{
+  for (unsigned int i = 0;
+       i < sizeof(phdr_type_names) / sizeof(phdr_type_names[0]);
+       ++i)
+    if (namelen == phdr_type_names[i].namelen
+       && strncmp(name, phdr_type_names[i].name, namelen) == 0)
+      return phdr_type_names[i].val;
+  yyerror(closurev, _("unknown PHDR type (try integer)"));
+  return elfcpp::PT_NULL;
+}
+
+extern "C" void
+script_saw_segment_start_expression(void* closurev)
+{
+  Parser_closure* closure = static_cast<Parser_closure*>(closurev);
+  Script_sections* ss = closure->script_options()->script_sections();
+  ss->set_saw_segment_start_expression(true);
+}
This page took 0.049605 seconds and 4 git commands to generate.