From 7977dfb488bd1da7d86f27afbe2611f75c9c8018 Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Sun, 3 Dec 2017 09:49:28 +0100 Subject: sys-devel/gdb-apple: remove unused patches Signed-off-by: Fabian Groffen --- .../gdb-apple/files/gdb-apple-1344-darwin8.patch | 131 --------------------- .../files/gdb-apple-1518-task_dyld_info.patch | 22 ---- .../gdb-apple/files/gdb-apple-563-darwin7.patch | 110 ----------------- .../gdb-apple/files/gdb-apple-563-no-64bit.patch | 19 --- 4 files changed, 282 deletions(-) delete mode 100644 sys-devel/gdb-apple/files/gdb-apple-1344-darwin8.patch delete mode 100644 sys-devel/gdb-apple/files/gdb-apple-1518-task_dyld_info.patch delete mode 100644 sys-devel/gdb-apple/files/gdb-apple-563-darwin7.patch delete mode 100644 sys-devel/gdb-apple/files/gdb-apple-563-no-64bit.patch (limited to 'sys-devel/gdb-apple') diff --git a/sys-devel/gdb-apple/files/gdb-apple-1344-darwin8.patch b/sys-devel/gdb-apple/files/gdb-apple-1344-darwin8.patch deleted file mode 100644 index c95f02e0fe2e..000000000000 --- a/sys-devel/gdb-apple/files/gdb-apple-1344-darwin8.patch +++ /dev/null @@ -1,131 +0,0 @@ ---- src/gdb/symfile.c.orig 2009-09-25 09:00:15 +0200 -+++ src/gdb/symfile.c 2009-09-25 09:00:18 +0200 -@@ -67,7 +67,6 @@ - #include - #include - #include --#include - - #include - ---- src/gdb/utils.c.orig 2009-09-25 09:06:29 +0200 -+++ src/gdb/utils.c 2009-09-25 09:46:24 +0200 -@@ -27,7 +27,6 @@ - #include "gdb_string.h" - #include "event-top.h" - #include "exceptions.h" --#include - - #ifdef TUI - #include "tui/tui.h" /* For tui_get_command_dimension. */ -@@ -878,6 +877,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. */ - { -@@ -886,6 +886,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/remote.c.orig 2009-09-25 09:31:58 +0200 -+++ src/gdb/remote.c 2009-09-25 09:48:18 +0200 -@@ -61,7 +61,6 @@ - #ifdef MACOSX_DYLD - #include "macosx-nat-dyld.h" - #endif --#include - - /* Prototypes for local functions. */ - static void cleanup_sigint_signal_handler (void *dummy); -@@ -483,10 +482,12 @@ - static void - remote_backtrace_self () - { -+#if 0 - void *bt_buffer[10]; - int count = backtrace (bt_buffer, 10); - fprintf_filtered (gdb_stderr, "gdb stack crawl at point of invalid hex digit:\n"); - backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO); -+#endif - } - - static void ---- src/gdb/macosx/macosx-tdep.c.orig 2009-09-25 09:09:00 +0200 -+++ src/gdb/macosx/macosx-tdep.c 2009-09-25 09:09:12 +0200 -@@ -61,7 +61,6 @@ - #include "exceptions.h" - - #include --#include - #include - #include - #include ---- src/gdb/macosx/macosx-nat-inferior.c.orig 2009-09-25 09:12:44 +0200 -+++ src/gdb/macosx/macosx-nat-inferior.c 2009-09-25 09:13:24 +0200 -@@ -62,8 +62,10 @@ - #include - - #include -+#if 0 - #include - #include -+#endif - - #include "macosx-nat-dyld.h" - #include "macosx-nat-inferior.h" -@@ -3261,8 +3263,10 @@ - int_flags |= RTLD_NOLOAD; - if (strstr (flags, "RTLD_NODELETE") != NULL) - int_flags |= RTLD_NODELETE; -+#ifdef RTLD_FIRST - if (strstr (flags, "RTLD_FIRST") != NULL) - int_flags |= RTLD_FIRST; -+#endif - } - - /* If the user didn't pass in anything, set some sensible defaults. */ ---- src/gdb/macosx/macosx-nat-infthread.c.orig 2009-09-25 09:14:01 +0200 -+++ src/gdb/macosx/macosx-nat-infthread.c 2009-09-25 09:14:19 +0200 -@@ -36,8 +36,10 @@ - #include - #include - -+#if 0 - #include - #include -+#endif - - #include "macosx-nat-inferior.h" - #include "macosx-nat-inferior-util.h" ---- src/gdb/macosx/macosx-nat-info.c.orig 2009-09-25 09:16:50 +0200 -+++ src/gdb/macosx/macosx-nat-info.c 2009-09-25 09:31:12 +0200 -@@ -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) \ diff --git a/sys-devel/gdb-apple/files/gdb-apple-1518-task_dyld_info.patch b/sys-devel/gdb-apple/files/gdb-apple-1518-task_dyld_info.patch deleted file mode 100644 index 633a36a7a048..000000000000 --- a/sys-devel/gdb-apple/files/gdb-apple-1518-task_dyld_info.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 */ - diff --git a/sys-devel/gdb-apple/files/gdb-apple-563-darwin7.patch b/sys-devel/gdb-apple/files/gdb-apple-563-darwin7.patch deleted file mode 100644 index bd5061d41fc0..000000000000 --- a/sys-devel/gdb-apple/files/gdb-apple-563-darwin7.patch +++ /dev/null @@ -1,110 +0,0 @@ -* Fabian Groffen - Mac OS X Panther (10.3) doesn't have mach_vm_size_t yet, and - apparently this was forseen in macosx-nat-inferior-debug.c. However, - macosx-nat-inferior-debug.h also uses the provided types, hence we - move the backwards-compatibility logic to the .h file. - -* Fabian Groffen - On Mac OS X Panther (10.3) an older version of the Launch Services is - available, which doesn't cover the requirements made by Xcode here. - Because it's for Xcode only, and we don't use it on Gentoo, we just - enable the functionality that doesn't compile on 10.3. - ---- gdb/macosx/macosx-nat-inferior-debug.c -+++ gdb/macosx/macosx-nat-inferior-debug.c -@@ -53,24 +53,6 @@ - - #include - --#define MACH64 (MAC_OS_X_VERSION_MAX_ALLOWED >= 1040) -- --#if MACH64 -- --#include -- --#else /* ! MACH64 */ -- --#define mach_vm_size_t vm_size_t --#define mach_vm_address_t vm_address_t --#define mach_vm_read vm_read --#define mach_vm_write vm_write --#define mach_vm_region vm_region --#define VM_REGION_BASIC_INFO_COUNT_64 VM_REGION_BASIC_INFO_COUNT --#define VM_REGION_BASIC_INFO_64 VM_REGION_BASIC_INFO -- --#endif /* MACH64 */ -- - FILE *inferior_stderr = NULL; - int inferior_debug_flag = 0; - int timestamps_debug_flag = 0; ---- gdb/macosx/macosx-nat-inferior-debug.h -+++ gdb/macosx/macosx-nat-inferior-debug.h -@@ -6,6 +6,24 @@ - - #include "defs.h" - -+#define MACH64 (MAC_OS_X_VERSION_MAX_ALLOWED >= 1040) -+ -+#if MACH64 -+ -+#include -+ -+#else /* ! MACH64 */ -+ -+#define mach_vm_size_t vm_size_t -+#define mach_vm_address_t vm_address_t -+#define mach_vm_read vm_read -+#define mach_vm_write vm_write -+#define mach_vm_region vm_region -+#define VM_REGION_BASIC_INFO_COUNT_64 VM_REGION_BASIC_INFO_COUNT -+#define VM_REGION_BASIC_INFO_64 VM_REGION_BASIC_INFO -+ -+#endif /* MACH64 */ -+ - extern FILE *inferior_stderr; - extern int inferior_debug_flag; - ---- gdb/macosx/macosx-tdep.c -+++ gdb/macosx/macosx-tdep.c -@@ -413,6 +413,7 @@ - } BabelAESelInfo; - #pragma options align=reset - -+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1040) - static int - open_file_with_LS (const char *file_path, int lineno) - { -@@ -538,7 +539,9 @@ - - return 1; - } -+#endif - -+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1040) - /* Opens the file pointed to in ARGS with the default editor - given by LaunchServices. If ARGS is NULL, opens the current - source file & line. You can also supply file:line and it will -@@ -609,6 +612,7 @@ - - open_file_with_LS (filename, line_no); - } -+#endif - - void - _initialize_macosx_tdep () -@@ -618,13 +622,15 @@ - - add_info ("trampoline", info_trampoline_command, - "Resolve function for DYLD trampoline stub and/or Objective-C call"); -+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1040) - c = add_com ("open", class_support, open_command, _("\ - Open the named source file in an application determined by LaunchServices.\n\ - With no arguments, open the currently selected source file.\n\ - Also takes file:line to hilight the file at the given line.")); - set_cmd_completer (c, filename_completer); - add_com_alias ("op", "open", class_support, 1); - add_com_alias ("ope", "open", class_support, 1); -+#endif - - add_com ("flushstack", class_maintenance, stack_flush_command, - "Force gdb to flush its stack-frame cache (maintainer command)"); diff --git a/sys-devel/gdb-apple/files/gdb-apple-563-no-64bit.patch b/sys-devel/gdb-apple/files/gdb-apple-563-no-64bit.patch deleted file mode 100644 index 952f5b337871..000000000000 --- a/sys-devel/gdb-apple/files/gdb-apple-563-no-64bit.patch +++ /dev/null @@ -1,19 +0,0 @@ -* Fabian Groffen - On Gentoo, when the user doesn't have a 64-bits capable CPU, we - compile GCC without multi-lib support. Hence, 64-bits defines are not - available so we better not use them if we don't have __ppc64__ - defined. - ---- gdb/macosx/macosx-nat-dyld.c -+++ gdb/macosx/macosx-nat-dyld.c -@@ -619,8 +619,10 @@ - structures. */ - if (header.cputype == CPU_TYPE_POWERPC || header.cputype == CPU_TYPE_I386) - osabi_seen_in_attached_dyld = GDB_OSABI_DARWIN; -+#if defined(__ppc64__) - if (header.cputype == CPU_TYPE_POWERPC64 || header.cputype == GDB_CPU_TYPE_X86_64) - osabi_seen_in_attached_dyld = GDB_OSABI_DARWIN64; -+#endif - } - - /* Once we know the address at which dyld was loaded, we can try to -- cgit v1.2.3-65-gdbad