Merge GDB 7.5.1

include/opcode/crx.h

 /* crx.h -- Header file for CRX opcode and register tables.
-   Copyright 2004, 2010 Free Software Foundation, Inc.
+   Copyright 2004, 2010, 2012 Free Software Foundation, Inc.
    Contributed by Tomer Levi, NSC, Israel.
    Originally written for GAS 2.12 by Tomer Levi, NSC, Israel.
    Updates, BFDizing, GNUifying and ELF support by Tomer Levi.
 
    This file is part of GAS, GDB and the GNU binutils.
 
    GAS, GDB, and GNU binutils 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.
@@ skipping 364 matching lines @@
 extern const reg_entry crx_copregtab[];
 extern const int crx_num_copregs;
 #define NUMCOPREGS crx_num_copregs
 
 /* CRX trap/interrupt table.  */
 extern const trap_entry crx_traps[];
 extern const int crx_num_traps;
 #define NUMTRAPS crx_num_traps
 
 /* cst4 operand mapping.  */
-extern const long cst4_map[];
+extern const int cst4_map[];
 extern const int cst4_maps;
 
 /* Table of instructions with no operands.  */
 extern const char* no_op_insn[];
 
 /* Current instruction we're assembling.  */
 extern const inst *instruction;
 
 /* A macro for representing the instruction "constant" opcode, that is,
    the FIXED part of the instruction. The "constant" opcode is represented
@@ skipping 12 matching lines @@
 /* Does the current instruction has register list ?  */
 #define INST_HAS_REG_LIST             \
   (instruction->flags & REG_LIST)
 
 /* Long long type handling.  */
 /* Replace all appearances of 'long long int' with LONGLONG.  */
 typedef long long int LONGLONG;
 typedef unsigned long long ULONGLONG;
 
 #endif /* _CRX_H_ */