Skip to content

Commit af02813

Browse files
committed
devkitARM: update gdb patch for macOS
1 parent 21d8bd0 commit af02813

1 file changed

Lines changed: 81 additions & 21 deletions

File tree

dkarm-eabi/patches/gdb-8.2.1.patch

Lines changed: 81 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -NBaur gdb-8.2/gdb/arm-3ds-tdep.c gdb-8.2-3ds/gdb/arm-3ds-tdep.c
2-
--- gdb-8.2/gdb/arm-3ds-tdep.c 1970-01-01 01:00:00.000000000 +0100
3-
+++ gdb-8.2-3ds/gdb/arm-3ds-tdep.c 2018-11-15 22:55:21.916968907 +0000
1+
diff -NBaur gdb-8.2.1/gdb/arm-3ds-tdep.c gdb-8.2.1-apple/gdb/arm-3ds-tdep.c
2+
--- gdb-8.2.1/gdb/arm-3ds-tdep.c 1970-01-01 01:00:00.000000000 +0100
3+
+++ gdb-8.2.1-apple/gdb/arm-3ds-tdep.c 2019-02-19 17:15:22.100604954 +0000
44
@@ -0,0 +1,157 @@
55
+/* Target-dependent code for 3DS. */
66
+
@@ -159,9 +159,9 @@ diff -NBaur gdb-8.2/gdb/arm-3ds-tdep.c gdb-8.2-3ds/gdb/arm-3ds-tdep.c
159159
+ gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_3DS,
160160
+ arm_3ds_init_abi);
161161
+}
162-
diff -NBaur gdb-8.2/gdb/configure.tgt gdb-8.2-3ds/gdb/configure.tgt
163-
--- gdb-8.2/gdb/configure.tgt 2018-09-05 08:44:28.000000000 +0100
164-
+++ gdb-8.2-3ds/gdb/configure.tgt 2018-11-15 22:47:17.337689978 +0000
162+
diff -NBaur gdb-8.2.1/gdb/configure.tgt gdb-8.2.1-apple/gdb/configure.tgt
163+
--- gdb-8.2.1/gdb/configure.tgt 2018-12-23 05:51:54.000000000 +0000
164+
+++ gdb-8.2.1-apple/gdb/configure.tgt 2019-02-19 17:15:22.104618045 +0000
165165
@@ -61,7 +61,7 @@
166166
;;
167167

@@ -171,9 +171,9 @@ diff -NBaur gdb-8.2/gdb/configure.tgt gdb-8.2-3ds/gdb/configure.tgt
171171

172172
hppa*-*-*)
173173
# Target: HP PA-RISC
174-
diff -NBaur gdb-8.2/gdb/data-directory/Makefile.in gdb-8.2-3ds/gdb/data-directory/Makefile.in
175-
--- gdb-8.2/gdb/data-directory/Makefile.in 2018-01-05 04:07:23.000000000 +0000
176-
+++ gdb-8.2-3ds/gdb/data-directory/Makefile.in 2018-11-15 22:42:36.840956065 +0000
174+
diff -NBaur gdb-8.2.1/gdb/data-directory/Makefile.in gdb-8.2.1-apple/gdb/data-directory/Makefile.in
175+
--- gdb-8.2.1/gdb/data-directory/Makefile.in 2018-01-05 04:07:23.000000000 +0000
176+
+++ gdb-8.2.1-apple/gdb/data-directory/Makefile.in 2019-02-19 17:15:22.104618045 +0000
177177
@@ -63,7 +63,7 @@
178178
sparc-linux.xml \
179179
sparc64-linux.xml
@@ -183,9 +183,9 @@ diff -NBaur gdb-8.2/gdb/data-directory/Makefile.in gdb-8.2-3ds/gdb/data-director
183183

