(lnk960_before_parse): Remove redundant empty string from calls to concat.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index a867360..434e876 100644 (file)
--- 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 2c294ec..f3bc901 100644 (file)
--- 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;
 }