[PATCH] TASK_DYLD_INFO_COUNT build fix for darwin9

[Fabian Groffen <grobian at gentoo dot org>]

This is a resent of patch 3/ from:
http://sourceware.org/ml/gdb-patches/2011-12/msg00890.html

Modified for 7.5.1 sources, as this is still a problem, see:
http://sourceware.org/bugzilla/show_bug.cgi?id=14405

From: Iain Sandoe <developer at sandoe-acoustics dot co dot uk>
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.

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.

====

TASK_DYLD_INFO_COUNT etc. are not defined.

Fixed thus:
--- gdb/darwin-nat.c
+++ gdb/darwin-nat.c
@@ -1814,6 +1814,7 @@
   return length;
 }
 
+#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.  */
@@ -1839,6 +1840,7 @@
   memcpy (rdaddr, (char *)&task_dyld_info + addr, length);
   return length;
 }
+#endif
 
 
 /* Return 0 on failure, number of bytes handled otherwise.  TARGET
@@ -1881,6 +1883,7 @@
     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 != NULL || readbuf == NULL)
         {
@@ -1888,6 +1891,7 @@
           return -1;
         }
       return darwin_read_dyld_info (inf->private->task, offset, readbuf, len);
+#endif
     default:
       return -1;
     }


-- 
Fabian Groffen
Gentoo on a different level

Attachment: signature.asc
Description: Digital signature