From e374f1d9773018fd75aedea985ae4d17fa764334 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Wed, 9 Aug 2000 00:51:42 +0000
Subject: [PATCH] Refer to -rpath not --rpath in error message

---
 ld/ChangeLog          | 5 +++++
 ld/emultempl/elf32.em | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1d5ab752c2f..5f9163499a0 100644
--- 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 1c810444b0d..c1f5e31828e 100644
--- 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;
 
-- 
2.30.2