diff options
| author | Nick Clifton <nickc@redhat.com> | 2003-01-23 09:30:44 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2003-01-23 09:30:44 +0000 |
| commit | 489d0400afe4b18c94ce8b6195fa3d91978ecb08 (patch) | |
| tree | 679844806b5378429ca58dc98acc9a4bca868ab4 /ld | |
| parent | 7904e09f8fc9327521760fa66df8c6252f36582d (diff) | |
| download | fsf-binutils-gdb-489d0400afe4b18c94ce8b6195fa3d91978ecb08.zip fsf-binutils-gdb-489d0400afe4b18c94ce8b6195fa3d91978ecb08.tar.gz fsf-binutils-gdb-489d0400afe4b18c94ce8b6195fa3d91978ecb08.tar.bz2 | |
Remove an extra "i" in --dll-search-prefix.
Move a cross-80th-column-margin "an" to the next line.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/emultempl/pe.em | 11 | ||||
| -rw-r--r-- | ld/ld.texinfo | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 32b4814..8bf5234 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2003-01-23 Wu Yongwei <adah@netstd.com> + + * ld.texinfo: Remove an extra "i" in --dll-search-prefix. + * emultempl/pe.em (gld_${EMULATION_NAME}_list_options): Move a + cross-80th-column-margin "an" to the next line. + 2003-01-21 Nick Clifton <nickc@redhat.com> * emulparams/tic3xcoff-onchip.sh: Rename to ...z diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 87a5bc2..fc84e6a 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -9,7 +9,7 @@ rm -f e${EMULATION_NAME}.c (echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-) cat >>e${EMULATION_NAME}.c <<EOF /* This file is part of GLD, the Gnu Linker. - Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 + Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -357,14 +357,15 @@ gld_${EMULATION_NAME}_list_options (file) fprintf (file, _(" --enable-auto-image-base Automatically choose image base for DLLs\n\ unless user specifies one\n")); fprintf (file, _(" --disable-auto-image-base Do not auto-choose image base. (default)\n")); - fprintf (file, _(" --dll-search-prefix=<string> When linking dynamically to a dll without an\n\ - importlib, use <string><basename>.dll \n\ + fprintf (file, _(" --dll-search-prefix=<string> When linking dynamically to a dll without\n\ + an importlib, use <string><basename>.dll\n\ in preference to lib<basename>.dll \n")); - fprintf (file, _(" --enable-auto-import Do sophistcated linking of _sym to \n\ + fprintf (file, _(" --enable-auto-import Do sophistcated linking of _sym to\n\ __imp_sym for DATA references\n")); fprintf (file, _(" --disable-auto-import Do not auto-import DATA items from DLLs\n")); fprintf (file, _(" --enable-runtime-pseudo-reloc Work around auto-import limitations by\n\ - adding pseudo-relocations resolved at runtime.\n")); + adding pseudo-relocations resolved at\n\ + runtime.\n")); fprintf (file, _(" --disable-runtime-pseudo-reloc Do not add runtime pseudo-relocations for\n\ auto-imported DATA.\n")); fprintf (file, _(" --enable-extra-pe-debug Enable verbose debug output when building\n\ diff --git a/ld/ld.texinfo b/ld/ld.texinfo index b85c6bf..412ea88 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo @@ -1799,7 +1799,7 @@ default. @cindex DLLs, linking to @kindex --dll-search-prefix @item --dll-search-prefix @var{string} -When linking dynamically to a dll without an import library, i +When linking dynamically to a dll without an import library, search for @code{<string><basename>.dll} in preference to @code{lib<basename>.dll}. This behavior allows easy distinction between DLLs built for the various "subplatforms": native, cygwin, |