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

[deliverable/binutils-gdb.git] / gas / config / tc-i386.c

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index c73cbee8b362ed5efb14a7086bb291d3c9826e2e..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
@@ -7406,10 +7406,10 @@ md_show_usage (stream)
                            pentiumii, pentiumiii, pentium4, prescott, nocona,\n\
                            core, core2, k6, k6_2, athlon, k8, amdfam10,\n\
                            generic32, generic64\n\
-                         EXTENSION is combination of:\n\
-                          mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, sse4,\n\
-                          vmx, smx, 3dnow, 3dnowa, sse4a, sse5, svme, abm,\n\
-                          padlock\n"));
+                          EXTENSION is combination of:\n\
+                           mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, sse4,\n\
+                           vmx, smx, 3dnow, 3dnowa, sse4a, sse5, svme, abm,\n\
+                           padlock\n"));
   fprintf (stream, _("\
   -mtune=CPU              optimize for CPU, CPU is one of:\n\
                            i8086, i186, i286, i386, i486, pentium, pentiumpro,\n\