diff options
| author |   Cherry Zhang <cherryyz@google.com> | 2018-10-16 14:07:41 +1030 |
|---|---|---|
| committer |   Alan Modra <amodra@gmail.com> | 2018-10-16 16:41:57 +1030 |
| commit | 08ea4a7805705668c2c4c63b858b6641d052f7e7 (patch) | |
| tree | 86672562b6b4546b66b9e2e8ba11debfa63f101a /gold | |
| parent | Remove unnecessary casts from TUI (diff) | |
| download | binutils-gdb-08ea4a7805705668c2c4c63b858b6641d052f7e7.tar.gz binutils-gdb-08ea4a7805705668c2c4c63b858b6641d052f7e7.tar.bz2 binutils-gdb-08ea4a7805705668c2c4c63b858b6641d052f7e7.zip | |
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.
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/gold.cc | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 8f1b02d2870..9bad89b4f0a 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -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): diff --git a/gold/gold.cc b/gold/gold.cc index 1987d413d39..7087dd47133 100644 --- a/gold/gold.cc +++ b/gold/gold.cc @@ -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); + } } } } |