diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-03-22 21:04:50 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-03-22 21:04:50 +0000 |
| commit | 556afa51175e0bd70bb8b50540004541d560e53e (patch) | |
| tree | 0d7b735655d6dd2c5f7bd6404989024475016859 | |
| parent | 03ecf8ed8aabce5a0ccbacd5b0980cf253fc82e2 (diff) | |
| download | binutils-redhat-556afa51175e0bd70bb8b50540004541d560e53e.tar.gz | |
* dlltool.c (gen_def_file): Put demangled name comments on
own line preceding export name.
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/dlltool.c | 18 |
2 files changed, 15 insertions, 8 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 39ff54a78a..7fce8769c7 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2003-03-22 Danny Smith <dannysmith@users.sourceforge,net> + + * dlltool.c (gen_def_file): Put demangled name comments on + own line preceding export name. + 2003-03-17 Nick Clifton <nickc@redhat.com> * objdump.c (disassemble_data): Use disasm_info.fprintf_func not diff --git a/binutils/dlltool.c b/binutils/dlltool.c index a4e7bfa362..81b6b92246 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -1670,23 +1670,28 @@ gen_def_file () char *quote = strchr (exp->name, '.') ? "\"" : ""; char *res = cplus_demangle (exp->internal_name, DMGL_ANSI | DMGL_PARAMS); + if (res) + { + fprintf (output_def,";\t%s\n", res); + free (res); + } + if (strcmp (exp->name, exp->internal_name) == 0) { - fprintf (output_def, "\t%s%s%s @ %d%s%s ; %s\n", + fprintf (output_def, "\t%s%s%s @ %d%s%s\n", quote, exp->name, quote, exp->ordinal, exp->noname ? " NONAME" : "", - exp->data ? " DATA" : "", - res ? res : ""); + exp->data ? " DATA" : ""); } else { char *quote1 = strchr (exp->internal_name, '.') ? "\"" : ""; /* char *alias = */ - fprintf (output_def, "\t%s%s%s = %s%s%s @ %d%s%s ; %s\n", + fprintf (output_def, "\t%s%s%s = %s%s%s @ %d%s%s\n", quote, exp->name, quote, @@ -1695,11 +1700,8 @@ gen_def_file () quote1, exp->ordinal, exp->noname ? " NONAME" : "", - exp->data ? " DATA" : "", - res ? res : ""); + exp->data ? " DATA" : ""); } - if (res) - free (res); } inform (_("Added exports to output file")); |