Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3/gdb/dist/gdb fix cross gdb build on sh and ppc:



details:   https://anonhg.NetBSD.org/src/rev/29ddf7466be7
branches:  trunk
changeset: 999720:29ddf7466be7
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jun 17 06:33:53 2019 +0000

description:
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.

diffstat:

 external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c |   2 +-
 external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c |  32 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diffs (65 lines):

diff -r 186e9361cd89 -r 29ddf7466be7 external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c
--- a/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c Mon Jun 17 05:45:46 2019 +0000
+++ b/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c Mon Jun 17 06:33:53 2019 +0000
@@ -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"
diff -r 186e9361cd89 -r 29ddf7466be7 external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c
--- a/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c Mon Jun 17 05:45:46 2019 +0000
+++ b/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c Mon Jun 17 06:33:53 2019 +0000
@@ -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 @@
   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
 };



Home | Main Index | Thread Index | Old Index