Fix PR threads/19422 - show which thread caused stop

[deliverable/binutils-gdb.git] / gdb / xtensa-tdep.h

diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h
index 5b28cab417ea02d5ea51b3ff372cafb092a4b9c1..b2b190376a9a008d172047beb60de5e12f9c242a 100644 (file)
--- a/gdb/xtensa-tdep.h
+++ b/gdb/xtensa-tdep.h
@@ -1,6 +1,6 @@
 /* Target-dependent code for the Xtensa port of GDB, the GNU debugger.
 
-   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -124,9 +124,13 @@ typedef struct
 
 /*  For xtensa-config.c to expand to the structure above.  */
 #define XTREG(index,ofs,bsz,sz,al,tnum,flg,cp,ty,gr,name,fet,sto,mas,ct,x,y) \
-       {#name, ofs, ty, ((gr) | ((xtRegisterGroupNCP >> 2) << (cp + 2))), \
+       {#name, ofs, (xtensa_register_type_t) (ty), \
+       ((xtensa_register_group_t) \
+        ((gr) | ((xtRegisterGroupNCP >> 2) << (cp + 2)))), \
         ct, bsz, sz, al, tnum, flg, cp, mas, fet, sto},
-#define XTREG_END {0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0},
+#define XTREG_END \
+  {0, 0, (xtensa_register_type_t) 0, (xtensa_register_group_t) 0,      \
+   0, 0, 0, 0, -1, 0, 0, 0, 0, 0},
 
 #define XTENSA_REGISTER_FLAGS_PRIVILEGED       0x0001
 #define XTENSA_REGISTER_FLAGS_READABLE         0x0002
@@ -226,7 +230,9 @@ struct gdbarch_tdep
          .spill_location = -1,                                 \
          .spill_size = (spillsz),                              \
          .unused = 0,                                          \
-         .call_abi = CallAbiDefault,                           \
+         .call_abi = (XSHAL_ABI == XTHAL_ABI_CALL0             \
+                      ? CallAbiCall0Only                       \
+                      : CallAbiDefault),                       \
          .debug_interrupt_level = XCHAL_DEBUGLEVEL,            \
          .icache_line_bytes = XCHAL_ICACHE_LINESIZE,           \
          .dcache_line_bytes = XCHAL_DCACHE_LINESIZE,           \