From 459fbf53ae6ab47c920c67561973d1909cb221c2 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Sat, 4 Sep 2004 10:08:11 +0000 Subject: [PATCH] * dlltool.c (make_one_lib): Test if internal_name was specified by user before using it. --- binutils/ChangeLog | 5 +++++ binutils/dlltool.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 8cfd193278..2afb2a17ce 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2004-09-04 Danny Smith + + * dlltool.c (make_one_lib): Test if internal_name was specified + by user before using it. + 2004-09-02 Carlo Wood PR binutils/351 diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 7688c8bb12..c9a6738403 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -2517,8 +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; - char const * internal_name = - exp->internal_name ? exp->internal_name : xlate (exp->name); + /* 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->data = xmalloc (si->size); -- 2.11.0