// 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)
case '~':
return this->mode_ == LINKER_SCRIPT && can_continue_name(&c2);
- case '*': case '[':
+ case '*': case '[':
return (this->mode_ == VERSION_SCRIPT
+ || this->mode_ == DYNAMIC_LIST
|| (this->mode_ == LINKER_SCRIPT
&& can_continue_name(&c2)));
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 ',':
return NULL;
case '[': case ']': case '*': case '?': case '-':
- if (this->mode_ == LINKER_SCRIPT || this->mode_ == VERSION_SCRIPT)
+ 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.
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());
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
false,
input_file.is_in_sysroot(),
cmdline,
- &cmdline->script_options(),
+ script_options,
&lex);
if (yyparse(&closure) != 0)
{
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
+// a 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.
(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"
return ktt->parsecode;
}
+// Helper class that calls cplus_demangle when needed and takes care of freeing
+// the result.
+
+class Lazy_demangler
+{
+ public:
+ Lazy_demangler(const char* symbol, int options)
+ : symbol_(symbol), options_(options), demangled_(NULL), did_demangle_(false)
+ { }
+
+ ~Lazy_demangler()
+ { free(this->demangled_); }
+
+ // Return the demangled name. The actual demangling happens on the first call,
+ // and the result is later cached.
+
+ inline char*
+ get();
+
+ 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_;
+};
+
+// 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.
+
+inline char*
+Lazy_demangler::get()
+{
+ if (!this->did_demangle_)
+ {
+ this->demangled_ = cplus_demangle(this->symbol_, this->options_);
+ this->did_demangle_ = true;
+ }
+ return this->demangled_;
+}
+
// 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.
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 char* name_to_match = symbol_name;
const struct Version_expression& exp = explist->expressions[k];
- char* demangled_name = NULL;
if (exp.language == "C++")
{
- demangled_name = cplus_demangle(symbol_name,
- DMGL_ANSI | DMGL_PARAMS);
+ name_to_match = cpp_demangled_name.get();
// This isn't a C++ symbol.
- if (demangled_name == NULL)
+ if (name_to_match == NULL)
continue;
- name_to_match = demangled_name;
}
else if (exp.language == "Java")
{
- demangled_name = cplus_demangle(symbol_name,
- (DMGL_ANSI | DMGL_PARAMS
- | DMGL_JAVA));
+ name_to_match = java_demangled_name.get();
// This isn't a Java symbol.
- if (demangled_name == NULL)
+ if (name_to_match == NULL)
continue;
- name_to_match = demangled_name;
}
bool matched;
if (exp.exact_match)
else
matched = fnmatch(exp.pattern.c_str(), name_to_match,
FNM_NOESCAPE) == 0;
- if (demangled_name != NULL)
- free(demangled_name);
if (matched)
{
if (pversion != NULL)
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;
}
// Finish processing entries for an output section.
extern "C" void
-script_finish_output_section(void* closurev,
+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()->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
projects / binutils-gdb.git / blobdiff