[GOLD] PR23769, mixing split-stack and non-split-stack error message

[Alan Modra]

From 08ea4a7805705668c2c4c63b858b6641d052f7e7 Mon Sep 17 00:00:00 2001
From: Cherry Zhang <***@google.com>
Date: Tue, 16 Oct 2018 14:07:41 +1030
Subject: [PATCH 1/6]

Corrects which file is reported as being split-stack. Patch by the
bug reporter, tidied just a little. I figure this is obvious enough
to apply without Cary's explicit approval.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 8f1b02d287..9bad89b4f0 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
[phone] Cherry Zhang <***@google.com>
+
+ PR 23769
+ * gold.cc (queue_middle_tasks): Correct split-stack error message.
+
2018-08-29 Chenghua Xu <***@gmail.com>

* mips.cc (Mips_mach, add_machine_extensions, elf_mips_mach):
diff --git a/gold/gold.cc b/gold/gold.cc
index 1987d413d3..7087dd4713 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);
+ }
}
}
}