* ldmain.c (main): Allow -shared and -static to be used together.

* ld.texinfo (-static): Mention that it is allowed with -shared.

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

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

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)