Refer to -rpath not --rpath in error message

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1d5ab752c2f778ee65b955051fb3800874ccd555..5f9163499a0fcbdbba14b7ab67c9689c33677f4d 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-08  Peter Jeremy  <peter.jeremy@alcatel.com.au>
+
+       * emultempl/elf32.em (_after_close): Refer to -rpath not --rpath
+       in error message.
+
 2000-08-08  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
 
        * scripttempl/elfm68hc11.sc: Define __bss_size symbol to indicate

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 1c810444b0d321990f439f3bfa833708a714b039..c1f5e31828e2da7ac38b41691e641808f40532b3 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -674,7 +674,7 @@ cat >>e${EMULATION_NAME}.c <<EOF
       if (force < 2)
        continue;
 
-      einfo ("%P: warning: %s, needed by %B, not found (try using --rpath)\n",
+      einfo ("%P: warning: %s, needed by %B, not found (try using -rpath or -rpath-link)\n",
             l->name, l->by);
     }
 }
@@ -975,10 +975,10 @@ gld${EMULATION_NAME}_place_orphan (file, s)
   static struct orphan_save hold_rel;
   static struct orphan_save hold_interp;
   struct orphan_save *place;
-  lang_statement_list_type *old;
+  lang_statement_list_type *old = NULL;
   lang_statement_list_type add;
   etree_type *address;
-  const char *secname, *ps;
+  const char *secname, *ps = NULL;
   const char *outsecname;
   lang_output_section_statement_type *os;