Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Don't ignore "-m emulation" command line option

Browse Source 
Gold shouldn't ignore "-m emulation" command line option, which may
lead to incorrect output.

	PR gold/19119
	* options.h (General_options): Remove "obsolete" from -m.
	* parameters.cc (set_parameters_target): Check if input target
	is compatible with output emulation set by "-m emulation".
This commit is contained in:
H.J. Lu
2015-10-16 08:04:58 -07:00
parent e66acfb155
commit 6457197210
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gold/ChangeLog
View File

@@ -1,3 +1,10 @@
2015-10-16 H.J. Lu <hongjiu.lu@intel.com>
PR gold/19119
* options.h (General_options): Remove "obsolete" from -m.
* parameters.cc (set_parameters_target): Check if input target
is compatible with output emulation set by "-m emulation".
2015-10-13 H.J. Lu <hongjiu.lu@intel.com>
PR gold/19118

2
gold/options.h
View File

@@ -934,7 +934,7 @@ class General_options
N_("OFFSET"));
DEFINE_string(m, options::EXACTLY_ONE_DASH, 'm', "",
N_("Set GNU linker emulation; obsolete"), N_("EMULATION"));
N_("Set GNU linker emulation"), N_("EMULATION"));
DEFINE_bool(mmap_output_file, options::TWO_DASHES, '\0', true,
N_("Map the output file for writing (default)."),

10
gold/parameters.cc
View File

@@ -297,6 +297,16 @@ set_parameters_options(const General_options* options)
void
set_parameters_target(Target* target)
{
if (parameters->options_valid() && parameters->options().user_set_m())
{
const char* emulation = parameters->options().m();
Target* output = select_target_by_emulation(emulation);
if (!output)
gold_error(_("unrecognised output emulation: %s"), emulation);
else if (output != target)
gold_error(_("input file is incompatible with %s output emulation"),
emulation);
}
static_parameters.set_target(target);
}