diff options
| author | Alan Modra <amodra@gmail.com> | 2008-02-07 08:41:10 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2008-02-07 08:41:10 +0000 |
| commit | ff7a0acf26799cbaff30be114d7a17d19d2d96a0 (patch) | |
| tree | a4ae9832e349cc2b0a9c584d9c94ec1742d23f53 /ld/emultempl/elf32.em | |
| parent | 1bf57e9fa369e12554ad304935972944ba8a7009 (diff) | |
| download | gdb-ff7a0acf26799cbaff30be114d7a17d19d2d96a0.zip gdb-ff7a0acf26799cbaff30be114d7a17d19d2d96a0.tar.gz gdb-ff7a0acf26799cbaff30be114d7a17d19d2d96a0.tar.bz2 | |
* 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.
Diffstat (limited to 'ld/emultempl/elf32.em')
| -rw-r--r-- | ld/emultempl/elf32.em | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index d9daa6e..547bc2a 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); |