summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2004-12-20 15:16:06 +0000
committerNick Clifton <nickc@redhat.com>2004-12-20 15:16:06 +0000
commit4322b659eabdf278f399bbfe19de6ba43cd37755 (patch)
tree03948da6fd8aa378758236aba9a5f24218b8bfe8
parent3fe9a6f36eaa19e43ea9abe529d3f5825b0b8b81 (diff)
downloadbinutils-redhat-4322b659eabdf278f399bbfe19de6ba43cd37755.tar.gz
Issue an error message if -static and -shared are used together.
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/ldmain.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index f5ef3a7a02..b8a5e7d1ef 100644
--- 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 04672f3b5d..ca532515a4 100644
--- 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)