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.
This commit is contained in:
mrg 2019-06-17 06:33:53 +00:00
parent eeb12df7f5
commit 0f3896e83f
2 changed files with 17 additions and 17 deletions

View File

@ -32,7 +32,7 @@
#include "inferior.h" #include "inferior.h"
#include "regcache.h" #include "regcache.h"
#include "gdb_assert.h" #include "common/gdb_assert.h"
#include "nbsd-nat.h" #include "nbsd-nat.h"
#include "ppc-tdep.h" #include "ppc-tdep.h"

View File

@ -32,7 +32,7 @@
#include "trad-frame.h" #include "trad-frame.h"
#include "tramp-frame.h" #include "tramp-frame.h"
#include "gdb_assert.h" #include "common/gdb_assert.h"
#include "solib-svr4.h" #include "solib-svr4.h"
@ -143,25 +143,25 @@ static const struct tramp_frame shnbsd_sigtramp_si2 =
SIGTRAMP_FRAME, SIGTRAMP_FRAME,
2, 2,
{ {
{ 0x64f3, -1 }, /* mov r15,r4 */ { 0x64f3, (ULONGEST)-1 }, /* mov r15,r4 */
{ 0xd002, -1 }, /* mov.l .LSYS_setcontext */ { 0xd002, (ULONGEST)-1 }, /* mov.l .LSYS_setcontext */
{ 0xc380, -1 }, /* trapa #-128 */ { 0xc380, (ULONGEST)-1 }, /* trapa #-128 */
{ 0xa003, -1 }, /* bra .Lskip1 */ { 0xa003, (ULONGEST)-1 }, /* bra .Lskip1 */
{ 0x0009, -1 }, /* nop */ { 0x0009, (ULONGEST)-1 }, /* nop */
{ 0x0009, -1 }, /* nop */ { 0x0009, (ULONGEST)-1 }, /* nop */
/* .LSYS_setcontext */ /* .LSYS_setcontext */
{ 0x0134, -1 }, { 0x0000, -1 }, /* 0x134 */ { 0x0134, (ULONGEST)-1 }, { 0x0000, (ULONGEST)-1 }, /* 0x134 */
/* .Lskip1 */ /* .Lskip1 */
{ 0x6403, -1 }, /* mov r0,r4 */ { 0x6403, (ULONGEST)-1 }, /* mov r0,r4 */
{ 0xd002, -1 }, /* mov.l .LSYS_exit */ { 0xd002, (ULONGEST)-1 }, /* mov.l .LSYS_exit */
{ 0xc380, -1 }, /* trapa #-128 */ { 0xc380, (ULONGEST)-1 }, /* trapa #-128 */
{ 0xa003, -1 }, /* bra .Lskip2 */ { 0xa003, (ULONGEST)-1 }, /* bra .Lskip2 */
{ 0x0009, -1 }, /* nop */ { 0x0009, (ULONGEST)-1 }, /* nop */
{ 0x0009, -1 }, /* nop */ { 0x0009, (ULONGEST)-1 }, /* nop */
/* .LSYS_exit */ /* .LSYS_exit */
{ 0x0001, -1 }, { 0x0000, -1 }, /* 0x1 */ { 0x0001, (ULONGEST)-1 }, { 0x0000, (ULONGEST)-1 }, /* 0x1 */
/* .Lskip2 */ /* .Lskip2 */
{ TRAMP_SENTINEL_INSN, -1 } { TRAMP_SENTINEL_INSN, (ULONGEST)-1 }
}, },
shnbsd_sigtramp_cache_init shnbsd_sigtramp_cache_init
}; };