From owner-p4-projects@FreeBSD.ORG  Fri Jul 14 00:54:23 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CE8E916A4E0; Fri, 14 Jul 2006 00:54:23 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7523B16A4DE
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 00:54:23 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F1DC543D45
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 00:54:22 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6E0sMO8099843
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 00:54:22 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6E0sMFF099840
	for perforce@freebsd.org; Fri, 14 Jul 2006 00:54:22 GMT
	(envelope-from cognet@freebsd.org)
Date: Fri, 14 Jul 2006 00:54:22 GMT
Message-Id: <200607140054.k6E0sMFF099840@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101496 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jul 2006 00:54:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=101496

Change 101496 by cognet@cognet on 2006/07/14 00:53:49

	#ifndef CROSS_DEBUGGER any MD bits in trgt_arm.c, to be able to build
	a cross-kgdb.

Affected files ...

.. //depot/projects/arm/gnu-arm.diff#13 edit

Differences ...

==== //depot/projects/arm/gnu-arm.diff#13 (text+ko) ====

@@ -1016,8 +1016,8 @@
 RCS file: gnu/usr.bin/gdb/kgdb/trgt_arm.c
 diff -N gnu/usr.bin/gdb/kgdb/trgt_arm.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ gnu/usr.bin/gdb/kgdb/trgt_arm.c	6 Jul 2006 23:54:06 -0000
-@@ -0,0 +1,224 @@
++++ gnu/usr.bin/gdb/kgdb/trgt_arm.c	14 Jul 2006 00:49:04 -0000
+@@ -0,0 +1,232 @@
 +/*
 + * Copyright (c) 2004 Marcel Moolenaar
 + * All rights reserved.
@@ -1048,9 +1048,11 @@
 +__FBSDID("$FreeBSD$");
 +
 +#include <sys/types.h>
++#ifndef CROSS_DEBUGGER
 +#include <machine/pcb.h>
 +#include <machine/frame.h>
 +#include <machine/armreg.h>
++#endif
 +#include <err.h>
 +#include <kvm.h>
 +#include <string.h>
@@ -1068,6 +1070,7 @@
 +void
 +kgdb_trgt_fetch_registers(int regno __unused)
 +{
++#ifndef CROSS_DEBUGGER
 +	struct kthr *kt;
 +	struct pcb pcb;
 +	int i, reg;
@@ -1097,6 +1100,7 @@
 +		else
 +			supply_register(ARM_PC_REGNUM, (char *)&reg);
 +	}
++#endif
 +}
 +
 +void
@@ -1105,6 +1109,7 @@
 +	fprintf_unfiltered(gdb_stderr, "XXX: %s\n", __func__);
 +}
 +
++#ifndef CROSS_DEBUGGER
 +struct kgdb_frame_cache {
 +	CORE_ADDR	fp;
 +	CORE_ADDR	sp;
@@ -1214,10 +1219,12 @@
 +        &kgdb_trgt_trapframe_this_id,
 +        &kgdb_trgt_trapframe_prev_register
 +};
++#endif
 +
 +const struct frame_unwind *
 +kgdb_trgt_trapframe_sniffer(struct frame_info *next_frame)
 +{
++#ifndef CROSS_DEBUGGER
 +	char *pname;
 +	CORE_ADDR pc;
 +
@@ -1240,5 +1247,6 @@
 +		is_undef = 1;
 +	else
 +		is_undef = 0;
++#endif
 +	return (NULL);
 +}