Merge GDB 7.5.1

gdb/score-tdep.c

 /* Target-dependent code for the S+core architecture, for GDB,
    the GNU Debugger.
 
    Copyright (C) 2006-2012 Free Software Foundation, Inc.
 
    Contributed by Qinwei (qinwei@sunnorth.com.cn)
    Contributed by Ching-Peng Lin (cplin@sunplus.com)
 
    This file is part of GDB.
 
@@ skipping 203 matching lines @@
       {-2, 4},
       {0, 0},
       {0, 2},
       {0, 0},
       {-4, 6},
       {0, 0}
     };
 
 #define EXTRACT_LEN 2
   CORE_ADDR adjust_pc = *pcptr & ~0x1;
-  int inst_len;
   gdb_byte buf[5][EXTRACT_LEN] =
     {
       {'\0', '\0'},
       {'\0', '\0'},
       {'\0', '\0'},
       {'\0', '\0'},
       {'\0', '\0'}
     };
   int ret;
   unsigned int raw;
@@ skipping 208 matching lines @@
 
   if (readbuf != NULL)
     regcache_cooked_read_part (regcache, regnum, reg_offset, length,
                                readbuf + buf_offset);
   if (writebuf != NULL)
     regcache_cooked_write_part (regcache, regnum, reg_offset, length,
                                 writebuf + buf_offset);
 }
 
 static enum return_value_convention
-score_return_value (struct gdbarch *gdbarch, struct type *func_type,
+score_return_value (struct gdbarch *gdbarch, struct value *function,
                     struct type *type, struct regcache *regcache,
                     gdb_byte * readbuf, const gdb_byte * writebuf)
 {
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT
       || TYPE_CODE (type) == TYPE_CODE_UNION
       || TYPE_CODE (type) == TYPE_CODE_ARRAY)
     return RETURN_VALUE_STRUCT_CONVENTION;
   else
     {
       int offset;
@@ skipping 1085 matching lines @@
   return gdbarch;
 }
 
 extern initialize_file_ftype _initialize_score_tdep;
 
 void
 _initialize_score_tdep (void)
 {
   gdbarch_register (bfd_arch_score, score_gdbarch_init, NULL);
 }