From: Nick Clifton <nickc@redhat.com>
Date: Thu, 2 Sep 2004 15:55:36 +0000 (+0000)
Subject: (make_one_lib_file): For IDATA6 take the name from exp->internal_name if it
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5885be89393164a4835048ca9f18bcb7258d9580;p=binutils-gdb.git

(make_one_lib_file): For IDATA6 take the name from exp->internal_name if it
is present.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c9def8b30ff..b48fc9859ae 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-02  Carlo  <carlo@alinoe.com> 
+
+	PR binutils/351
+	* dlltool.c (make_one_lib_file): For IDATA6 take the name from
+	exp->internal_name if it is present.
+
 2004-09-02  Alexandre Oliva  <aoliva@redhat.com>
 
 	* MAINTAINERS: Add self as co-maintainer of FR-V.
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 2f829287b9a..7688c8bb127 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -2517,16 +2517,19 @@ 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;
-		  si->size = strlen (xlate (exp->name)) + 3;
+		  char const * internal_name =
+		    exp->internal_name ? exp->internal_name : xlate (exp->name);
+
+		  si->size = strlen (internal_name) + 3;
 		  si->data = xmalloc (si->size);
 		  si->data[0] = idx & 0xff;
 		  si->data[1] = idx >> 8;
-		  strcpy (si->data + 2, xlate (exp->name));
+		  strcpy (si->data + 2, internal_name);
 		}
 	      break;
 	    case IDATA7:
 	      si->size = 4;
-	      si->data =xmalloc (4);
+	      si->data = xmalloc (4);
 	      memset (si->data, 0, si->size);
 	      rel = xmalloc (sizeof (arelent));
 	      rpp = xmalloc (sizeof (arelent *) * 2);