[gentoo-commits] gentoo-x86 commit in sys-devel/gdb-apple/files: gdb-apple-1518-task_dyld_info.patch gdb-apple-1518-darwin8.patch

[Fabian Groffen (grobian)]

grobian     11/04/03 09:52:07

  Added:                gdb-apple-1518-task_dyld_info.patch
                        gdb-apple-1518-darwin8.patch
  Log:
  Version bump to version from Developer Tools 4.0
  
  (Portage version: 2.2.01.18213-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.1                  sys-devel/gdb-apple/files/gdb-apple-1518-task_dyld_info.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-task_dyld_info.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-task_dyld_info.patch?rev=1.1&content-type=text/plain

Index: gdb-apple-1518-task_dyld_info.patch
===================================================================
If dyld-info is not available, don't try to compile unreachable code
using it either.

--- gdb-1518/src/gdb/macosx/macosx-nat-dyld.c
+++ gdb-1518/src/gdb/macosx/macosx-nat-dyld.c
@@ -779,7 +779,7 @@
     {
 #if !defined (TASK_DYLD_INFO)
       return 0;
-#endif
+#else
       if (macosx_status->task == TASK_NULL)
         return 0;
 
@@ -799,6 +799,7 @@
           task_dyld_info.all_image_info_size == 0)
           return 0;
       s->dyld_image_infos = task_dyld_info.all_image_info_addr;
+#endif /* TASK_DYLD_INFO */
     }
 #endif /* NM_NEXTSTEP */
 



1.1                  sys-devel/gdb-apple/files/gdb-apple-1518-darwin8.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-darwin8.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-darwin8.patch?rev=1.1&content-type=text/plain

Index: gdb-apple-1518-darwin8.patch
===================================================================
--- src/gdb/macosx/macosx-nat-inferior.c
+++ src/gdb/macosx/macosx-nat-inferior.c
@@ -60,13 +60,17 @@
 #include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <mach/mach_error.h>
+#if defined(TARGET_ARM)
 #include <spawn.h>
+#endif
 
 #include <semaphore.h>
 
 #include <dlfcn.h>
+#if 0
 #include <libproc.h>
 #include <sys/proc_info.h>
+#endif
 
 #include "macosx-nat-dyld.h"
 #include "macosx-nat-inferior.h"
@@ -2692,6 +2692,7 @@
   if (tp->private == NULL || tp->private->app_thread_port == 0)
     return NULL;
 
+#ifdef THREAD_IDENTIFIER_INFO_COUNT
   thread_identifier_info_data_t tident;
   unsigned int info_count;
   kern_return_t kret;
@@ -2719,6 +2720,7 @@
             }
         }
     }
+#endif
   return buf;
 }
 
--- src/gdb/macosx/macosx-nat-info.c
+++ src/gdb/macosx/macosx-nat-info.c
@@ -45,6 +45,22 @@
 #include "macosx-nat-inferior.h"
 #include "macosx-nat-inferior-debug.h"
 
+#ifdef __ppc__
+#ifndef __darwin_ppc_thread_state
+#define __darwin_ppc_thread_state ppc_thread_state
+#define __r0       r0
+#define __srr0     srr0
+#define __srr1     srr1
+#define __cr       cr
+#define __xer      xer
+#define __lr       lr
+#define __ctr      ctr
+#endif
+#ifndef __darwin_ppc_exception_state
+#define __darwin_ppc_exception_state ppc_exception_state
+#endif
+#endif
+
 extern macosx_inferior_status *macosx_status;
 
 #define CHECK_ARGS(what, args) \
--- src/gdb/macosx/macosx-nat-infthread.c
+++ src/gdb/macosx/macosx-nat-infthread.c
@@ -36,8 +36,10 @@
 #include <sys/dir.h>
 #include <inttypes.h>
 
+#if 0
 #include <libproc.h>
 #include <sys/proc_info.h>
+#endif
 
 #include "macosx-nat-inferior.h"
 #include "macosx-nat-inferior-util.h"
@@ -809,6 +809,7 @@
     print_stack_frame (get_selected_frame (NULL), 0, LOCATION);
     switch_to_thread (current_ptid);
 
