From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25082 invoked by alias); 2 Jan 2013 21:05:50 -0000 Received: (qmail 25062 invoked by uid 22791); 2 Jan 2013 21:05:49 -0000 X-SWARE-Spam-Status: No, hits=-8.8 required=5.0 tests=AWL,BAYES_00,KHOP_PGP_SIGNED,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,KHOP_THREADED,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,TW_CP,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 02 Jan 2013 21:05:42 +0000 Received: from vapier.localnet (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 05CB333DCFE; Wed, 2 Jan 2013 21:05:42 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: Re: [PATCH] TASK_DYLD_INFO_COUNT build fix for darwin9 Date: Wed, 02 Jan 2013 21:05:00 -0000 User-Agent: KMail/1.13.7 (Linux/3.7.1; KDE/4.6.5; x86_64; ; ) Cc: Tristan Gingold , Fabian Groffen References: <20130102183848.GM14383@gentoo.org> <937AAF12-6E3D-4F3D-8C1F-40A4D135CA54@adacore.com> In-Reply-To: <937AAF12-6E3D-4F3D-8C1F-40A4D135CA54@adacore.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2202079.OJXgP7iXHX"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <201301021607.24055.vapier@gentoo.org> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2013-01/txt/msg00028.txt.bz2 --nextPart2202079.OJXgP7iXHX Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-length: 2480 On Wednesday 02 January 2013 14:35:09 Tristan Gingold wrote: > On Jan 2, 2013, at 7:38 PM, Fabian Groffen wrote: > > This is a resent of patch 3/ from: > > http://sourceware.org/ml/gdb-patches/2011-12/msg00890.html > >=20 > > Modified for 7.5.1 sources, as this is still a problem, see: > > http://sourceware.org/bugzilla/show_bug.cgi?id=3D14405 > >=20 > > From: Iain Sandoe > > To: gdb-patches at sourceware dot org > > Date: Thu, 29 Dec 2011 20:30:31 +0000 > > Subject: [Patch Darwin] head build fixes for > > i686-darwin9/x86_64-darwin10. > >=20 > > gdb: > > * darwin-nat.c (darwin_read_dyld_info): Only build if > > TASK_DYLD_INFO_COUNT is available. > > (darwin_xfer_partial): Don not try to fetch dyld info > > unless TASK_DYLD_INFO_COUNT is available. >=20 > Ok. i've committed this slightly tweaked version -mike 2013-01-02 Iain Sandoe * darwin-nat.c (darwin_read_dyld_info): Only build if TASK_DYLD_INFO_COUNT is defined. (darwin_xfer_partial): Call darwin_read_dyld_info only if TASK_DYLD_INFO_COUNT is defined. --- darwin-nat.c 1 Jan 2013 06:32:41 -0000 1.39 +++ darwin-nat.c 2 Jan 2013 21:04:56 -0000 @@ -1816,8 +1816,10 @@ out: =20 /* Read LENGTH bytes at offset ADDR of task_dyld_info for TASK, and copy t= hem to RDADDR. - Return 0 on failure; number of bytes read / writen otherwise. */ + Return 0 on failure; number of bytes read / written otherwise. */ =20 +#ifndef TASK_DYLD_INFO_COUNT +/* This is not available in Darwin 9. */ static int darwin_read_dyld_info (task_t task, CORE_ADDR addr, char *rdaddr, int leng= th) { @@ -1839,6 +1841,7 @@ darwin_read_dyld_info (task_t task, CORE memcpy (rdaddr, (char *)&task_dyld_info + addr, length); return length; } +#endif =20 =0C /* Return 0 on failure, number of bytes handled otherwise. TARGET @@ -1881,6 +1884,7 @@ darwin_xfer_partial (struct target_ops * case TARGET_OBJECT_MEMORY: return darwin_read_write_inferior (inf->private->task, offset, readbuf, writebuf, len); +#ifdef TASK_DYLD_INFO_COUNT case TARGET_OBJECT_DARWIN_DYLD_INFO: if (writebuf !=3D NULL || readbuf =3D=3D NULL) { @@ -1888,6 +1892,7 @@ darwin_xfer_partial (struct target_ops * return -1; } return darwin_read_dyld_info (inf->private->task, offset, readbuf, l= en); +#endif default: return -1; } --nextPart2202079.OJXgP7iXHX Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. Content-length: 836 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iQIcBAABAgAGBQJQ5KGMAAoJEEFjO5/oN/WBkooP/0S8W6Voxm2qneMbJ4txO0o6 H1XqrAIqa+zmGkD1ahCZv+YJw8JzGp//wEA81Cg4mPWY8VfyZctVTIchRZaRS1op BMQgpNWZTgm/ko+Xh+AuldjpalhIiIv1F8b6bYEyw/mdUIOJd1gbX7v4J6V0vuzi SYQ2P3undO+J97Wm/8fUIMot06zPBBXEfEh9uNtKyGG9/AV+fmRktR8hf422CzGb w1mJG39InwIhkIU69ouDPQgyYCqOxQ7LSpIBA/9aq22dDDD6U895kz3ZOrXTR6H0 hdKMSHR1hcRK4PT38DiR5GwGsrnHif/EFxm9XPvQ3mV7QNvEctJMwX41xo9QZq7Z IClMAcl/FaEYwsw1AG8BmMlNF0FiAGFz2GAomHILGFMGKKzB++tYtQ0x0paSvo7D 8egRv+HsFCUHt0BrwEWfbRE3GMZlWI+GufvE3gPHnceEer+CZVpTzfKd4fKZ4a07 qfU2R6Q77eewcW0EV9erIQ6+3K0kHtRqohuPYSAD8c0pXEyVUN8YpQzfxWKjhBuk NMlslyOdzvTN1SFKbNlm9AjK/gQH318hDf7xD9yTM1jrFjkK52zrTZYfCeYU6dKk 1faTRWEHr4Kt6FfnoGsswQXzfsYILXjedt4C8mPwQN6gBLpttfTeQtBlwbqiy1NT 8s2Kp1LWHKQB7EgHiS6O =p3Vy -----END PGP SIGNATURE----- --nextPart2202079.OJXgP7iXHX--