From ff7a0acf26799cbaff30be114d7a17d19d2d96a0 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Thu, 7 Feb 2008 08:41:10 +0000
Subject: [PATCH] 	* ldlang.c (new_afile): Don't pass unadorned NULL to
 concat. 	* ldfile.c (ldfile_add_library_path): Likewise. 	*
 emultempl/elf32.em (check_ld_elf_hints, check_ld_so_conf): Likewise. 	*
 emultempl/lnk960.em (lnk960_before_parse): Likewise. 	* emultempl/spuelf.em
 (embedded_spu_file): Likewise.

---
 ld/ChangeLog           |  8 ++++++++
 ld/emultempl/elf32.em  | 10 ++++++----
 ld/emultempl/lnk960.em |  4 ++--
 ld/emultempl/spuelf.em |  6 +++---
 ld/ldfile.c            |  4 ++--
 ld/ldlang.c            |  2 +-
 6 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3407aa64d3b..9f2557395da 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* ldlang.c (new_afile): Don't pass unadorned NULL to concat.
+	* ldfile.c (ldfile_add_library_path): Likewise.
+	* emultempl/elf32.em (check_ld_elf_hints, check_ld_so_conf): Likewise.
+	* emultempl/lnk960.em (lnk960_before_parse): Likewise.
+	* emultempl/spuelf.em (embedded_spu_file): Likewise.
+
 2008-02-07  Alan Modra  <amodra@bigpond.net.au>
 
 	* emultempl/spu_ovl.S: Use low bit of _ovly_table.size as
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index d9daa6e78de..547bc2abeae 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -13,7 +13,7 @@ fragment <<EOF
 
 /* ${ELFSIZE} bit ELF emulation code for ${EMULATION_NAME}
    Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
    ELF support by Ian Lance Taylor <ian@cygnus.com>
 
@@ -556,7 +556,7 @@ gld${EMULATION_NAME}_check_ld_elf_hints (const char *name, int force)
       FILE *f;
       char *tmppath;
 
-      tmppath = concat (ld_sysroot, _PATH_ELF_HINTS, NULL);
+      tmppath = concat (ld_sysroot, _PATH_ELF_HINTS, (const char *) NULL);
       f = fopen (tmppath, FOPEN_RB);
       free (tmppath);
       if (f != NULL)
@@ -776,11 +776,13 @@ gld${EMULATION_NAME}_check_ld_so_conf (const char *name, int force)
 
       info.path = NULL;
       info.len = info.alloc = 0;
-      tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf", NULL);
+      tmppath = concat (ld_sysroot, "${prefix}/etc/ld.so.conf",
+			(const char *) NULL);
       if (!gld${EMULATION_NAME}_parse_ld_so_conf (&info, tmppath))
 	{
 	  free (tmppath);
-	  tmppath = concat (ld_sysroot, "/etc/ld.so.conf", NULL);
+	  tmppath = concat (ld_sysroot, "/etc/ld.so.conf",
+			    (const char *) NULL);
 	  gld${EMULATION_NAME}_parse_ld_so_conf (&info, tmppath);
 	}
       free (tmppath);
diff --git a/ld/emultempl/lnk960.em b/ld/emultempl/lnk960.em
index 1e9e7552301..aa5afcc11fe 100644
--- a/ld/emultempl/lnk960.em
+++ b/ld/emultempl/lnk960.em
@@ -3,7 +3,7 @@
 fragment <<EOF
 /* intel coff loader emulation specific stuff
    Copyright 1991, 1992, 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003,
-   2005, 2007 Free Software Foundation, Inc.
+   2005, 2007, 2008 Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
    This file is part of the GNU Binutils.
@@ -94,7 +94,7 @@ lnk960_before_parse (void)
 	einfo ("%P%F I960BASE and G960BASE not set\n");
     }
 
-  ldfile_add_library_path (concat (name, "/lib", NULL), FALSE);
+  ldfile_add_library_path (concat (name, "/lib", (const char *) NULL), FALSE);
   ldfile_output_architecture = bfd_arch_i960;
   ldfile_output_machine = bfd_mach_i960_core;
 }
diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
index 7e618a55642..bbaf098c050 100644
--- a/ld/emultempl/spuelf.em
+++ b/ld/emultempl/spuelf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2006, 2007 Free Software Foundation, Inc.
+#   Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -353,9 +353,9 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags)
 	if (strncmp (infile, "crtbegin", 8) == 0)
 	  {
 	    if (infile[8] == 'S')
-	      flags = concat (flags, " -fPIC", NULL);
+	      flags = concat (flags, " -fPIC", (const char *) NULL);
 	    else if (infile[8] == 'T')
-	      flags = concat (flags, " -fpie", NULL);
+	      flags = concat (flags, " -fpie", (const char *) NULL);
 	    break;
 	  }
       }
diff --git a/ld/ldfile.c b/ld/ldfile.c
index c9414ff9888..4a11fb1fef2 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -1,6 +1,6 @@
 /* Linker file opening and searching.
    Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -113,7 +113,7 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
      now.  */
   if (name[0] == '=')
     {
-      new->name = concat (ld_sysroot, name + 1, NULL);
+      new->name = concat (ld_sysroot, name + 1, (const char *) NULL);
       new->sysrooted = TRUE;
     }
   else
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 7ef8838ae50..1e9b0904aa5 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -944,7 +944,7 @@ new_afile (const char *name,
       p->is_archive = TRUE;
       p->filename = name;
       p->real = TRUE;
-      p->local_sym_name = concat ("-l", name, NULL);
+      p->local_sym_name = concat ("-l", name, (const char *) NULL);
       p->just_syms_flag = FALSE;
       p->search_dirs_flag = TRUE;
       break;
-- 
2.30.2