184184
PYTHON_DIR = python
185185
PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
186-
diff -NBaur gdb-8.2/gdb/defs.h gdb-8.2-3ds/gdb/defs.h
187-
--- gdb-8.2/gdb/defs.h 2018-09-05 08:27:32.000000000 +0100
188-
+++ gdb-8.2-3ds/gdb/defs.h 2018-11-15 22:42:36.840956065 +0000
186+
diff -NBaur gdb-8.2.1/gdb/defs.h gdb-8.2.1-apple/gdb/defs.h
187+
--- gdb-8.2.1/gdb/defs.h 2018-12-23 05:51:54.000000000 +0000
188+
+++ gdb-8.2.1-apple/gdb/defs.h 2019-02-19 17:15:22.104618045 +0000
189189
@@ -495,6 +495,7 @@
190190
GDB_OSABI_LYNXOS178,
191191
GDB_OSABI_NEWLIB,
@@ -194,9 +194,21 @@ diff -NBaur gdb-8.2/gdb/defs.h gdb-8.2-3ds/gdb/defs.h
194194

195195
GDB_OSABI_INVALID /* keep this last */
196196
};
197-
diff -NBaur gdb-8.2/gdb/Makefile.in gdb-8.2-3ds/gdb/Makefile.in
198-
--- gdb-8.2/gdb/Makefile.in 2018-09-05 08:44:28.000000000 +0100
199-
+++ gdb-8.2-3ds/gdb/Makefile.in 2018-11-15 22:45:01.628931262 +0000
197+
diff -NBaur gdb-8.2.1/gdb/dtrace-probe.c gdb-8.2.1-apple/gdb/dtrace-probe.c
198+
--- gdb-8.2.1/gdb/dtrace-probe.c 2018-12-23 05:51:54.000000000 +0000
199+
+++ gdb-8.2.1-apple/gdb/dtrace-probe.c 2019-02-19 17:30:16.449175937 +0000
200+
@@ -100,7 +100,7 @@
201+
202+
/* DTrace static_probe_ops. */
203+
204+
-const dtrace_static_probe_ops dtrace_static_probe_ops;
205+
+const dtrace_static_probe_ops dtrace_static_probe_ops = {};
206+
207+
/* The following structure represents a dtrace probe. */
208+
209+
diff -NBaur gdb-8.2.1/gdb/Makefile.in gdb-8.2.1-apple/gdb/Makefile.in
210+
--- gdb-8.2.1/gdb/Makefile.in 2018-12-23 05:51:54.000000000 +0000
211+
+++ gdb-8.2.1-apple/gdb/Makefile.in 2019-02-19 17:15:22.104618045 +0000
200212
@@ -684,6 +684,7 @@
201213
arch/arm-linux.o \
202214
arch/i386.o \
@@ -213,9 +225,9 @@ diff -NBaur gdb-8.2/gdb/Makefile.in gdb-8.2-3ds/gdb/Makefile.in
213225
arm-bsd-tdep.c \
214226
arm-fbsd-nat.c \
215227
arm-fbsd-tdep.c \
216-
diff -NBaur gdb-8.2/gdb/osabi.c gdb-8.2-3ds/gdb/osabi.c
217-
--- gdb-8.2/gdb/osabi.c 2018-09-05 08:27:13.000000000 +0100
218-
+++ gdb-8.2-3ds/gdb/osabi.c 2018-11-15 22:42:36.840956065 +0000
228+
diff -NBaur gdb-8.2.1/gdb/osabi.c gdb-8.2.1-apple/gdb/osabi.c
229+
--- gdb-8.2.1/gdb/osabi.c 2018-12-23 05:51:54.000000000 +0000
230+
+++ gdb-8.2.1-apple/gdb/osabi.c 2019-02-19 17:15:22.104618045 +0000
219231
@@ -80,6 +80,7 @@
220232
{ "LynxOS178", NULL },
221233
{ "Newlib", NULL },
@@ -224,9 +236,45 @@ diff -NBaur gdb-8.2/gdb/osabi.c gdb-8.2-3ds/gdb/osabi.c
224236

