From f3f4bccaf6189a2a28e9c1436fabf2d668f8ef03 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 24 Feb 2005 13:16:07 +0000
Subject: [PATCH] (lnk960_before_parse): Remove redundant empty string from
 calls to concat.

---
 ld/ChangeLog           | 13 +++++++++++++
 ld/emultempl/lnk960.em |  9 ++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index a8673609f55..434e87691a4 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,16 @@
+2005-02-24  Nick Clifton  <nickc@redhat.com>
+
+	* emultempl/lnk960.em (lnk960_before_parse): Remove redundant
+	empty string from calls to concat.
+
+2005-02-23  Nick Clifton  <nickc@redhat.com>
+
+	* emultempl/lnk960.em (lnk960_before_parse): Terminate list of
+	arguments passed to concat() with a NULL.
+
+	* emultempl/m68kcoff.em: Include ldexp.h and ldlang.h because they
+	define types needed by ldfile.h
+
 2005-02-23  Alan Modra  <amodra@bigpond.net.au>
 
 	* pe-dll.c: Warning fixes.
diff --git a/ld/emultempl/lnk960.em b/ld/emultempl/lnk960.em
index 2c294ec63b9..f3bc9018cb3 100644
--- a/ld/emultempl/lnk960.em
+++ b/ld/emultempl/lnk960.em
@@ -2,7 +2,7 @@
 # It does some substitutions.
 cat >e${EMULATION_NAME}.c <<EOF
 /* intel coff loader emulation specific stuff
-   Copyright 1991, 1992, 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003
+   Copyright 1991, 1992, 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2005
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
@@ -94,12 +94,12 @@ lnk960_before_parse (void)
     {
       env = (char *) getenv (*p);
       if (env)
-	ldfile_add_library_path (concat (env, "/lib/libcoff", ""), FALSE);
+	ldfile_add_library_path (concat (env, "/lib/libcoff", NULL), FALSE);
     }
 
   env = (char *) getenv ("I960BASE");
   if (env)
-    ldfile_add_library_path(concat (env, "/lib", ""), FALSE);
+    ldfile_add_library_path (concat (env, "/lib", NULL), FALSE);
 
   ldfile_output_architecture = bfd_arch_i960;
   ldfile_output_machine = bfd_mach_i960_core;
@@ -119,8 +119,7 @@ lnk960_before_parse (void)
 	einfo ("%P%F I960BASE and G960BASE not set\n");
     }
 
-
-  ldfile_add_library_path (concat (name, "/lib", ""), FALSE);
+  ldfile_add_library_path (concat (name, "/lib", NULL), FALSE);
   ldfile_output_architecture = bfd_arch_i960;
   ldfile_output_machine = bfd_mach_i960_core;
 }
-- 
2.30.2