gdb/

	* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9f6b0628c251fa94bd698d077771933cdc0811ff..55303f9792d1e1ffe5185f98e3c8c92a9a9a3353 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+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.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index b24f71c21a50b1a90b5f5ca919b17f5d32be5322..e38c54aad774b9d8bfe4f26042fc95032561de8e 100644 (file)
--- 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 6595d5bdcc0ab3baabe21f4ac1c50db0965e8d23..2a808034027e7dbfdfb4bd1343c0f89a2067871d 100644 (file)
--- 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 4b4e74cc66c2ca85e3249a263a3eaad4a64e078d..068a72a6a087f40c14e30902895d5d334b12c713 100644 (file)
--- 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 b21adc74e1f9e86c679f33bead5440c97256c9f4..c7e3a277583edb0579a5a9cba452ec8e090f6658 100644 (file)
--- 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 8e1965266a5346e05a1c448955a6ef5ebc38668d..5a3fae388eee7a6b3c6308f7c99c1a56364e12d5 100644 (file)
--- 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;