From e31806255fe0cf49a1eeb14a51788473eaaa6310 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Mon, 4 Aug 2014 11:37:44 +0100 Subject: [PATCH 1/1] Move cleanups.[ch] to common This commit moves cleanups.[ch] into gdb/common/. The only change to the content of the files is that cleanups.c's include list was altered to match its new location. gdb/ChangeLog: * cleanups.h: Moved to... * common/cleanups.h: New file. * cleanups.c: Moved to... * common/cleanups.c: New file. Include common-defs.h and cleanups.h. Do not include defs.h. * Makefile.in (SFILES): Replace cleanups.c with common/cleanups.c. (HFILES_NO_SRCDIR): Replace cleanups.h with common/cleanups.h. (cleanups.o): New rule. gdb/gdbserver/ChangeLog: * Makefile.in (SFILES): Add common/cleanups.c. (OBS): cleanups.o. (cleanups.o): New rule. --- gdb/ChangeLog | 11 +++++++++++ gdb/Makefile.in | 10 +++++++--- gdb/{ => common}/cleanups.c | 3 ++- gdb/{ => common}/cleanups.h | 0 gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/Makefile.in | 7 +++++-- 6 files changed, 31 insertions(+), 6 deletions(-) rename gdb/{ => common}/cleanups.c (99%) rename gdb/{ => common}/cleanups.h (100%) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ce6d87e0a..6bacb45102 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2014-08-29 Gary Benson + + * cleanups.h: Moved to... + * common/cleanups.h: New file. + * cleanups.c: Moved to... + * common/cleanups.c: New file. Include common-defs.h and + cleanups.h. Do not include defs.h. + * Makefile.in (SFILES): Replace cleanups.c with common/cleanups.c. + (HFILES_NO_SRCDIR): Replace cleanups.h with common/cleanups.h. + (cleanups.o): New rule. + 2014-08-29 Gary Benson * common/errors.h (internal_warning): New declaration. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index f2516270d3..8479324f57 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -794,7 +794,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \ breakpoint.c break-catch-sig.c break-catch-throw.c \ build-id.c buildsym.c \ c-exp.y c-lang.c c-typeprint.c c-valprint.c c-varobj.c \ - charset.c cleanups.c cli-out.c coffread.c coff-pe-read.c \ + charset.c common/cleanups.c cli-out.c coffread.c coff-pe-read.c \ complaints.c completer.c continuations.c corefile.c corelow.c \ cp-abi.c cp-support.c cp-namespace.c cp-valprint.c \ d-exp.y d-lang.c d-support.c d-valprint.c \ @@ -885,7 +885,7 @@ objfiles.h common/vec.h disasm.h mips-tdep.h ser-base.h \ gdb_curses.h bfd-target.h memattr.h inferior.h ax.h dummy-frame.h \ inflow.h fbsd-nat.h ia64-libunwind-tdep.h completer.h inf-ttrace.h \ solib-target.h gdb_vfork.h alpha-tdep.h dwarf2expr.h \ -m2-lang.h stack.h charset.h cleanups.h addrmap.h command.h solist.h source.h \ +m2-lang.h stack.h charset.h addrmap.h command.h solist.h source.h \ target.h target-dcache.h prologue-value.h cp-abi.h tui/tui-hooks.h tui/tui.h \ tui/tui-file.h tui/tui-command.h tui/tui-disasm.h tui/tui-wingeneral.h \ tui/tui-windata.h tui/tui-data.h tui/tui-win.h tui/tui-stack.h \ @@ -937,7 +937,7 @@ ctf.h nat/i386-cpuid.h nat/i386-gcc-cpuid.h target/resume.h \ target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h \ common/print-utils.h common/rsp-low.h nat/i386-dregs.h x86-linux-nat.h \ i386-linux-nat.h common/common-defs.h common/errors.h common/common-types.h \ -common/common-debug.h +common/common-debug.h common/cleanups.h # Header files that already have srcdir in them, or which are in objdir. @@ -2162,6 +2162,10 @@ common-debug.o: ${srcdir}/common/common-debug.c $(COMPILE) $(srcdir)/common/common-debug.c $(POSTCOMPILE) +cleanups.o: ${srcdir}/common/cleanups.c + $(COMPILE) $(srcdir)/common/cleanups.c + $(POSTCOMPILE) + # # gdb/target/ dependencies # diff --git a/gdb/cleanups.c b/gdb/common/cleanups.c similarity index 99% rename from gdb/cleanups.c rename to gdb/common/cleanups.c index ddf8e5bc1f..49b643b1fd 100644 --- a/gdb/cleanups.c +++ b/gdb/common/cleanups.c @@ -17,7 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "defs.h" +#include "common-defs.h" +#include "cleanups.h" /* The cleanup list records things that have to be undone if an error happens (descriptors to be closed, memory to be freed, etc.) diff --git a/gdb/cleanups.h b/gdb/common/cleanups.h similarity index 100% rename from gdb/cleanups.h rename to gdb/common/cleanups.h diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 56ef86cba6..76afb0d5bc 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2014-08-29 Gary Benson + + * Makefile.in (SFILES): Add common/cleanups.c. + (OBS): cleanups.o. + (cleanups.o): New rule. + 2014-08-29 Gary Benson * utils.c (internal_vwarning): New function. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 18486c6267..f130082693 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -170,7 +170,7 @@ SFILES= $(srcdir)/gdbreplay.c $(srcdir)/inferiors.c $(srcdir)/dll.c \ $(srcdir)/common/filestuff.c $(srcdir)/target/waitstatus.c \ $(srcdir)/nat/mips-linux-watch.c $(srcdir)/common/print-utils.c \ $(srcdir)/common/rsp-low.c $(srcdir)/common/errors.c \ - $(srcdir)/common/common-debug.c + $(srcdir)/common/common-debug.c $(srcdir)/common/cleanups.c DEPFILES = @GDBSERVER_DEPFILES@ @@ -183,7 +183,7 @@ OBS = agent.o ax.o inferiors.o regcache.o remote-utils.o server.o signals.o \ target.o waitstatus.o utils.o debug.o version.o vec.o gdb_vecs.o \ mem-break.o hostio.o event-loop.o tracepoint.o xml-utils.o \ common-utils.o ptid.o buffer.o format.o filestuff.o dll.o notif.o \ - tdesc.o print-utils.o rsp-low.o errors.o common-debug.o \ + tdesc.o print-utils.o rsp-low.o errors.o common-debug.o cleanups.o \ $(XML_BUILTIN) $(DEPFILES) $(LIBOBJS) GDBREPLAY_OBS = gdbreplay.o version.o GDBSERVER_LIBS = @GDBSERVER_LIBS@ @@ -544,6 +544,9 @@ errors.o: ../common/errors.c common-debug.o: ../common/common-debug.c $(COMPILE) $< $(POSTCOMPILE) +cleanups.o: ../common/cleanups.c + $(COMPILE) $< + $(POSTCOMPILE) waitstatus.o: ../target/waitstatus.c $(COMPILE) $< $(POSTCOMPILE) -- 2.34.1