X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gold%2Fgold.cc;h=2891d16c7c95c3bc7a690e392041293673d8082c;hb=1bcb0708f22956d5128a2e75df6eba5a18327892;hp=3916f892c9c8f19ee45e73df7b24a003dd553e71;hpb=bd2e3511f74940beec6a39914480ed6ff88c0a71;p=binutils-gdb.git

diff --git a/gold/gold.cc b/gold/gold.cc
index 3916f892c9c..2891d16c7c9 100644
--- a/gold/gold.cc
+++ b/gold/gold.cc
@@ -1,6 +1,6 @@
 // gold.cc -- main linker functions
 
-// Copyright (C) 2006-2017 Free Software Foundation, Inc.
+// Copyright (C) 2006-2022 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -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);
+		}
 	    }
 	}
     }