Issue an error message if -static and -shared are used together.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index f5ef3a7..b8a5e7d 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-20  Nick Clifton  <nickc@redhat.com>
+
+       * ldmain.c (main): Issue an error message if -static and -shared
+       are used together.
+
 2004-12-17  Jakub Jelinek  <jakub@redhat.com>
 
        * ldexp.h (exp_data_seg): Add min_base and maxpagesize fields.

diff --git a/ld/ldmain.c b/ld/ldmain.c
index 04672f3..ca53251 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -370,6 +370,9 @@ 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)