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

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

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d218b9521a3df64c5acaf8f76ae741398ea76cc8..710bf8d2c2d98c4b92971e9eb782a1ab4f683260 100644 (file)
--- 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 ad6cfa535ec791a6c3068526bde8ef2ea0f36398..7e526a3da8934b50c7b792bab77faf31e68ae5a7 100644 (file)
--- 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 047cc6b1329a79ddf58b25151c576a325012e20b..b5bf2cba2c5fcf091e73ffeff8efc9154728cfaf 100644 (file)
--- 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)