+#ifdef THREAD_IDENTIFIER_INFO_COUNT
   thread_identifier_info_data_t tident;
   info_count = THREAD_IDENTIFIER_INFO_COUNT;
   kret = thread_info (tid, THREAD_IDENTIFIER_INFO, (thread_info_t) &tident, 
@@ -878,6 +879,7 @@
       printf_filtered ("\tcurrent priority: %d\n", pth.pth_priority);
       printf_filtered ("\tmax priority: %d\n", pth.pth_maxpriority);
     }
+#endif
 
   printf_filtered ("\tsuspend count: %d", info.suspend_count);
 
@@ -1175,6 +1177,7 @@
   ui_out_field_fmt (uiout, "mach-port-number", "0x%s", 
                     paddr_nz (app_thread_name));
 
+#ifdef THREAD_IDENTIFIER_INFO_COUNT
   thread_identifier_info_data_t tident;
   info_count = THREAD_IDENTIFIER_INFO_COUNT;
   kret = thread_info (tid, THREAD_IDENTIFIER_INFO, (thread_info_t) &tident, 
@@ -1207,6 +1210,7 @@
                               paddr_nz (struct_addr));
         }
     }
+#endif
 }
 
 
--- src/gdb/macosx/macosx-tdep.c
+++ src/gdb/macosx/macosx-tdep.c
@@ -64,7 +64,6 @@
 #include "gdbcore.h"
 
 #include <dirent.h>
-#include <libgen.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
--- src/gdb/remote.c
+++ src/gdb/remote.c
@@ -63,7 +63,6 @@
 #include "macosx-nat-dyld.h"
 #include "macosx-nat-dyld-process.h"
 #endif
-#include <execinfo.h>
 
 /* Prototypes for local functions.  */
 static void cleanup_sigint_signal_handler (void *dummy);
@@ -475,11 +474,13 @@
 static void
 remote_backtrace_self (const char *message)
 {
+#if 0
   void *bt_buffer[100];
   int count = backtrace (bt_buffer, 100);
   if (message && message[0])
     fprintf_filtered (gdb_stderr, "%s", message);
   backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
+#endif
 }
 
 static void
--- src/gdb/symfile.c
+++ src/gdb/symfile.c
@@ -67,7 +67,6 @@
 #include <ctype.h>
 #include <time.h>
 #include <sys/time.h>
-#include <libgen.h>
 
 #include <sys/mman.h>
 
--- src/gdb/utils.c
+++ src/gdb/utils.c
@@ -28,7 +28,6 @@
 #include "event-top.h"
 #include "exceptions.h"
 #include "bfd.h"
-#include <execinfo.h>
 #include <sys/resource.h>
 #include <uuid/uuid.h>
 
@@ -879,6 +878,7 @@
   target_terminal_ours ();
   begin_line ();
 
+#if 0
   /* APPLE LOCAL: Do a stack crawl of how we got here so we're more likely
      to get useful bug reports.  */
   {
@@ -887,6 +887,7 @@
     fprintf (stderr, "gdb stack crawl at point of internal error:\n");
     backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
   }
+#endif
 
   /* Create a string containing the full error/warning message.  Need
      to call query with this full string, as otherwize the reason
--- src/gdb/macosx/macosx-nat-dyld.c
+++ src/gdb/macosx/macosx-nat-dyld.c
@@ -2083,7 +2083,9 @@
     case MH_DYLIB:
     case MH_DYLINKER:
     case MH_BUNDLE:
+#ifdef MH_KEXT_BUNDLE
     case MH_KEXT_BUNDLE:
+#endif
       break;
     case MH_FVMLIB:
     case MH_PRELOAD:
@@ -2412,7 +2414,9 @@
       break;
     case MH_DYLINKER:
     case MH_BUNDLE:
+#ifdef MH_KEXT_BUNDLE
     case MH_KEXT_BUNDLE:
+#endif
       entry->reason = dyld_reason_dyld;
       break;
     default:
--- src/gdb/macosx/macosx-nat-dyld-process.c
+++ src/gdb/macosx/macosx-nat-dyld-process.c
@@ -407,7 +407,9 @@
     case MH_DYLIB:
       break;
     case MH_BUNDLE:
+#ifdef MH_KEXT_BUNDLE
     case MH_KEXT_BUNDLE:
+#endif
       break;
     default:
       return;
       return;