diff options
| author | DJ Delorie <dj@redhat.com> | 2000-10-02 14:39:46 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2000-10-02 14:39:46 +0000 |
| commit | 486e80e2d55b191a4e4350e235a731e58ed68de2 (patch) | |
| tree | 9fab23bc27844c28bc496170afeb33b09d8f726e /ld/pe-dll.c | |
| parent | 65420b22d13adc143d4a5ad8bf42ab6b912ee4d1 (diff) | |
| download | gdb-486e80e2d55b191a4e4350e235a731e58ed68de2.zip gdb-486e80e2d55b191a4e4350e235a731e58ed68de2.tar.gz gdb-486e80e2d55b191a4e4350e235a731e58ed68de2.tar.bz2 | |
* emultempl/pe.em (gld_*_after_open): detect case where there two
import libraries for same dll; rename one to ensure proper link
order.
* pe-dll.c (process_def_file): compare ordinals to -1, not 0; fix
typo
(generate_edata): fix typo
Diffstat (limited to 'ld/pe-dll.c')
| -rw-r--r-- | ld/pe-dll.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ld/pe-dll.c b/ld/pe-dll.c index 456f7b8..a4be5f0 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c @@ -378,7 +378,7 @@ process_def_file (abfd, info) { if (pe_dll_warn_dup_exports) /* xgettext:c-format */ - einfo (_("%XError, duplicate EXPORT with oridinals: %s (%d vs %d)\n"), + einfo (_("%XError, duplicate EXPORT with ordinals: %s (%d vs %d)\n"), e[j - 1].name, e[j - 1].ordinal, e[i].ordinal); } else @@ -388,7 +388,7 @@ process_def_file (abfd, info) einfo (_("Warning, duplicate EXPORT: %s\n"), e[j - 1].name); } - if (e[i].ordinal) + if (e[i].ordinal != -1) e[j - 1].ordinal = e[i].ordinal; e[j - 1].flag_private |= e[i].flag_private; e[j - 1].flag_constant |= e[i].flag_constant; @@ -585,7 +585,7 @@ generate_edata (abfd, info) if (pi != -1) { /* xgettext:c-format */ - einfo (_("%XError, oridinal used twice: %d (%s vs %s)\n"), + einfo (_("%XError, ordinal used twice: %d (%s vs %s)\n"), pe_def_file->exports[i].ordinal, pe_def_file->exports[i].name, pe_def_file->exports[pi].name); |