From owner-svn-src-all@FreeBSD.ORG  Sun Sep  8 09:46:23 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9CACF3CB;
 Sun,  8 Sep 2013 09:46:23 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 88AFF24BC;
 Sun,  8 Sep 2013 09:46:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r889kNQV050571;
 Sun, 8 Sep 2013 09:46:23 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r889kNSX050568;
 Sun, 8 Sep 2013 09:46:23 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201309080946.r889kNSX050568@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Sun, 8 Sep 2013 09:46:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255385 - in head/etc: . etc.amd64
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 08 Sep 2013 09:46:23 -0000

Author: des
Date: Sun Sep  8 09:46:22 2013
New Revision: 255385
URL: http://svnweb.freebsd.org/changeset/base/255385

Log:
  Add a stock libmap32.conf for amd64.  The first two lines have no effect
  except to document the hardcoded standard library search path for 32-bit
  binaries.  The third line performs the equivalent substitution for the
  private library directory.
  
  Ironically, these entries rely on functionality which is only available
  in the COMPAT_32BIT version of rtld-elf.
  
  Approved by:	re (blanket)

Added:
  head/etc/etc.amd64/libmap32.conf   (contents, props changed)
Modified:
  head/etc/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Sun Sep  8 09:40:23 2013	(r255384)
+++ head/etc/Makefile	Sun Sep  8 09:46:22 2013	(r255385)
@@ -50,6 +50,10 @@ BIN1=	crontab \
 	syslog.conf \
 	termcap.small
 
+.if ${MACHINE} == "amd64"
+BIN1+=	etc.${MACHINE}/libmap32.conf
+.endif
+
 .if exists(${.CURDIR}/etc.${MACHINE}/ttys)
 BIN1+=	etc.${MACHINE}/ttys
 .elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys)

Added: head/etc/etc.amd64/libmap32.conf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/etc/etc.amd64/libmap32.conf	Sun Sep  8 09:46:22 2013	(r255385)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+/lib			/lib32
+/usr/lib		/usr/lib32
+/usr/lib/private	/usr/lib32/private