From owner-svn-src-head@FreeBSD.ORG Wed Oct 2 05:30:01 2013 Return-Path: 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 8CCF6961; Wed, 2 Oct 2013 05:30:01 +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 2ACC02C00; Wed, 2 Oct 2013 05:30:00 +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 r925TqwN011681; Wed, 2 Oct 2013 08:29:52 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.8.3 kib.kiev.ua r925TqwN011681 Received: (from kostik@localhost) by tom.home (8.14.7/8.14.7/Submit) id r925TqLm011680; Wed, 2 Oct 2013 08:29:52 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 2 Oct 2013 08:29:51 +0300 From: Konstantin Belousov To: Ed Maste Subject: Re: svn commit: r255983 - head/libexec/rtld-elf Message-ID: <20131002052951.GU41229@kib.kiev.ua> References: <201310020232.r922WxgJ051573@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="DdbKCPkVBkC7ZIh6" Content-Disposition: inline In-Reply-To: <201310020232.r922WxgJ051573@svn.freebsd.org> 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: Wed, 02 Oct 2013 05:30:01 -0000 --DdbKCPkVBkC7ZIh6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Oct 02, 2013 at 02:32:59AM +0000, Ed Maste wrote: > Author: emaste > Date: Wed Oct 2 02:32:58 2013 > New Revision: 255983 > URL: http://svnweb.freebsd.org/changeset/base/255983 >=20 > Log: > Populate .rld_map on MIPS for debuggers > =20 > On MIPS the .dynamic section is read-only, so the pointer to rtld > information for debuggers cannot be stored there (in DT_DEBUG). > Instead, a special section .rld_map is used. > =20 > Sponsored by: DARPA, AFRL > Approved by: re (delphij) >=20 > Modified: > head/libexec/rtld-elf/rtld.c >=20 > Modified: head/libexec/rtld-elf/rtld.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/libexec/rtld-elf/rtld.c Wed Oct 2 00:50:27 2013 (r255982) > +++ head/libexec/rtld-elf/rtld.c Wed Oct 2 02:32:58 2013 (r255983) > @@ -1111,11 +1111,7 @@ digest_dynamic1(Obj_Entry *obj, int earl > break; > =20 > case DT_MIPS_RLD_MAP: > -#ifdef notyet > - if (!early) > - dbg("Filling in DT_DEBUG entry"); > - ((Elf_Dyn*)dynp)->d_un.d_ptr =3D (Elf_Addr) &r_debug; > -#endif > + *((Elf_Addr *)(dynp->d_un.d_ptr)) =3D (Elf_Addr) &r_debug; > break; > #endif > =20 Could the DT_DEBUG and DT_MIPS_RLD_MAP cases be collapsed some more, e.g. by putting only the 'case :' lines under ifdef ? Also, you removed the if (!early) test. Is rtld relocated enough in the init_rtld() for this assignment to work correctly ? --DdbKCPkVBkC7ZIh6 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQIcBAEBAgAGBQJSS69PAAoJEJDCuSvBvK1BG5wQAKIzUYRV3O+u/J34XQGR/tuS O0dxqFqG0x84ouSKUih/HS11XOGcAzwXaUcrfLlZJ9i8vE8szdljuPVZo32wT9ll nPu2jV5XiEZyc/dpGkVr8QmogPcW6adOvfdTAsG/BDBOhy6/mecqZeO/yt4Il1dq +9HjsTMpEmYdxP35oHuOqwhq3YR3DDjCtEvvtanvGwFZFVhJiIvrrt1Mumg1z/K/ +qZmaea0q8+mgkCiedU/qbrhkwtxpy0e+vwrgZ/0uEP/l6ozE9UtU6LVx9xw1Af3 vbeJNdv9/cEweIjNYBTNXJomQvca8vXF3/VsaC4i9kanecolzwxrviAajHpvMEUA WF3Je7hHkGwI1Gx3SGWRz+1GmcrIl8THPstZ1XQIvOnXLOKUXmj4/hlqNSseD/Ob 2grvEUNdaemyHWJzVjefRFVtHEazF7MtL0RxeRzKLt9Wsij5PCRcuPZPUefy+paX AoOTr7s5XrgMNAeFF8QvW9uSg6CaXaBbfSfZ7Eo84upo1YCo1PBBL3+3p/h/EOYP R8JAHOyv26pi4OK5JsEWS93nrrt0k48z5f+LRP3CBRmJOq+LXTah+FyyIaOBd33x E1Glc9g9PVff+f5dEf/HtIjbPyZdUCHAOdocLjjdVcPw2XOwWpW3aTAWmjeQoeFL 2WhvQ+XPfiwQK+abgbRu =3/ng -----END PGP SIGNATURE----- --DdbKCPkVBkC7ZIh6--