From 1bf57e9fa369e12554ad304935972944ba8a7009 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 7 Feb 2008 08:40:29 +0000 Subject: [PATCH] * read.c (s_weakref): Don't pass unadorned NULL to concat. * config/tc-i386.c (set_cpu_arch, md_parse_option): Likewise. --- gas/ChangeLog | 5 +++++ gas/config/tc-i386.c | 4 ++-- gas/read.c | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 884f0d960af..1286b3a5247 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2008-02-07 Alan Modra + + * read.c (s_weakref): Don't pass unadorned NULL to concat. + * config/tc-i386.c (set_cpu_arch, md_parse_option): Likewise. + 2008-02-05 Sterling Augustine * config/tc-xtensa.c (relax_frag_immed): Change internal consistency diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index ecf48bd6b58..c68fde75a43 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -1784,7 +1784,7 @@ set_cpu_arch (int dummy ATTRIBUTE_UNUSED) char *name = cpu_sub_arch_name; cpu_sub_arch_name = concat (name, cpu_arch[i].name, - NULL); + (const char *) NULL); free (name); } else @@ -7299,7 +7299,7 @@ md_parse_option (int c, char *arg) char *name = cpu_sub_arch_name; cpu_sub_arch_name = concat (name, cpu_arch[i].name, - NULL); + (const char *) NULL); free (name); } else diff --git a/gas/read.c b/gas/read.c index 109ab232551..ed3be3743b0 100644 --- a/gas/read.c +++ b/gas/read.c @@ -3449,14 +3449,15 @@ s_weakref (int ignore ATTRIBUTE_UNUSED) char *loop; loop = concat (S_GET_NAME (symbolP), - " => ", S_GET_NAME (symbolP2), NULL); + " => ", S_GET_NAME (symbolP2), (const char *) NULL); symp = symbolP2; while (symp != symbolP) { char *old_loop = loop; symp = symbol_get_value_expression (symp)->X_add_symbol; - loop = concat (loop, " => ", S_GET_NAME (symp), NULL); + loop = concat (loop, " => ", S_GET_NAME (symp), + (const char *) NULL); free (old_loop); } -- 2.30.2