Module Name: src
Committed By: mrg
Date: Mon Jun 17 06:33:53 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/gdb: ppc-nbsd-nat.c sh-nbsd-tdep.c
Log Message:
fix cross gdb build on sh and ppc:
- gdb_assert.h has moved into common/gdb_assert.h.
- force promotion to avoid compile errors
XXX why aren't these files built into the native binary, and
triggered normal build failures.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c:1.8 src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c:1.9
--- src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c:1.8 Thu May 30 21:27:58 2019
+++ src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c Mon Jun 17 06:33:53 2019
@@ -32,7 +32,7 @@
#include "inferior.h"
#include "regcache.h"
-#include "gdb_assert.h"
+#include "common/gdb_assert.h"
#include "nbsd-nat.h"
#include "ppc-tdep.h"
Index: src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c:1.5 src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c:1.6
--- src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c:1.5 Thu May 30 19:34:27 2019
+++ src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c Mon Jun 17 06:33:53 2019
@@ -32,7 +32,7 @@
#include "trad-frame.h"
#include "tramp-frame.h"
-#include "gdb_assert.h"
+#include "common/gdb_assert.h"
#include "solib-svr4.h"
@@ -143,25 +143,25 @@ static const struct tramp_frame shnbsd_s
SIGTRAMP_FRAME,
2,
{
- { 0x64f3, -1 }, /* mov r15,r4 */
- { 0xd002, -1 }, /* mov.l .LSYS_setcontext */
- { 0xc380, -1 }, /* trapa #-128 */
- { 0xa003, -1 }, /* bra .Lskip1 */
- { 0x0009, -1 }, /* nop */
- { 0x0009, -1 }, /* nop */
+ { 0x64f3, (ULONGEST)-1 }, /* mov r15,r4 */
+ { 0xd002, (ULONGEST)-1 }, /* mov.l .LSYS_setcontext */
+ { 0xc380, (ULONGEST)-1 }, /* trapa #-128 */
+ { 0xa003, (ULONGEST)-1 }, /* bra .Lskip1 */
+ { 0x0009, (ULONGEST)-1 }, /* nop */
+ { 0x0009, (ULONGEST)-1 }, /* nop */
/* .LSYS_setcontext */
- { 0x0134, -1 }, { 0x0000, -1 }, /* 0x134 */
+ { 0x0134, (ULONGEST)-1 }, { 0x0000, (ULONGEST)-1 }, /* 0x134 */
/* .Lskip1 */
- { 0x6403, -1 }, /* mov r0,r4 */
- { 0xd002, -1 }, /* mov.l .LSYS_exit */
- { 0xc380, -1 }, /* trapa #-128 */
- { 0xa003, -1 }, /* bra .Lskip2 */
- { 0x0009, -1 }, /* nop */
- { 0x0009, -1 }, /* nop */
+ { 0x6403, (ULONGEST)-1 }, /* mov r0,r4 */
+ { 0xd002, (ULONGEST)-1 }, /* mov.l .LSYS_exit */
+ { 0xc380, (ULONGEST)-1 }, /* trapa #-128 */
+ { 0xa003, (ULONGEST)-1 }, /* bra .Lskip2 */
+ { 0x0009, (ULONGEST)-1 }, /* nop */
+ { 0x0009, (ULONGEST)-1 }, /* nop */
/* .LSYS_exit */
- { 0x0001, -1 }, { 0x0000, -1 }, /* 0x1 */
+ { 0x0001, (ULONGEST)-1 }, { 0x0000, (ULONGEST)-1 }, /* 0x1 */
/* .Lskip2 */
- { TRAMP_SENTINEL_INSN, -1 }
+ { TRAMP_SENTINEL_INSN, (ULONGEST)-1 }
},
shnbsd_sigtramp_cache_init
};
