diff options
| author | Nick Clifton <nickc@redhat.com> | 2005-07-29 13:32:45 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2005-07-29 13:32:45 +0000 |
| commit | e9156f741ab144279ff8cd831d33f2dd7f6232cd (patch) | |
| tree | 34d8bc003066255b9e99edd44f177afabfc60052 /ld | |
| parent | 8a69675106de19439ba277ce987a9535e5a6fce4 (diff) | |
| download | gdb-e9156f741ab144279ff8cd831d33f2dd7f6232cd.zip gdb-e9156f741ab144279ff8cd831d33f2dd7f6232cd.tar.gz gdb-e9156f741ab144279ff8cd831d33f2dd7f6232cd.tar.bz2 | |
* ldmain.c (main): Allow -shared and -static to be used together.
* ld.texinfo (-static): Mention that it is allowed with -shared.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/ld.texinfo | 6 | ||||
| -rw-r--r-- | ld/ldmain.c | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index d218b95..710bf8d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -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-07-28 DJ Delorie <dj@redhat.com> * ldlang.c (lang_output_section_statement_lookup_1): Don't cast a diff --git a/ld/ld.texinfo b/ld/ld.texinfo index ad6cfa5..7e526a3 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo @@ -1077,7 +1077,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 diff --git a/ld/ldmain.c b/ld/ldmain.c index 047cc6b..b5bf2cb 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -345,9 +345,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) |