aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/remote.c14
2 files changed, 11 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2ca2493..8d72d38 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-12 Tom Tromey <tromey@adacore.com>
+
+ * remote.c (magic_null_ptid, not_sent_ptid, any_thread_ptid): Now
+ const. Add initializers.
+ (_initialize_remote): Don't initialize ptid globals.
+
2019-03-12 Pedro Alves <palves@redhat.com>
* yy-remap.h [TEST_CPNAMES] (YYFPRINTF): Don't define.
diff --git a/gdb/remote.c b/gdb/remote.c
index ef12fe9..d113f99 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -2297,9 +2297,11 @@ remote_target::remove_exec_catchpoint (int pid)
-static ptid_t magic_null_ptid;
-static ptid_t not_sent_ptid;
-static ptid_t any_thread_ptid;
+/* Take advantage of the fact that the TID field is not used, to tag
+ special ptids with it set to != 0. */
+static const ptid_t magic_null_ptid (42000, -1, 1);
+static const ptid_t not_sent_ptid (42000, -2, 1);
+static const ptid_t any_thread_ptid (42000, 0, 1);
/* Find out if the stub attached to PID (and hence GDB should offer to
detach instead of killing it when bailing out). */
@@ -14754,10 +14756,4 @@ stepping is supported by the target. The default is on."),
/* Eventually initialize fileio. See fileio.c */
initialize_remote_fileio (remote_set_cmdlist, remote_show_cmdlist);
-
- /* Take advantage of the fact that the TID field is not used, to tag
- special ptids with it set to != 0. */
- magic_null_ptid = ptid_t (42000, -1, 1);
- not_sent_ptid = ptid_t (42000, -2, 1);
- any_thread_ptid = ptid_t (42000, 0, 1);
}