dlltool.c (make_one_lib_file): Revert 2004-09-02 and 2004-09-04 patches.

doc/binutils.texi (dlltool): Revert 2004-09-06 patch.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 95b3568d19d166289f29aebb5679c08f75fa868c..a04a5144f0ab01ff5d38a6bab8b46146c40659a0 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-08  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
+
+       * dlltool.c (make_one_lib_file): Revert 2004-09-02 and 2004-09-04
+       patches.
+       * doc/binutils.texi (dlltool): Revert 2004-09-06 patch.
+
 2004-10-07  Alexandre Oliva  <aoliva@redhat.com>
 
        * readelf.c (get_machine_flags): Don't fall through into m68k cpu

diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index c9a673840312738cfbb7f327ccb234de758a3d4f..9d1d6f2157165f26320886c5bf7a3723b387a7a9 100644 (file)
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -2517,17 +2517,11 @@ make_one_lib_file (export_type *exp, int i)
                      why it did that, and it does not match what I see
                      in programs compiled with the MS tools.  */
                  int idx = exp->hint;
-                 /* If the user has specified an internal name, use it.
-                    Ignore command line name translation options.  */   
-                 char const * internal_name
-                   = exp->internal_name != exp->name
-                     ? exp->internal_name : xlate (exp->name);
-
-                 si->size = strlen (internal_name) + 3;
+                 si->size = strlen (xlate (exp->name)) + 3;
                  si->data = xmalloc (si->size);
                  si->data[0] = idx & 0xff;
                  si->data[1] = idx >> 8;
-                 strcpy (si->data + 2, internal_name);
+                 strcpy (si->data + 2, xlate (exp->name));
                }
              break;
            case IDATA7:

diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index 20132c8165fc9e2f1129f4047d33dd83c7f1b69f..0a80a0d96ececf640c608008bb89194e77bc02d7 100644 (file)
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -3042,15 +3042,13 @@ means!
 @itemx --add-underscore
 Specifies that when @command{dlltool} is creating the exports file it
 should prepend an underscore to the names of the exported functions. 
-The option is ignored for symbols with an explicit internal name
-specification provided in a .def file.
 
 @item -k
 @itemx --kill-at
 Specifies that when @command{dlltool} is creating the exports file it
-should not append the string @samp{@@ <number>}  The option is ignored
-for symbols with an explicit internal name specification provided in a
-.def file.
+should not append the string @samp{@@ <number>}.  These numbers are
+called ordinal numbers and they represent another way of accessing the
+function in a DLL, other than by name.
 
 @item -A
 @itemx --add-stdcall-alias