+2018-07-16 Tom Tromey <tom@tromey.com>
+
+ * buildsym.h (push_subfile, pop_subfile): Update declarations.
+ * buildsym.c (struct buildsym_compunit) <m_subfile_stack>: New
+ member.
+ (struct subfile_stack): Remove.
+ (subfile_stack): Remove.
+ (push_subfile, pop_subfile, buildsym_init): Update.
+
+2018-07-16 Tom Tromey <tom@tromey.com>
+
+ * buildsym.c (push_subfile): Use gdb_assert.
+ (pop_subfile): Use gdb_assert.
+
+2018-07-16 Tom Tromey <tom@tromey.com>
+
+ * buildsym.h (merge_symbol_lists): Remove.
+ * buildsym.c (merge_symbol_lists): Remove.
+
+2018-07-16 Tom Tromey <tom@tromey.com>
+
+ * stabsread.c (scan_file_globals): Update comment.
+ * stabsread.h (scan_file_globals): Move from buildsym.h.
+ * buildsym.h (scan_file_globals): Move to stabsread.h.
+
2018-07-16 Tom Tromey <tom@tromey.com>
* xcoffread.c (xcoff_new_init): Update.