From 5a36abdf9f04b94967f84fe166ce083fd3f5915f Mon Sep 17 00:00:00 2001
From: David O'Brien <obrien@FreeBSD.org>
Date: Oct 12 2000 13:56:39 +0000
Subject: 2000-10-12  Peter Jeremy  <peter.jeremy@alcatel.com.au>

	From 2000-08-08  Peter Jeremy  <peter.jeremy@alcatel.com.au>
	* emultempl/elf32.em (_after_close): Refer to -rpath not --rpath
	in error message.
	(gld${EMULATION_NAME}_place_orphan): Quite compiler warnings.

Approved by:  Philip Blundell <pb@futuretv.com>
              Message-Id: <E13jdVk-0002fY-00@fountain.labs.futuretv.com>

---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 112c0df..3bc97f0 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-12  Peter Jeremy  <peter.jeremy@alcatel.com.au>
+
+	From 2000-08-08  Peter Jeremy  <peter.jeremy@alcatel.com.au>
+	* emultempl/elf32.em (_after_close): Refer to -rpath not --rpath
+	in error message.
+	(gld${EMULATION_NAME}_place_orphan): Quite compiler warnings.
+
 2000-04-14  Matthew Green  <mrg@cygnus.com>
 	
 	* configure.tgt: Add NetBSD/sparc ELF, and NetBSD/sparc64 support.
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 2913ecf..770e305 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -376,7 +376,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);
     }
 }
@@ -882,10 +882,10 @@ gld${EMULATION_NAME}_place_orphan (file, s)
 {
   lang_output_section_statement_type *place;
   asection *snew, **pps;
-  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;