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.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index c3a3acf290acbdab52aad09a86b94716783f6b0c..1c6e4760c06d8fee9e568d92f2a62878fb360c82 100644 (file)
--- 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 0662e221afe421f5a1d9ba2de2a9936657d8993e..1203e300aaeb580a26df7b7ebdd9c1a5d151e6bf 100644 (file)
--- 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