This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: Missing variable 'pe_data_import_dll'
- To: Nick Clifton <nickc at cambridge dot redhat dot com>
- Subject: Re: Missing variable 'pe_data_import_dll'
- From: Charles Wilson <cwilson at ece dot gatech dot edu>
- Date: Mon, 24 Sep 2001 16:28:43 -0400
- CC: binutils at sources dot redhat dot com
- References: <m3pu8g7h2a.fsf@north-pole.nickc.cambridge.redhat.com>
Oops. Now that I've gotten around to building *and testing* ld with
Nick's patch, it looks like there is a small thinko. Patch to correct
is attached. (Also includes the previously posted "finish reverting
Charles's initial patch" patch.)
-pe_data_import_dll ? "unknown" : pe_data_import_dll;
+pe_data_import_dll ? pe_data_import_dll : "unknown";
With this patch, I get correct build *and operation* on cygwin.
--Chuck
ChangeLog
2001-09-24 Charles Wilson <cwilson@ece.gatech.edu>
* pe-dll.c: remove obsoleted declaration of
pe_get_data_import_dll_name
(pe_create_import_fixup): fix thinko
Index: ld/pe-dll.c
===================================================================
RCS file: /cvs/src/src/ld/pe-dll.c,v
retrieving revision 1.32
diff -u -r1.32 pe-dll.c
--- pe-dll.c 2001/09/24 18:21:24 1.32
+++ pe-dll.c 2001/09/24 20:00:55
@@ -123,10 +123,6 @@
static void
add_bfd_to_link PARAMS ((bfd *, const char *, struct bfd_link_info *));
-/* Defined in emultempl/pe.em. */
-extern char *
-pe_get_data_import_dll_name PARAMS ((void));
-
/* For emultempl/pe.em. */
def_file * pe_def_file = 0;
@@ -2070,7 +2066,7 @@
{
extern char * pe_data_import_dll;
- char * dll_symname = pe_data_import_dll ? "unknown" : pe_data_import_dll;
+ char * dll_symname = pe_data_import_dll ? pe_data_import_dll : "unknown";
bfd *b = make_import_fixup_entry (name, fixup_name, dll_symname,
output_bfd);