From: Alan Modra Date: Thu, 7 Feb 2008 08:41:10 +0000 (+0000) Subject: * ldlang.c (new_afile): Don't pass unadorned NULL to concat. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ff7a0acf26799cbaff30be114d7a17d19d2d96a0;p=binutils-gdb.git * 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. --- 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 + + * 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 * 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 < ELF support by Ian Lance Taylor @@ -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 <