From 699845ef7b7225a4de45fafc7e3641b6ac8d1a2b Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 20 Jul 2000 21:59:40 +0000
Subject: [PATCH] 2000-07-20  H.J. Lu  <hjl@gnu.org>

	* emultempl/elf32.em (longopts): Duplicate "disable-new-dtags"
	and "disable-new-dtags" to stop getopt from treating -d/-e as
	abbreviations for these options.
---
 ld/ChangeLog          | 6 ++++++
 ld/emultempl/elf32.em | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index c3a3acf290a..1c6e4760c06 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-20  H.J. Lu  <hjl@gnu.org>
+
+	* emultempl/elf32.em (longopts): Duplicate "disable-new-dtags"
+	and "disable-new-dtags" to stop getopt from treating -d/-e as
+	abbreviations for these options.
+
 2000-07-20  H.J. Lu  <hjl@gnu.org>
 
 	* ld.texinfo: Add documentation for --disable-new-dtags and
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 0662e221afe..1203e300aae 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1223,7 +1223,11 @@ fi
 
 if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
 cat >>e${EMULATION_NAME}.c <<EOF
+  /* getopt allows abbreviations, so we do this to stop it from
+     treating -d/-e as abbreviations for these options. */
   {"disable-new-dtags", no_argument, NULL, OPTION_DISABLE_NEW_DTAGS},
+  {"disable-new-dtags", no_argument, NULL, OPTION_DISABLE_NEW_DTAGS},
+  {"enable-new-dtags", no_argument, NULL, OPTION_ENABLE_NEW_DTAGS},
   {"enable-new-dtags", no_argument, NULL, OPTION_ENABLE_NEW_DTAGS},
 EOF
 fi
-- 
2.30.2