* gasp.c (change_base): Don't modify numbers in strings. (pr7583)

[deliverable/binutils-gdb.git] / ld / ldmain.c

diff --git a/ld/ldmain.c b/ld/ldmain.c
index dd7c6ae3978d17340cc9389cfbc2caeb7561b864..55049d71c46049740f37948e52155936a267a045 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GLD; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
 #include "bfd.h"
@@ -180,6 +180,7 @@ main (argc, argv)
   link_info.callbacks = &link_callbacks;
   link_info.relocateable = false;
   link_info.shared = false;
+  link_info.symbolic = false;
   link_info.strip = strip_none;
   link_info.discard = discard_none;
   link_info.lprefix_len = 1;
@@ -219,8 +220,6 @@ main (argc, argv)
     {
       if (command_line.relax)
        einfo ("%P%F: -relax and -r may not be used together\n");
-      if (config.dynamic_link)
-       einfo ("%P%F: -r and -call_shared may not be used together\n");
       if (link_info.shared)
        einfo ("%P%F: -r and -shared may not be used together\n");
     }