diff options
| author | lkundrak <lkundrak@pkgsrc.org> | 2007-07-11 13:12:01 +0000 |
|---|---|---|
| committer | lkundrak <lkundrak@pkgsrc.org> | 2007-07-11 13:12:01 +0000 |
| commit | abf547b8afaa74277e73304118976844cf70a5ab (patch) | |
| tree | 71fb000fd2700a4d61b3cfa666bc1f08aab1d5e4 /devel/gdb | |
| parent | fa3f98ac3441feaae0665293d3d1b1fe005a3125 (diff) | |
| download | pkgsrc-abf547b8afaa74277e73304118976844cf70a5ab.tar.gz | |
Attempt to fix build on >1.6
Diffstat (limited to 'devel/gdb')
| -rw-r--r-- | devel/gdb/distinfo | 4 | ||||
| -rw-r--r-- | devel/gdb/patches/patch-am | 43 |
2 files changed, 43 insertions, 4 deletions
diff --git a/devel/gdb/distinfo b/devel/gdb/distinfo index 047b439aab4..337da7bfb11 100644 --- a/devel/gdb/distinfo +++ b/devel/gdb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2007/07/03 12:41:18 lkundrak Exp $ +$NetBSD: distinfo,v 1.10 2007/07/11 13:12:01 lkundrak Exp $ SHA1 (gdb-5.3.tar.gz) = 24a6c9da6e89b1b82b7508f27f94098d989ff662 RMD160 (gdb-5.3.tar.gz) = 3f88dc11115de08708c50c73b10acaf00ed25e96 @@ -15,7 +15,7 @@ SHA1 (patch-ai) = 24fc619a5de034c4ead6424ffcb30a2e8aa7d816 SHA1 (patch-aj) = 16b03a5ce9b34af42dcec4e26103ebc456d091bf SHA1 (patch-ak) = 0908ff7f7000df702a18c25bce4b4930c61ad8f8 SHA1 (patch-al) = 2721abee837d85f57b05073490d94e9e11d5193d -SHA1 (patch-am) = 8bb74176c2e7042a74330a02d60a1976919da2a0 +SHA1 (patch-am) = 73c6077dcad00fbdde289d270418bd66a36ae9d9 SHA1 (patch-an) = c28777296917daa1a619eca092023c8f5aaf706f SHA1 (patch-ao) = 7a38b55945cf6d9fc422e460d67b88a1e4416e62 SHA1 (patch-ap) = e79d8a70d12098716791e3349d8606d07f8acd47 diff --git a/devel/gdb/patches/patch-am b/devel/gdb/patches/patch-am index 7c164bf946f..fc851407170 100644 --- a/devel/gdb/patches/patch-am +++ b/devel/gdb/patches/patch-am @@ -1,6 +1,6 @@ -$NetBSD: patch-am,v 1.1 2006/02/27 15:45:29 joerg Exp $ +$NetBSD: patch-am,v 1.2 2007/07/11 13:12:01 lkundrak Exp $ ---- gdb/i386bsd-nat.c.orig 2006-02-27 14:51:46.000000000 +0000 +--- gdb/i386bsd-nat.c.orig 2007-07-11 14:32:16.000000000 +0200 +++ gdb/i386bsd-nat.c @@ -395,7 +395,7 @@ _initialize_i386bsd_nat (void) system header files and sysctl(3) to get at the relevant @@ -11,3 +11,42 @@ $NetBSD: patch-am,v 1.1 2006/02/27 15:45:29 joerg Exp $ extern int i386fbsd4_sc_pc_offset; extern int i386fbsd4_sc_sp_offset; #define SC_PC_OFFSET i386fbsd4_sc_pc_offset +@@ -419,26 +419,30 @@ _initialize_i386bsd_nat (void) + + /* Override the default value for the offset of the program counter + in the sigcontext structure. */ +- sc_pc_offset = offsetof (struct sigcontext, sc_pc); ++#if defined(__DragonFly__) ++ sc_pc_offset = offsetof (ucontext_t, uc_mcontext.mc_eip); ++#else ++ sc_pc_offset = offsetof (ucontext_t, uc_mcontext.__gregs[_REG_EIP]); ++#endif + + if (SC_PC_OFFSET != sc_pc_offset) + { +- warning ("\ +-offsetof (struct sigcontext, sc_pc) yields %d instead of %d.\n\ +-Please report this to <bug-gdb@gnu.org>.", ++ warning ("sc_pc_offset is %d instead of %d.", + sc_pc_offset, SC_PC_OFFSET); + } + + SC_PC_OFFSET = sc_pc_offset; + + /* Likewise for the stack pointer. */ +- sc_sp_offset = offsetof (struct sigcontext, sc_sp); ++#if defined(__DragonFly__) ++ sc_sp_offset = offsetof (ucontext_t, uc_mcontext.mc_esp); ++#else ++ sc_sp_offset = offsetof (ucontext_t, uc_mcontext.__gregs[_REG_UESP]); ++#endif + + if (SC_SP_OFFSET != sc_sp_offset) + { +- warning ("\ +-offsetof (struct sigcontext, sc_sp) yields %d instead of %d.\n\ +-Please report this to <bug-gdb@gnu.org>.", ++ warning ("sc_sp_offset is %d instead of %d.", + sc_sp_offset, SC_SP_OFFSET); + } + |