From owner-svn-src-all@FreeBSD.ORG  Wed Aug 25 20:48:24 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7FA1810656AB;
	Wed, 25 Aug 2010 20:48:24 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6EF718FC16;
	Wed, 25 Aug 2010 20:48:24 +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 o7PKmOZd022057;
	Wed, 25 Aug 2010 20:48:24 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7PKmO8f022055;
	Wed, 25 Aug 2010 20:48:24 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201008252048.o7PKmO8f022055@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 25 Aug 2010 20:48:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211822 - head/lib/libc
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: Wed, 25 Aug 2010 20:48:24 -0000

Author: nwhitehorn
Date: Wed Aug 25 20:48:24 2010
New Revision: 211822
URL: http://svn.freebsd.org/changeset/base/211822

Log:
  Allow ABIs to provide their own LIBC_ARCH in a more generic way. As a side
  effect, this fixes the build on powerpc64.
  
  Reviewed by:	imp

Modified:
  head/lib/libc/Makefile

Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile	Wed Aug 25 20:37:58 2010	(r211821)
+++ head/lib/libc/Makefile	Wed Aug 25 20:48:24 2010	(r211822)
@@ -5,10 +5,11 @@ SHLIBDIR?= /lib
 
 .include <bsd.own.mk>
 
-# We have to special case powerpc and powerpc64, since they mostly have
-# the same source implementation.  libc is very different due to large
-# ABI differences.
-.if ${MACHINE_ARCH} == "powerpc"
+# Pick the current architecture directory for libc. In general, this is
+# named MACHINE_CPUARCH, but some ABIs are different enough to require
+# their own libc, so allow a directory named MACHINE_ARCH to override this.
+
+.if exists(${.CURDIR}/${MACHINE_ARCH})
 LIBC_ARCH=${MACHINE_ARCH}
 .else
 LIBC_ARCH=${MACHINE_CPUARCH}