From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18888 invoked by alias); 20 Aug 2014 19:05:06 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 18874 invoked by uid 89); 20 Aug 2014 19:05:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 20 Aug 2014 19:05:02 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7KJ51Fr031225 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 20 Aug 2014 15:05:01 -0400 Received: from blade.nx (ovpn-116-90.ams2.redhat.com [10.36.116.90]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7KJ50cp003268; Wed, 20 Aug 2014 15:05:00 -0400 Received: by blade.nx (Postfix, from userid 1000) id CC3512640D2; Wed, 20 Aug 2014 20:04:59 +0100 (BST) Date: Wed, 20 Aug 2014 19:05:00 -0000 From: Gary Benson To: Pedro Alves Cc: gdb-patches@sourceware.org Subject: Re: [PATCH 2/5] Move cleanups.[ch] to common Message-ID: <20140820190459.GA23764@blade.nx> References: <1408351618-21013-1-git-send-email-gbenson@redhat.com> <1408351618-21013-3-git-send-email-gbenson@redhat.com> <53F4D124.1000408@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <53F4D124.1000408@redhat.com> X-IsSubscribed: yes X-SW-Source: 2014-08/txt/msg00425.txt.bz2 Pedro Alves wrote: > On 08/18/2014 09:46 AM, Gary Benson wrote: > > 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. > > Please send a 'git diff -M' version. Sure: -- diff --git a/gdb/Makefile.in b/gdb/Makefile.in index e68798d..1840ce7 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 \ @@ -938,6 +938,8 @@ 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 target/target.h target/symbol.h common/common-regcache.h +common/common-debug.h target/target.h target/symbol.h common/common-regcache.h \ +common/cleanups.h # Header files that already have srcdir in them, or which are in objdir. @@ -2154,6 +2156,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 ddf8e5b..49b643b 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/Makefile.in b/gdb/gdbserver/Makefile.in index 18486c6..f130082 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)