225237
{ "<invalid>", NULL }
226238
};
227-
diff -NBaur gdb-8.2/gdb/syscalls/arm-3ds.xml gdb-8.2-3ds/gdb/syscalls/arm-3ds.xml
228-
--- gdb-8.2/gdb/syscalls/arm-3ds.xml 1970-01-01 01:00:00.000000000 +0100
229-
+++ gdb-8.2-3ds/gdb/syscalls/arm-3ds.xml 2018-11-15 22:42:36.840956065 +0000
239+
diff -NBaur gdb-8.2.1/gdb/probe.c gdb-8.2.1-apple/gdb/probe.c
240+
--- gdb-8.2.1/gdb/probe.c 2018-12-23 05:51:54.000000000 +0000
241+
+++ gdb-8.2.1-apple/gdb/probe.c 2019-02-19 17:31:05.266578008 +0000
242+
@@ -60,7 +60,7 @@
243+
244+
/* Static operations associated with a generic probe. */
245+
246+
-const any_static_probe_ops any_static_probe_ops;
247+
+const any_static_probe_ops any_static_probe_ops = {};
248+
249+
/* A helper for parse_probes that decodes a probe specification in
250+
SEARCH_PSPACE. It appends matching SALs to RESULT. */
251+
diff -NBaur gdb-8.2.1/gdb/record-btrace.c gdb-8.2.1-apple/gdb/record-btrace.c
252+
--- gdb-8.2.1/gdb/record-btrace.c 2018-12-23 05:51:54.000000000 +0000
253+
+++ gdb-8.2.1-apple/gdb/record-btrace.c 2019-02-19 17:31:33.301731324 +0000
254+
@@ -144,7 +144,7 @@
255+
256+
/* Token associated with a new-thread observer enabling branch tracing
257+
for the new thread. */
258+
-static const gdb::observers::token record_btrace_thread_observer_token;
259+
+static const gdb::observers::token record_btrace_thread_observer_token = {};
260+
261+
/* Memory access types used in set/show record btrace replay-memory-access. */
262+
static const char replay_memory_access_read_only[] = "read-only";
263+
diff -NBaur gdb-8.2.1/gdb/stap-probe.c gdb-8.2.1-apple/gdb/stap-probe.c
264+
--- gdb-8.2.1/gdb/stap-probe.c 2018-12-23 05:51:54.000000000 +0000
265+
+++ gdb-8.2.1-apple/gdb/stap-probe.c 2019-02-19 17:29:35.744567941 +0000
266+
@@ -119,7 +119,7 @@
267+
268+
/* SystemTap static_probe_ops. */
269+
270+
-const stap_static_probe_ops stap_static_probe_ops;
271+
+const stap_static_probe_ops stap_static_probe_ops = {};
272+
273+
class stap_probe : public probe
274+
{
275+
diff -NBaur gdb-8.2.1/gdb/syscalls/arm-3ds.xml gdb-8.2.1-apple/gdb/syscalls/arm-3ds.xml
276+
--- gdb-8.2.1/gdb/syscalls/arm-3ds.xml 1970-01-01 01:00:00.000000000 +0100
277+
+++ gdb-8.2.1-apple/gdb/syscalls/arm-3ds.xml 2019-02-19 17:15:22.104618045 +0000
230278
@@ -0,0 +1,159 @@
231279
+<?xml version="1.0"?>
232280
+<!DOCTYPE syscalls_info SYSTEM "gdb-syscalls.dtd">
@@ -387,3 +435,15 @@ diff -NBaur gdb-8.2/gdb/syscalls/arm-3ds.xml gdb-8.2-3ds/gdb/syscalls/arm-3ds.xm
387435
+ <syscall name="TranslateHandle" number="178" groups="custom,synchronization,ipc,thread,process,debug"/>
388436
+
389437
+</syscalls_info>
438+
diff -NBaur gdb-8.2.1/gdb/tui/tui-hooks.c gdb-8.2.1-apple/gdb/tui/tui-hooks.c
439+
--- gdb-8.2.1/gdb/tui/tui-hooks.c 2018-12-23 05:51:54.000000000 +0000
440+
+++ gdb-8.2.1-apple/gdb/tui/tui-hooks.c 2019-02-19 17:28:53.178460364 +0000
441+
@@ -205,7 +205,7 @@
442+
443+
/* Token associated with observers registered while TUI hooks are
444+
installed. */
445+
-static const gdb::observers::token tui_observers_token;
446+
+static const gdb::observers::token tui_observers_token = {};
447+
448+
/* Attach or detach a single observer, according to ATTACH. */
449+

0 commit comments

Comments
 (0)