From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14754 invoked by alias); 6 Dec 2010 11:03:16 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 14694 invoked by uid 9674); 6 Dec 2010 11:03:14 -0000 Date: Mon, 06 Dec 2010 11:03:00 -0000 Message-ID: <20101206110314.14679.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-jankratochvil-watchpoint3: fix X-Git-Refname: refs/heads/archer-jankratochvil-watchpoint3 X-Git-Reftype: branch X-Git-Oldrev: 317e126995ae314d793ccece95e95d2ec6fb0f90 X-Git-Newrev: ec35ce9d359781ae2a49b8965553b906f4fdfe0d X-SW-Source: 2010-q4/txt/msg00108.txt.bz2 List-Id: The branch, archer-jankratochvil-watchpoint3 has been updated via ec35ce9d359781ae2a49b8965553b906f4fdfe0d (commit) via 25d348bd51d3a7c38b553b28b2fa5540f205627e (commit) via 7ef4b77af4da702799934f1fd000ae538e5278e3 (commit) via 299fe7ca2d2432caf00fb6e6859a3e05973127a8 (commit) via dac9d4adf66517eb05f590382a50f128a9d78b74 (commit) via 9af4474194a687e2f222ea50529105229bed4ee6 (commit) via 845218bee7abd4eb4df97b2eb17711582fbc5d8c (commit) via cb60851669df80ba790a611f4891afb94669b695 (commit) via aab50fb856ef7e264e923c8e35fde04880931ebf (commit) via 6cc5e407bb3d9f4b17268175daebd1b110586cfa (commit) via d93ba7ea6f14d3bc9726b555f87b2730ef1a33dd (commit) via 21557ccb2ffc92d3379e25ab7b55cfd265765f07 (commit) via 635c36ce4b7405416b78e438a3982f47327c4887 (commit) via 8be2c80ff9a44067f5ca12662c4dc222ba478783 (commit) via 7aeeaa5a2270f7ffb3e75bd8388ea5882f32f03a (commit) via e4429ea477beef486cde0921d3e40ff9772cb1de (commit) via be0278685bfb10e7e8349d3249088ad1a0a0526d (commit) via db357273935f40a3f7161a00eb9359763ec46e01 (commit) via ee8200beafd4a6e75fc0e96c3c2b4f22970133b6 (commit) via 30f17584785eb8f4948d56ff0da0b49c4e7db7a7 (commit) via f49a7bbde49f4924d57149a037f01d8ce9e4ed20 (commit) via 2682ef10e329f3775cdc474e93f28883b39bd69e (commit) via dabe0b06566fc238d788b8b9fd87666165d93306 (commit) via 930950b25db64a0a3553bfee19041f133bfb24b5 (commit) via aecdaba2ae0bba7183cad145e78f690612a9e86f (commit) via 211c1c7c78e7955319737f54e9629a8a019af55e (commit) via 502d05ffd989fb30eff3e4164748b6f73b5e8c83 (commit) via 2aaadd02107abe7ac8a09dc72b350cca4dc72317 (commit) via 9078d441654f104d3dde0c198a17bd8f794ff64f (commit) via 89053557d035e9aa95217cd4480914772a57f733 (commit) via 6c6fe217f1a39099502f2960bca4e73671a533de (commit) from 317e126995ae314d793ccece95e95d2ec6fb0f90 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit ec35ce9d359781ae2a49b8965553b906f4fdfe0d Author: Jan Kratochvil Date: Mon Dec 6 12:02:42 2010 +0100 fix commit 25d348bd51d3a7c38b553b28b2fa5540f205627e Merge: 317e126 7ef4b77 Author: Jan Kratochvil Date: Mon Dec 6 12:02:10 2010 +0100 Merge branch 'cleanup-fork-kernel-multi' into archer-jankratochvil-watchpoint3 commit 7ef4b77af4da702799934f1fd000ae538e5278e3 Author: Jan Kratochvil Date: Mon Dec 6 12:01:38 2010 +0100 fix commit 299fe7ca2d2432caf00fb6e6859a3e05973127a8 Merge: cb60851 dac9d4a Author: Jan Kratochvil Date: Mon Dec 6 11:42:37 2010 +0100 Merge branch 'cleanup-fork-kernel' into cleanup-fork-kernel-multi commit dac9d4adf66517eb05f590382a50f128a9d78b74 Merge: aab50fb 9af4474 Author: Jan Kratochvil Date: Mon Dec 6 11:42:37 2010 +0100 Merge branch 'cleanup-fork' into cleanup-fork-kernel commit 9af4474194a687e2f222ea50529105229bed4ee6 Merge: 6cc5e40 845218b Author: Jan Kratochvil Date: Mon Dec 6 11:42:36 2010 +0100 Merge branch 'cleanup' into cleanup-fork commit 845218bee7abd4eb4df97b2eb17711582fbc5d8c Author: Jan Kratochvil Date: Mon Dec 6 11:42:28 2010 +0100 update commit cb60851669df80ba790a611f4891afb94669b695 Merge: d93ba7e aab50fb Author: Jan Kratochvil Date: Mon Dec 6 09:06:58 2010 +0100 Merge branch 'cleanup-fork-kernel' into cleanup-fork-kernel-multi commit aab50fb856ef7e264e923c8e35fde04880931ebf Merge: 21557cc 6cc5e40 Author: Jan Kratochvil Date: Mon Dec 6 09:06:58 2010 +0100 Merge branch 'cleanup-fork' into cleanup-fork-kernel commit 6cc5e407bb3d9f4b17268175daebd1b110586cfa Author: Jan Kratochvil Date: Mon Dec 6 09:06:54 2010 +0100 ppc unfix commit d93ba7ea6f14d3bc9726b555f87b2730ef1a33dd Merge: 7aeeaa5 21557cc Author: Jan Kratochvil Date: Mon Dec 6 09:06:40 2010 +0100 Merge branch 'cleanup-fork-kernel' into cleanup-fork-kernel-multi commit 21557ccb2ffc92d3379e25ab7b55cfd265765f07 Merge: e4429ea 635c36c Author: Jan Kratochvil Date: Mon Dec 6 09:06:40 2010 +0100 Merge branch 'cleanup-fork' into cleanup-fork-kernel commit 635c36ce4b7405416b78e438a3982f47327c4887 Merge: be02786 8be2c80 Author: Jan Kratochvil Date: Mon Dec 6 09:06:40 2010 +0100 Merge branch 'cleanup' into cleanup-fork commit 8be2c80ff9a44067f5ca12662c4dc222ba478783 Author: Jan Kratochvil Date: Mon Dec 6 09:06:30 2010 +0100 cleanup ppc fix commit 7aeeaa5a2270f7ffb3e75bd8388ea5882f32f03a Merge: db35727 e4429ea Author: Jan Kratochvil Date: Mon Dec 6 08:45:24 2010 +0100 Merge branch 'cleanup-fork-kernel' into cleanup-fork-kernel-multi commit e4429ea477beef486cde0921d3e40ff9772cb1de Merge: ee8200b be02786 Author: Jan Kratochvil Date: Mon Dec 6 08:45:24 2010 +0100 Merge branch 'cleanup-fork' into cleanup-fork-kernel commit be0278685bfb10e7e8349d3249088ad1a0a0526d Author: Jan Kratochvil Date: Mon Dec 6 08:45:19 2010 +0100 fix commit db357273935f40a3f7161a00eb9359763ec46e01 Merge: 2682ef1 ee8200b Author: Jan Kratochvil Date: Mon Dec 6 08:44:26 2010 +0100 Merge branch 'cleanup-fork-kernel' into cleanup-fork-kernel-multi commit ee8200beafd4a6e75fc0e96c3c2b4f22970133b6 Merge: dabe0b0 30f1758 Author: Jan Kratochvil Date: Mon Dec 6 08:44:26 2010 +0100 Merge branch 'cleanup-fork' into cleanup-fork-kernel commit 30f17584785eb8f4948d56ff0da0b49c4e7db7a7 Merge: 930950b f49a7bb Author: Jan Kratochvil Date: Mon Dec 6 08:44:26 2010 +0100 Merge branch 'cleanup' into cleanup-fork commit f49a7bbde49f4924d57149a037f01d8ce9e4ed20 Author: Jan Kratochvil Date: Mon Dec 6 08:44:07 2010 +0100 i386 compilation fix. commit 2682ef10e329f3775cdc474e93f28883b39bd69e Merge: aecdaba dabe0b0 Author: Jan Kratochvil Date: Mon Dec 6 08:24:18 2010 +0100 Merge branch 'cleanup-fork-kernel' into cleanup-fork-kernel-multi Conflicts: gdb/i386-nat.c commit dabe0b06566fc238d788b8b9fd87666165d93306 Merge: 211c1c7 930950b Author: Jan Kratochvil Date: Mon Dec 6 08:23:51 2010 +0100 Merge branch 'cleanup-fork' into cleanup-fork-kernel commit 930950b25db64a0a3553bfee19041f133bfb24b5 Author: Jan Kratochvil Date: Mon Dec 6 08:23:45 2010 +0100 fix commit aecdaba2ae0bba7183cad145e78f690612a9e86f Merge: 2aaadd0 211c1c7 Author: Jan Kratochvil Date: Mon Dec 6 08:17:54 2010 +0100 Merge branch 'cleanup-fork-kernel' into cleanup-fork-kernel-multi Conflicts: gdb/i386-nat.c commit 211c1c7c78e7955319737f54e9629a8a019af55e Merge: 9078d44 502d05f Author: Jan Kratochvil Date: Mon Dec 6 08:16:41 2010 +0100 Merge branch 'cleanup-fork' into cleanup-fork-kernel commit 502d05ffd989fb30eff3e4164748b6f73b5e8c83 Author: Jan Kratochvil Date: Mon Dec 6 08:16:27 2010 +0100 backport commit 2aaadd02107abe7ac8a09dc72b350cca4dc72317 Author: Jan Kratochvil Date: Mon Dec 6 08:10:19 2010 +0100 multi commit 9078d441654f104d3dde0c198a17bd8f794ff64f Author: Jan Kratochvil Date: Mon Dec 6 08:07:37 2010 +0100 kernel support commit 89053557d035e9aa95217cd4480914772a57f733 Author: Jan Kratochvil Date: Mon Dec 6 08:06:42 2010 +0100 fork fix commit 6c6fe217f1a39099502f2960bca4e73671a533de Author: Jan Kratochvil Date: Mon Dec 6 08:01:57 2010 +0100 cleanup ----------------------------------------------------------------------- Summary of changes: gdb/i386-nat.c | 7 ++++--- gdb/ppc-linux-nat.c | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) First 500 lines of diff: diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c index 60d2d92..92efa80 100644 --- a/gdb/i386-nat.c +++ b/gdb/i386-nat.c @@ -793,6 +793,10 @@ i386_use_watchpoints (struct target_ops *t) t->to_remove_watchpoint = i386_remove_watchpoint; t->to_insert_hw_breakpoint = i386_insert_hw_breakpoint; t->to_remove_hw_breakpoint = i386_remove_hw_breakpoint; + + if (i386_inferior_data == NULL) + i386_inferior_data + = register_inferior_data_with_cleanup (i386_inferior_data_cleanup); } void @@ -803,7 +807,4 @@ i386_set_debug_register_length (int len) gdb_assert (len == 4 || len == 8); i386_dr_low.debug_register_length = len; add_show_debug_regs_command (); - - i386_inferior_data - = register_inferior_data_with_cleanup (i386_inferior_data_cleanup); } diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c index e4a70ee..ebb0022 100644 --- a/gdb/ppc-linux-nat.c +++ b/gdb/ppc-linux-nat.c @@ -1978,8 +1978,6 @@ static int ppc_linux_remove_watchpoint (CORE_ADDR addr, int len, int rw, struct expression *cond) { - struct lwp_info *lp; - ptid_t ptid; int ret = -1; if (have_ptrace_booke_interface ()) hooks/post-receive -- Repository for Project Archer.