From owner-svn-src-head@FreeBSD.ORG Mon Sep 9 04:28:47 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 082FD764; Mon, 9 Sep 2013 04:28:47 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 999672397; Mon, 9 Sep 2013 04:28:46 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.7/8.14.7) with ESMTP id r894SfjP055169; Mon, 9 Sep 2013 07:28:41 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.8.3 kib.kiev.ua r894SfjP055169 Received: (from kostik@localhost) by tom.home (8.14.7/8.14.7/Submit) id r894Sfd7055168; Mon, 9 Sep 2013 07:28:41 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 9 Sep 2013 07:28:41 +0300 From: Konstantin Belousov To: Dag-Erling Sm??rgrav Subject: Re: svn commit: r255385 - in head/etc: . etc.amd64 Message-ID: <20130909042841.GE41229@kib.kiev.ua> References: <201309080946.r889kNSX050568@svn.freebsd.org> <20130908110410.GZ41229@kib.kiev.ua> <86zjrnedp5.fsf@nine.des.no> <20130908143854.GA41229@kib.kiev.ua> <86ioybozic.fsf@nine.des.no> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="iqMm74K5rg2eMP7U" Content-Disposition: inline In-Reply-To: <86ioybozic.fsf@nine.des.no> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 04:28:47 -0000 --iqMm74K5rg2eMP7U Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Sep 08, 2013 at 09:59:55PM +0200, Dag-Erling Sm??rgrav wrote: > How about this, which eliminates the unneeded mappings and installs > libmap32.conf on powerpc64 as well? >=20 > 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 This looks fine. >=20 > 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). >=20 The knob does not exists probably because there is the build32 stage. Are you going to remove COMPAT_32BIT conditional from the rtld.c ? --iqMm74K5rg2eMP7U Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQIcBAEBAgAGBQJSLU54AAoJEJDCuSvBvK1BR1MQAIa7mReJh9K4I0DrnxiTTnpp bZIWVlk55PEdRm/VV/x2kx0MTPnDmgY4PcPEVU6ph67slzA4qw1eE8/lC0cNYA9D KkrRirm/lY5vV2A5BN9qA2GW1kn2qsDHfBT2NhckGyG3mI5lRbplETLzTNXnSvka /rBVl/qDgFKOeS1emNFx+BSMHJ27hwuHSQwZ+33v2mE8GCKypIML5BQFs6rs1/5N ZMktIyTW9zDlIDxlHEiYjxXriqJFkNK5APPM80CMx57PfjF4sSmbVvMCJhhqD2t2 iMrNPKe9C1l0kj4vJFjRac9fLCPocJBzGgP7X3BKhg9tE9xP/oUufAWb1ygmGmuH ijWt3tNoc6l9YV5amrk1KBlmSV9DTKHcj0PWzrAAlrgLLSHkjHr2xNVYDJ7v16Sl IZHj8wfEyXsQ0os6H7IKrAh6KfEGPS2p25fDRkutR0TOgcn8v/VBPMxZbcsNk3nn rDNvwS9GIyvwVASKwdijYZlhZ+E78OzA94BuK/q7UGtkOZoysFGs4WQpAsWyUAGI YqOWuv99xSm/RFplhrPkxcWXdnZFJlhMh/LC9Zy07qkru0gOjaDO8QOyD6dN8f/g BNpoIFQC87/Ff+MEH2S8VUQRvUG0182jTdj0o8h9T17sQmza4LDWtfpZn5I0xkX9 f+QoP88Ll1Dz2FLmk4Zd =KZBQ -----END PGP SIGNATURE----- --iqMm74K5rg2eMP7U--