From owner-svn-src-head@FreeBSD.ORG  Sun Sep  8 19:59:54 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 8874ADFE;
 Sun,  8 Sep 2013 19:59:54 +0000 (UTC) (envelope-from des@des.no)
Received: from smtp.des.no (smtp.des.no [194.63.250.102])
 by mx1.freebsd.org (Postfix) with ESMTP id 42FC32E1C;
 Sun,  8 Sep 2013 19:59:54 +0000 (UTC)
Received: from nine.des.no (smtp.des.no [194.63.250.102])
 by smtp-int.des.no (Postfix) with ESMTP id 218674CB9;
 Sun,  8 Sep 2013 19:59:53 +0000 (UTC)
Received: by nine.des.no (Postfix, from userid 1001)
 id 9BDC236117; Sun,  8 Sep 2013 21:59:56 +0200 (CEST)
From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: Konstantin Belousov <kostikbel@gmail.com>
Subject: Re: svn commit: r255385 - in head/etc: . etc.amd64
References: <201309080946.r889kNSX050568@svn.freebsd.org>
 <20130908110410.GZ41229@kib.kiev.ua> <86zjrnedp5.fsf@nine.des.no>
 <20130908143854.GA41229@kib.kiev.ua>
Date: Sun, 08 Sep 2013 21:59:55 +0200
In-Reply-To: <20130908143854.GA41229@kib.kiev.ua> (Konstantin Belousov's
 message of "Sun, 8 Sep 2013 17:38:54 +0300")
Message-ID: <86ioybozic.fsf@nine.des.no>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Sep 2013 19:59:54 -0000

How about this, which eliminates the unneeded mappings and installs
libmap32.conf on powerpc64 as well?

Index: etc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- etc/Makefile	(revision 255393)
+++ etc/Makefile	(working copy)
@@ -50,8 +50,8 @@
 	syslog.conf \
 	termcap.small
=20
-.if ${MACHINE} =3D=3D "amd64"
-BIN1+=3D	etc.${MACHINE}/libmap32.conf
+.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64"
+BIN1+=3D	libmap32.conf
 .endif
=20
 .if exists(${.CURDIR}/etc.${MACHINE}/ttys)
Index: etc/libmap32.conf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- etc/libmap32.conf	(revision 255393)
+++ etc/libmap32.conf	(working copy)
@@ -1,4 +1,2 @@
 # $FreeBSD$
-/lib			/lib32
-/usr/lib		/usr/lib32
 /usr/lib/private	/usr/lib32/private
Index: etc/etc.amd64/libmap32.conf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- etc/etc.amd64/libmap32.conf	(revision 255393)
+++ etc/etc.amd64/libmap32.conf	(working copy)
@@ -1,4 +0,0 @@
-# $FreeBSD$
-/lib			/lib32
-/usr/lib		/usr/lib32
-/usr/lib/private	/usr/lib32/private

We should have a knob that says "this arch supports 32-bit emulation" so
we don't have to edit a million files when somebody implements 32-bit
emulation on a new arch (such as mips64 or arm64).

DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no