From owner-svn-src-all@FreeBSD.ORG  Sat May  8 13:41:58 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C2764106564A;
	Sat,  8 May 2010 13:41:58 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id B25818FC18;
	Sat,  8 May 2010 13:41:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o48DfwYX030547;
	Sat, 8 May 2010 13:41:58 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o48DfwMI030545;
	Sat, 8 May 2010 13:41:58 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201005081341.o48DfwMI030545@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 8 May 2010 13:41:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207779 - stable/6/lib
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 May 2010 13:41:58 -0000

Author: imp
Date: Sat May  8 13:41:58 2010
New Revision: 207779
URL: http://svn.freebsd.org/changeset/base/207779

Log:
  Hand merge in support for compiling libthread_db on arm (from change
  r173703).  Given the large delta between this and head, mergeinfo
  likely would do more harm than good.

Modified:
  stable/6/lib/Makefile

Modified: stable/6/lib/Makefile
==============================================================================
--- stable/6/lib/Makefile	Sat May  8 13:41:01 2010	(r207778)
+++ stable/6/lib/Makefile	Sat May  8 13:41:58 2010	(r207779)
@@ -101,7 +101,7 @@ _libpthread=	libpthread
 _libthr= libthr
 .endif
 
-.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "powerpc"
+.if ${MACHINE_ARCH} != "powerpc"
 _libthread_db= libthread_db
 .endif