From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 29 Dec 2020 18:37:24 +0000 (-0800)
Subject: elfedit: Pass osabi to reconcat
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e635a01574d001fd26e8b23778d63b818f958ce;p=binutils-gdb.git

elfedit: Pass osabi to reconcat

Pass osabi to reconcat to get

Usage: elfedit <option(s)> elffile(s)
...
  --input-osabi [none|HPUX|NetBSD|GNU|Linux|Solaris|AIX|Irix|FreeBSD|TRU64|Modesto|OpenBSD|OpenVMS|NSK|AROS|FenixOS]
                              Set input OSABI

instead of

  --input-osabi [|FenixOS]
                              Set input OSABI

	* elfedit (usage): Pass osabi to reconcat.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index bd087e5ec97..9bbe1fe061b 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2020-12-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfedit (usage): Pass osabi to reconcat.
+
 2020-12-28  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* testsuite/binutils-all/compress.exp (test_gnu_debuglink): Pass
diff --git a/binutils/elfedit.c b/binutils/elfedit.c
index dc2f722d386..e54011c9a8d 100644
--- a/binutils/elfedit.c
+++ b/binutils/elfedit.c
@@ -902,7 +902,7 @@ usage (FILE *stream, int exit_status)
   char *osabi = concat (osabis[0].name, NULL);
 
   for (i = 1; i < ARRAY_SIZE (osabis); i++)
-    osabi = reconcat (osabi, "|", osabis[i].name, NULL);
+    osabi = reconcat (osabi, osabi, "|", osabis[i].name, NULL);
 
   fprintf (stream, _("Usage: %s <option(s)> elffile(s)\n"),
 	   program_name);