From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7704 invoked by alias); 24 Dec 2012 03:57:41 -0000 Received: (qmail 7695 invoked by uid 22791); 24 Dec 2012 03:57:40 -0000 X-SWARE-Spam-Status: No, hits=-8.8 required=5.0 tests=AWL,BAYES_00,KHOP_PGP_SIGNED,KHOP_RCVD_UNTRUST,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; Mon, 24 Dec 2012 03:57:35 +0000 Received: from vapier.localnet (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 2058D33DA01; Mon, 24 Dec 2012 03:57:35 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: Re: [Patch Darwin] head build fixes for i686-darwin9/x86_64-darwin10. Date: Mon, 24 Dec 2012 03:57:00 -0000 User-Agent: KMail/1.13.7 (Linux/3.7.1; KDE/4.6.5; x86_64; ; ) Cc: Tristan Gingold , Iain Sandoe References: <59ABFF71-CA26-452C-B9B2-9B0FC6AAE2BD@sandoe-acoustics.co.uk> <03DE2A59-DA13-4F7C-B757-533D4AF5F1DD@adacore.com> In-Reply-To: <03DE2A59-DA13-4F7C-B757-533D4AF5F1DD@adacore.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2958098.4FOyCA3HU2"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <201212232258.05972.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: 2012-12/txt/msg00799.txt.bz2 --nextPart2958098.4FOyCA3HU2 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-length: 2480 On Monday 02 January 2012 09:38:57 Tristan Gingold wrote: > On Dec 29, 2011, at 9:30 PM, Iain Sandoe wrote: > > =3D=3D=3D=3D=3D > >=20 > > 3/ (Darwin 9 only) > > TASK_DYLD_INFO_COUNT etc. are not defined. > >=20 > > Fixed thus: > > diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c > > index 94f49d6..efc59e7 100644 > > --- a/gdb/darwin-nat.c > > +++ b/gdb/darwin-nat.c > > @@ -1823,6 +1823,7 @@ out: > > return length; > > } > >=20 > > +#ifdef TASK_DYLD_INFO_COUNT > > /* Read LENGTH bytes at offset ADDR of task_dyld_info for TASK, and copy > > them > > to RDADDR. > > Return 0 on failure; number of bytes read / writen otherwise. */ > > @@ -1848,7 +1849,7 @@ darwin_read_dyld_info (task_t task, CORE_ADDR add= r, > > char *rdaddr, int length) > > memcpy (rdaddr, (char *)&task_dyld_info + addr, length); > > return length; > > } > > - > > +#endif > >=20 > > /* Return 0 on failure, number of bytes handled otherwise. TARGET > > is ignored. */ > > @@ -1890,6 +1891,7 @@ darwin_xfer_partial (struct target_ops *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) > > { > > @@ -1897,6 +1899,7 @@ darwin_xfer_partial (struct target_ops *ops, > > return -1; > > } > > return darwin_read_dyld_info (inf->private->task, offset, readbuf, > > len); > > +#endif > > default: > > return -1; > > } >=20 > Ok (but a comment would be very welcome). how about this instead. it localizes the #ifdef and has a comment. diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index 252fe3e..ac0aaac 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -1821,6 +1821,10 @@ out: static int darwin_read_dyld_info (task_t task, CORE_ADDR addr, char *rdaddr, int leng= th) { +#ifndef TASK_DYLD_INFO_COUNT + /* This is not available in Darwin 9. */ + return -1; +#else struct task_dyld_info task_dyld_info; mach_msg_type_number_t count =3D TASK_DYLD_INFO_COUNT; int sz =3D TASK_DYLD_INFO_COUNT * sizeof (natural_t); @@ -1838,6 +1842,7 @@ darwin_read_dyld_info (task_t task, CORE_ADDR addr, c= har=20 *rdaddr, int length) length =3D sz - addr; memcpy (rdaddr, (char *)&task_dyld_info + addr, length); return length; +#endif } =20 =0C -mike --nextPart2958098.4FOyCA3HU2 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) iQIcBAABAgAGBQJQ19LNAAoJEEFjO5/oN/WBmTgP/3TTr2SzGfNnpGEhGMLdm0tI eVfynpmaLa0lRhKGVG6ntqyX1nF8CStRxV821Zy9N/zuKVFxV2zO08/h91GLmty7 90O361YAxCNtw0KFxjguXkG+RlAv1NCg9brOKlDlD5Hf6M1eA3dKG9Ky9FlcioD4 NINAdWzhkDudZQH/qpfqBi1lyB77eFYFw72dPAYKQL7zSEQtBkAdVrYCh4WTyDSA d730WeIuQEI79BLXi1eVoz+bpCXGoTpYJvV+zAF+ta1SQTKFPSrxCxSssJ7Yts4d RH179ZyzNp3Iz84kkfe1zebp3YO+reQGzLpkjRQrxqVW1zlaSEuFy4Q9/Afbpek8 wkU41F5LpU/RYvyIjwZQ8UcZv+IZZqyDv/z43I4vpxav2blf+vbhfXISV7Iu5bSN yr3qpqzjErry3u7D7K2nhO8fYWdzfkUY/voPSEAMwKrVeARSuJi0nzS/yUatn4Py ln1Bd2cZkTTrW11qepWG/np88tL0PMyRNhy+xJZhQqrR+FMlboccu12kUUgNNvjL zBT+HmE0H7yqzNoxQKcLSEi/L37tLBFGmFLq+A3ErWrKkm/2DBMr/Bt9diQdUaKZ UPQe8MHm7Eh/fGSI6CGS1CiCwQkL7AxhTYhm1vwTVIsPUQp5o7AEmOxigw7pjq1U XHCkh72qsrAGavd4Gw1d =ushE -----END PGP SIGNATURE----- --nextPart2958098.4FOyCA3HU2--