Pull in fix from binutils-current that allows -shared and -static to be

used together again. This is something that ld.elf_so did/will use.
This commit is contained in:
skrll 2006-06-29 19:27:41 +00:00
parent 793a3b26d8
commit 7e7e19dfc2
3 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2005-07-29 Nick Clifton <nickc@redhat.com>
* ldmain.c (main): Allow -shared and -static to be used together.
* ld.texinfo (-static): Mention that it is allowed with -shared.
2005-06-12 Daniel Jacobowitz <dan@codesourcery.com>
* ld.texinfo (Command Line Options): Add @item for --hash-size.

View File

@ -1049,7 +1049,11 @@ platforms for which shared libraries are supported. The different
variants of this option are for compatibility with various systems. You
may use this option multiple times on the command line: it affects
library searching for @option{-l} options which follow it. This
option also implies @option{--unresolved-symbols=report-all}.
option also implies @option{--unresolved-symbols=report-all}. This
option can be used with @option{-shared}. Doing so means that a
shared library is being created but that all of the library's external
references must be resolved by pulling in entries from static
libraries.
@kindex -Bsymbolic
@item -Bsymbolic

View File

@ -343,9 +343,6 @@ main (int argc, char **argv)
einfo (_("%P%F: -r and -shared may not be used together\n"));
}
if (!config.dynamic_link && link_info.shared)
einfo (_("%P%F: -static and -shared may not be used together\n"));
if (! link_info.shared)
{
if (command_line.filter_shlib)