From b4e7ff5caab65d0e78963576e194c2514b39eaf5 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 24 Mar 2008 03:48:29 +0000 Subject: * options.cc: Include "demangle.h". (parse_optional_string): New function. (parse_long_option): Handle takes_optional_argument. (parse_short_option): Update dash_z initializer. Handle takes_optional_argument. (General_options::General_options): Initialize do_demangle_. (General_options::finalize): Set do_demangle_. Handle demangling style. * options.h (parse_optional_string): Declare. (struct One_option): Add optional_arg field. Update constructor. Update call constructor calls. Add takes_optional_argument function. (DEFINE_var): Add optional_arg__ parameter. Change all callers. (DEFINE_optional_string): Define. (General_options::demangle): Change from DEFINE_bool to DEFINE_optional_string. (General_options::no_demangle): New function. (General_options::do_demangle): New function. (General_options::set_do_demangle): New function. (General_options::execstack_status_): Move definition to end of class definition. (General_options::static_): Likewise. (General_options::do_demangle_): New field. * object.cc (big_endian>::get_symbol_location_info): Call Options::do_demangle, not Options::demangle. * symtab.cc (demangle): Likewise. --- gold/symtab.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gold/symtab.cc') diff --git a/gold/symtab.cc b/gold/symtab.cc index b32dcb474f..eef3a4b67d 100644 --- a/gold/symtab.cc +++ b/gold/symtab.cc @@ -79,7 +79,7 @@ Symbol::init_fields(const char* name, const char* version, static std::string demangle(const char* name) { - if (!parameters->options().demangle()) + if (!parameters->options().do_demangle()) return name; // cplus_demangle allocates memory for the result it returns, -- cgit v1.2.1