Merge GDB 7.5.1

gdb/avr-tdep.c

 /* Target-dependent code for Atmel AVR, for GDB.
 
    Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program 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 of the License, or
    (at your option) any later version.
@@ skipping 724 matching lines @@
      Scan:
      in r28,__SP_L__
      in r29,__SP_H__ */
 
   if (scan_stage == 1 && vpc < len)
     {
       static const unsigned char img[] = {
         0xcd, 0xb7,             /* in r28,__SP_L__ */
         0xde, 0xb7              /* in r29,__SP_H__ */
       };
-      unsigned short insn1;
 
       if (vpc + sizeof (img) < len
           && memcmp (prologue + vpc, img, sizeof (img)) == 0)
         {
           vpc += 4;
           scan_stage = 2;
         }
     }
 
   /* Third stage of the prologue scanning.  (Really two stages).
@@ skipping 139 matching lines @@
     return avr_break_insn;
 }
 
 /* Determine, for architecture GDBARCH, how a return value of TYPE
    should be returned.  If it is supposed to be returned in registers,
    and READBUF is non-zero, read the appropriate value from REGCACHE,
    and copy it into READBUF.  If WRITEBUF is non-zero, write the value
    from WRITEBUF into REGCACHE.  */
 
 static enum return_value_convention
-avr_return_value (struct gdbarch *gdbarch, struct type *func_type,
+avr_return_value (struct gdbarch *gdbarch, struct value *function,
                   struct type *valtype, struct regcache *regcache,
                   gdb_byte *readbuf, const gdb_byte *writebuf)
 {
   int i;
   /* Single byte are returned in r24.
      Otherwise, the MSB of the return value is always in r25, calculate which
      register holds the LSB.  */
   int lsb_reg;
 
   if ((TYPE_CODE (valtype) == TYPE_CODE_STRUCT
@@ skipping 628 matching lines @@
      the values of the io space registers in a saner way than just using
      `x/NNNb ADDR`.  */
 
   /* FIXME: TRoth/2002-02-18: This should probably be changed to 'info avr
      io_registers' to signify it is not available on other platforms.  */
 
   add_cmd ("io_registers", class_info, avr_io_reg_read_command,
            _("query remote avr target for io space register values"),
            &infolist);
 }