Merge GDB 7.5.1

opcodes/bfin-dis.c

 /* Disassemble ADI Blackfin Instructions.
-   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
    Free Software Foundation, Inc.
 
    This file is part of libopcodes.
 
    This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    It is distributed in the hope that it will be useful, but WITHOUT
    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
    License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
+#include "sysdep.h"
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "opcode/bfin.h"
 
 #ifndef PRINTF
 #define PRINTF printf
 #endif
 
 #ifndef EXIT
 #define EXIT exit
 #endif
@@ skipping 120 matching lines @@
   else
     x = constant_formats[cf].issigned ? SIGNEXTEND (x, constant_formats[cf].nbits) : x;
 
   if (constant_formats[cf].offset)
     x += constant_formats[cf].offset;
 
   if (constant_formats[cf].scale)
     x <<= constant_formats[cf].scale;
 
   if (constant_formats[cf].decimal)
-    {
-      if (constant_formats[cf].leading)
-        {
-          char ps[10];
-          sprintf (ps, "%%%ii", constant_formats[cf].leading);
-          sprintf (buf, ps, x);
-        }
-      else
-        sprintf (buf, "%li", x);
-    }
+    sprintf (buf, "%*li", constant_formats[cf].leading, x);
   else
     {
       if (constant_formats[cf].issigned && x < 0)
         sprintf (buf, "-0x%x", abs (x));
       else
         sprintf (buf, "0x%lx", (unsigned long) x);
     }
 
   return buf;
 }
@@ skipping 4622 matching lines @@
   if (!comment)
     OUTS (outf, ";");
 
   if (count == 0)
     return 2;
 
   comment = 0;
 
   return count;
 }