* read.c (s_weakref): Don't pass unadorned NULL to concat.

	* config/tc-i386.c (set_cpu_arch, md_parse_option): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 884f0d960af1f006810bed0139f63759cb7628a4..1286b3a52477d48b5a471f7dc46bd88110256b7f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-07  Alan Modra  <amodra@bigpond.net.au>
+
+       * 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  <sterling@tensilica.com>
        
        * 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 ecf48bd6b582975d02ae1a2503c2c7d413bb8fed..c68fde75a43bfa49317b83d018a7a83a567ee2ef 100644 (file)
--- 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 109ab23255126ec2e0486078f3c4528cd565b4f4..ed3be3743b0381271933ffc34832d799ff967661 100644 (file)
--- 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);
            }