* gas/cris/rd-bcnst2-pic.d, gas/cris/rd-bcnst2.d,

[deliverable/binutils-gdb.git] / gold / options.cc

diff --git a/gold/options.cc b/gold/options.cc
index 08b67fdf46b7e0a751ce5e3a241554bf5d5dfafe..90fa1630e3ed6724a5e1aa06778167b3eeebc055 100644 (file)
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -347,6 +347,14 @@ General_options::parse_version_script(const char*, const char* arg,
     gold::gold_fatal(_("unable to parse version script file %s"), arg);
 }
 
+void
+General_options::parse_dynamic_list(const char*, const char* arg,
+                                    Command_line* cmdline)
+{
+  if (!read_dynamic_list(arg, cmdline, &this->dynamic_list_))
+    gold::gold_fatal(_("unable to parse dynamic-list script file %s"), arg);
+}
+
 void
 General_options::parse_start_group(const char*, const char*,
                                    Command_line* cmdline)
@@ -792,6 +800,9 @@ General_options::finalize()
   this->add_sysroot();
 
   // Now that we've normalized the options, check for contradictory ones.
+  if (this->shared() && this->is_static())
+    gold_fatal(_("-shared and -static are incompatible"));
+
   if (this->shared() && this->relocatable())
     gold_fatal(_("-shared and -r are incompatible"));