diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6e7c2afe38..0d3a3a461d 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -7,6 +7,10 @@ Thu Jun 16 14:25:22 1994  Eric Youngdale  (ericy@cais.cais.com)
 
 Thu Jun 16 12:22:01 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
+	* lexsup.c (parse_args): Add -shared to longopts, and handle it.
+	* ldmain.c (main): Initialize link_info.shared to false.  Give
+	error if link_info.relocateable and link_info.shared are both set.
+
 	* configure.in: If EMUL_EXTRA* is defined in a config file, treat
 	it as naming an emulation to be added to EMULATION_OFILES.
 	* config/i386-linux.mt (EMUL_EXTRA1): Define as elf_i386.
diff --git a/ld/ldmain.c b/ld/ldmain.c
index 5b2e370f8a..7ee24f366b 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -166,6 +166,7 @@ main (argc, argv)
 
   link_info.callbacks = &link_callbacks;
   link_info.relocateable = false;
+  link_info.shared = false;
   link_info.strip = strip_none;
   link_info.discard = discard_none;
   link_info.lprefix_len = 1;
@@ -201,6 +202,8 @@ main (argc, argv)
 	einfo ("%P%F: -r and -call_shared may not be used together\n");
       if (link_info.strip == strip_all)
 	einfo ("%P%F: -r and -s may not be used together\n");
+      if (link_info.shared)
+	einfo ("%P%F: -r and -shared may not be used together\n");
     }
 
   /* This essentially adds another -L directory so this must be done after