From owner-p4-projects@FreeBSD.ORG  Wed Apr  4 15:11:34 2007
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 6097616A403; Wed,  4 Apr 2007 15:11:34 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 16EB916A408
	for <perforce@FreeBSD.org>; Wed,  4 Apr 2007 15:11:34 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 07DE313C487
	for <perforce@FreeBSD.org>; Wed,  4 Apr 2007 15:11:34 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34FBXRq071874
	for <perforce@FreeBSD.org>; Wed, 4 Apr 2007 15:11:33 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34FBXwr071856
	for perforce@freebsd.org; Wed, 4 Apr 2007 15:11:33 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 4 Apr 2007 15:11:33 GMT
Message-Id: <200704041511.l34FBXwr071856@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 117361 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: Wed, 04 Apr 2007 15:11:34 -0000

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

Change 117361 by gonzo@gonzo_jeeves on 2007/04/04 15:10:43

	o Resolve conflict: still "NO GDB" for mips

Affected files ...

.. //depot/projects/mips2/src/gnu/usr.bin/Makefile#4 edit

Differences ...

==== //depot/projects/mips2/src/gnu/usr.bin/Makefile#4 (text+ko) ====

@@ -23,19 +23,10 @@
 	sort \
 	${_texinfo}
  
->>>> ORIGINAL Makefile#35
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_ARCH} == "mips"
 MK_GDB=	no	# not yet
 .endif
 
-==== THEIRS Makefile#39
-==== YOURS Makefile
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" || \
-	${MACHINE_ARCH} == "mips"
-MK_GDB=	no	# not yet
-.endif
-
-<<<<
 .if ${MK_CXX} != "no"
 _gperf=		gperf
 .if ${MK_GROFF} != "no"