Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/gdb-apple/files: gdb-apple-1518-darwin8.patch gdb-apple-1518-darwin8-9.patch
Date: Tue, 12 Jul 2011 05:49:54
Message-Id: 20110712054945.3E61C20051@flycatcher.gentoo.org
1 grobian 11/07/12 05:49:45
2
3 Modified: gdb-apple-1518-darwin8.patch
4 gdb-apple-1518-darwin8-9.patch
5 Log:
6 Move forgotten hunks from Darwin 8 patch to Darwin 8+9 patch, bug #373533
7
8 (Portage version: 2.2.01.18890-prefix/cvs/Darwin powerpc)
9
10 Revision Changes Path
11 1.3 sys-devel/gdb-apple/files/gdb-apple-1518-darwin8.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-darwin8.patch?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-darwin8.patch?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-darwin8.patch?r1=1.2&r2=1.3
16
17 Index: gdb-apple-1518-darwin8.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-darwin8.patch,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- gdb-apple-1518-darwin8.patch 11 Jul 2011 12:08:37 -0000 1.2
24 +++ gdb-apple-1518-darwin8.patch 12 Jul 2011 05:49:45 -0000 1.3
25 @@ -18,22 +18,6 @@
26
27 #include "macosx-nat-dyld.h"
28 #include "macosx-nat-inferior.h"
29 -@@ -2692,6 +2692,7 @@
30 - if (tp->private == NULL || tp->private->app_thread_port == 0)
31 - return NULL;
32 -
33 -+#ifdef THREAD_IDENTIFIER_INFO_COUNT
34 - thread_identifier_info_data_t tident;
35 - unsigned int info_count;
36 - kern_return_t kret;
37 -@@ -2719,6 +2720,7 @@
38 - }
39 - }
40 - }
41 -+#endif
42 - return buf;
43 - }
44 -
45 --- src/gdb/macosx/macosx-nat-info.c
46 +++ src/gdb/macosx/macosx-nat-info.c
47 @@ -45,6 +45,22 @@
48 @@ -72,38 +56,6 @@
49
50 #include "macosx-nat-inferior.h"
51 #include "macosx-nat-inferior-util.h"
52 -@@ -809,6 +809,7 @@
53 - print_stack_frame (get_selected_frame (NULL), 0, LOCATION);
54 - switch_to_thread (current_ptid);
55 -
56 -+#ifdef THREAD_IDENTIFIER_INFO_COUNT
57 - thread_identifier_info_data_t tident;
58 - info_count = THREAD_IDENTIFIER_INFO_COUNT;
59 - kret = thread_info (tid, THREAD_IDENTIFIER_INFO, (thread_info_t) &tident,
60 -@@ -878,6 +879,7 @@
61 - printf_filtered ("\tcurrent priority: %d\n", pth.pth_priority);
62 - printf_filtered ("\tmax priority: %d\n", pth.pth_maxpriority);
63 - }
64 -+#endif
65 -
66 - printf_filtered ("\tsuspend count: %d", info.suspend_count);
67 -
68 -@@ -1175,6 +1177,7 @@
69 - ui_out_field_fmt (uiout, "mach-port-number", "0x%s",
70 - paddr_nz (app_thread_name));
71 -
72 -+#ifdef THREAD_IDENTIFIER_INFO_COUNT
73 - thread_identifier_info_data_t tident;
74 - info_count = THREAD_IDENTIFIER_INFO_COUNT;
75 - kret = thread_info (tid, THREAD_IDENTIFIER_INFO, (thread_info_t) &tident,
76 -@@ -1207,6 +1210,7 @@
77 - paddr_nz (struct_addr));
78 - }
79 - }
80 -+#endif
81 - }
82 -
83 -
84 --- src/gdb/macosx/macosx-tdep.c
85 +++ src/gdb/macosx/macosx-tdep.c
86 @@ -64,7 +64,6 @@
87
88
89
90 1.2 sys-devel/gdb-apple/files/gdb-apple-1518-darwin8-9.patch
91
92 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-darwin8-9.patch?rev=1.2&view=markup
93 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-darwin8-9.patch?rev=1.2&content-type=text/plain
94 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-darwin8-9.patch?r1=1.1&r2=1.2
95
96 Index: gdb-apple-1518-darwin8-9.patch
97 ===================================================================
98 RCS file: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/files/gdb-apple-1518-darwin8-9.patch,v
99 retrieving revision 1.1
100 retrieving revision 1.2
101 diff -u -r1.1 -r1.2
102 --- gdb-apple-1518-darwin8-9.patch 11 Jul 2011 12:08:37 -0000 1.1
103 +++ gdb-apple-1518-darwin8-9.patch 12 Jul 2011 05:49:45 -0000 1.2
104 @@ -33,3 +33,55 @@
105 default:
106 return;
107 return;
108 +--- src/gdb/macosx/macosx-nat-inferior.c
109 ++++ src/gdb/macosx/macosx-nat-inferior.c
110 +@@ -2692,6 +2692,7 @@
111 + if (tp->private == NULL || tp->private->app_thread_port == 0)
112 + return NULL;
113 +
114 ++#ifdef THREAD_IDENTIFIER_INFO_COUNT
115 + thread_identifier_info_data_t tident;
116 + unsigned int info_count;
117 + kern_return_t kret;
118 +@@ -2719,6 +2720,7 @@
119 + }
120 + }
121 + }
122 ++#endif
123 + return buf;
124 + }
125 +
126 +--- src/gdb/macosx/macosx-nat-infthread.c
127 ++++ src/gdb/macosx/macosx-nat-infthread.c
128 +@@ -809,6 +809,7 @@
129 + print_stack_frame (get_selected_frame (NULL), 0, LOCATION);
130 + switch_to_thread (current_ptid);
131 +
132 ++#ifdef THREAD_IDENTIFIER_INFO_COUNT
133 + thread_identifier_info_data_t tident;
134 + info_count = THREAD_IDENTIFIER_INFO_COUNT;
135 + kret = thread_info (tid, THREAD_IDENTIFIER_INFO, (thread_info_t) &tident,
136 +@@ -878,6 +879,7 @@
137 + printf_filtered ("\tcurrent priority: %d\n", pth.pth_priority);
138 + printf_filtered ("\tmax priority: %d\n", pth.pth_maxpriority);
139 + }
140 ++#endif
141 +
142 + printf_filtered ("\tsuspend count: %d", info.suspend_count);
143 +
144 +@@ -1175,6 +1177,7 @@
145 + ui_out_field_fmt (uiout, "mach-port-number", "0x%s",
146 + paddr_nz (app_thread_name));
147 +
148 ++#ifdef THREAD_IDENTIFIER_INFO_COUNT
149 + thread_identifier_info_data_t tident;
150 + info_count = THREAD_IDENTIFIER_INFO_COUNT;
151 + kret = thread_info (tid, THREAD_IDENTIFIER_INFO, (thread_info_t) &tident,
152 +@@ -1207,6 +1210,7 @@
153 + paddr_nz (struct_addr));
154 + }
155 + }
156 ++#endif
157 + }
158 +
159 +