From: Alan Modra <amodra@gmail.com>
Date: Thu, 7 Feb 2008 08:39:54 +0000 (+0000)
Subject: 	* objdump.c (main): Don't pass unadorned NULL to concat.
X-Git-Tag: gdb_6_8-2008-02-26-branchpoint~170
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee832e1842a5b8022d6dbda856f986d8004a9713;p=external%2Fbinutils.git

	* objdump.c (main): Don't pass unadorned NULL to concat.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 2e84347..07e6e41 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-07  Alan Modra  <amodra@bigpond.net.au>
+
+	* objdump.c (main): Don't pass unadorned NULL to concat.
+
 2008-02-04  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR 5715
diff --git a/binutils/objdump.c b/binutils/objdump.c
index e5ee5d2..8336133 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1,6 +1,6 @@
 /* objdump.c -- dump information about an object file.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -3083,7 +3083,7 @@ main (int argc, char **argv)
 	  if (disassembler_options)
 	    /* Ignore potential memory leak for now.  */
 	    disassembler_options = concat (disassembler_options, ",",
-					   optarg, NULL);
+					   optarg, (const char *) NULL);
 	  else
 	    disassembler_options = optarg;
 	  break;