OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR23769, mixing split-stack and non-split-stack error message 

Corrects which file is reported as being split-stack.

	PR 23769
	* gold.cc (queue_middle_tasks): Correct split-stack error message.
This commit is contained in:
Cherry Zhang 2018-10-16 14:07:41 +10:30 committed by Alan Modra
parent 63a33118e0
commit 08ea4a7805
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gold/ChangeLog
View File

@ -1,3 +1,8 @@
2018-10-16 Cherry Zhang <cherryyz@google.com>
PR 23769
* gold.cc (queue_middle_tasks): Correct split-stack error message.
2018-08-29 Chenghua Xu <paul.hua.gm@gmail.com>
* mips.cc (Mips_mach, add_machine_extensions, elf_mips_mach):

14
gold/gold.cc
View File

@ -631,10 +631,16 @@ queue_middle_tasks(const General_options& options,
for (++p; p != input_objects->relobj_end(); ++p)
{
if ((*p)->uses_split_stack() != uses_split_stack)
gold_fatal(_("cannot mix split-stack '%s' and "
"non-split-stack '%s' when using -r"),
(*input_objects->relobj_begin())->name().c_str(),
(*p)->name().c_str());
{
const char *name1
= (*input_objects->relobj_begin())->name().c_str();
const char *name2 = (*p)->name().c_str();
const char *name_split = uses_split_stack ? name1 : name2;
const char *name_nosplit = uses_split_stack ? name2 : name1;
gold_fatal(_("cannot mix split-stack '%s' and "
"non-split-stack '%s' when using -r"),
name_split, name_nosplit);
}
}
}
}