aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog13
-rw-r--r--gdb/breakpoint.c4
-rw-r--r--gdb/cli/cli-cmds.c8
-rw-r--r--gdb/cli/cli-cmds.h6
-rw-r--r--gdb/gdbcmd.h6
-rw-r--r--gdb/skip.c1
6 files changed, 18 insertions, 20 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9f6b062..55303f9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,18 @@
2012-08-09 Yao Qi <yao@codesourcery.com>
+ * cli/cli-cmds.c (enablebreaklist): Move it to breakpoint.c.
+ (skiplist): Move it to skip.c.
+ (init_cmd_lists): Remove code setting enablebreaklist and
+ skiplist to NULL.
+ * breakpoint.c (enablebreaklist): Moved from cli/cli-cmds.c.
+ * cli/cli-cmds.h: Remove declaration of enablebreaklist and
+ skiplist.
+ * gdbcmd.h: Likewise.
+ * skip.c (_initialize_step_skip): Move 'skiplist' from
+ cli/cli-cmds.c.
+
+2012-08-09 Yao Qi <yao@codesourcery.com>
+
* cli/cli-dump.c: Add 'static' to some cmd_list_element variables.
* gnu-nat.c, symfile.c: Likewise.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index b24f71c..e38c54a 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -15859,6 +15859,10 @@ initialize_breakpoint_ops (void)
ops->print_recreate = bkpt_print_recreate;
}
+/* Chain containing all defined "enable breakpoint" subcommands. */
+
+static struct cmd_list_element *enablebreaklist = NULL;
+
void
_initialize_breakpoint (void)
{
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 6595d5b..2a80803 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -136,10 +136,6 @@ struct cmd_list_element *detachlist;
struct cmd_list_element *killlist;
-/* Chain containing all defined "enable breakpoint" subcommands. */
-
-struct cmd_list_element *enablebreaklist;
-
/* Chain containing all defined set subcommands */
struct cmd_list_element *setlist;
@@ -188,8 +184,6 @@ struct cmd_list_element *setchecklist;
struct cmd_list_element *showchecklist;
-struct cmd_list_element *skiplist;
-
/* Command tracing state. */
int source_verbose = 0;
@@ -1576,7 +1570,6 @@ init_cmd_lists (void)
stoplist = NULL;
deletelist = NULL;
detachlist = NULL;
- enablebreaklist = NULL;
setlist = NULL;
unsetlist = NULL;
showlist = NULL;
@@ -1590,7 +1583,6 @@ init_cmd_lists (void)
showprintlist = NULL;
setchecklist = NULL;
showchecklist = NULL;
- skiplist = NULL;
}
static void
diff --git a/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h
index 4b4e74c..068a72a 100644
--- a/gdb/cli/cli-cmds.h
+++ b/gdb/cli/cli-cmds.h
@@ -53,10 +53,6 @@ extern struct cmd_list_element *togglelist;
extern struct cmd_list_element *stoplist;
-/* Chain containing all defined "enable breakpoint" subcommands. */
-
-extern struct cmd_list_element *enablebreaklist;
-
/* Chain containing all defined set subcommands */
extern struct cmd_list_element *setlist;
@@ -105,8 +101,6 @@ extern struct cmd_list_element *setchecklist;
extern struct cmd_list_element *showchecklist;
-extern struct cmd_list_element *skiplist;
-
/* Exported to gdb/top.c */
void init_cmd_lists (void);
diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h
index b21adc7..c7e3a27 100644
--- a/gdb/gdbcmd.h
+++ b/gdb/gdbcmd.h
@@ -64,10 +64,6 @@ extern struct cmd_list_element *togglelist;
extern struct cmd_list_element *stoplist;
-/* Chain containing all defined "enable breakpoint" subcommands. */
-
-extern struct cmd_list_element *enablebreaklist;
-
/* Chain containing all defined set subcommands. */
extern struct cmd_list_element *setlist;
@@ -124,8 +120,6 @@ extern struct cmd_list_element *setchecklist;
extern struct cmd_list_element *showchecklist;
-extern struct cmd_list_element *skiplist;
-
/* Chain containing all defined "save" subcommands. */
extern struct cmd_list_element *save_cmdlist;
diff --git a/gdb/skip.c b/gdb/skip.c
index 8e19652..5a3fae3 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -545,6 +545,7 @@ extern initialize_file_ftype _initialize_step_skip;
void
_initialize_step_skip (void)
{
+ static struct cmd_list_element *skiplist = NULL;
struct cmd_list_element *c;
skiplist_entry_chain = 0;