From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 109138 invoked by alias); 24 Dec 2018 21:09:35 -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 109075 invoked by uid 89); 24 Dec 2018 21:09:35 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=2137, MIPS, expo X-HELO: gateway30.websitewelcome.com Received: from gateway30.websitewelcome.com (HELO gateway30.websitewelcome.com) (192.185.150.24) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 24 Dec 2018 21:09:31 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway30.websitewelcome.com (Postfix) with ESMTP id 7F7E72A052 for ; Mon, 24 Dec 2018 15:09:30 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id bXTeg9VdY2qH7bXTegrL7F; Mon, 24 Dec 2018 15:09:30 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=aFjUQ+1zvZ4rf6dOyZonhIwELXWmO5xSwzXrwotdLTc=; b=vS7usXRydL6COA9Yf7vApS0e2E GRPWW7PVwSi/zk3ImfBFc8/S6aosAraSSynIsJPYXLru1DBQtsYW7EYx4b4yZChjUYpcqUm4hGyEy GCxFwsQ5wHCJVbMe2oJ8Tk723; Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:38044 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gbXTe-002qYm-9v; Mon, 24 Dec 2018 15:09:30 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 3/3] Build gdb "nat" files in subdirectory Date: Mon, 24 Dec 2018 21:09:00 -0000 Message-Id: <20181224210927.16741-4-tom@tromey.com> In-Reply-To: <20181224210927.16741-1-tom@tromey.com> References: <20181224210927.16741-1-tom@tromey.com> X-SW-Source: 2018-12/txt/msg00310.txt.bz2 This moves the various "nat" object files into the nat/ subdirectory. This allows for the removal of a pattern rule from the gdb Makefile, which is a small cleanup. I made the configure.nat change in a (semi-) automated way, hopefully meaning that it is more likely to be correct than had I done it by hand. Eventually I would like for the various configure scripts to only mention source files, and let the Makefile compute the object file names. gdb/ChangeLog 2018-12-24 Tom Tromey * configure.nat (NATDEPFILES): Use nat/ prefix. * Makefile.in (CONFIG_SRC_SUBDIR): Add nat. (%.o: ${srcdir}/nat/%.c): Remove rule. (INIT_FILES): Do not filter out NATDEPFILES. --- gdb/ChangeLog | 7 +++++ gdb/Makefile.in | 9 ++---- gdb/configure.nat | 73 ++++++++++++++++++++++++++--------------------- 3 files changed, 50 insertions(+), 39 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index e4d4a3449d..3111411e9d 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -525,7 +525,8 @@ CONFIG_INSTALL = @CONFIG_INSTALL@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ -CONFIG_SRC_SUBDIR = arch cli mi common compile tui unittests guile python target +CONFIG_SRC_SUBDIR = arch cli mi common compile tui unittests guile python \ + target nat CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # -I. for config files. @@ -1636,10 +1637,6 @@ python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS) $(COMPILE) $(all_gdbtk_cflags) $< $(POSTCOMPILE) -%.o: ${srcdir}/nat/%.c - $(COMPILE) $< - $(POSTCOMPILE) - installcheck: # The check target can not use subdir_do, because subdir_do does not @@ -1838,7 +1835,7 @@ test-cp-name-parser$(EXEEXT): test-cp-name-parser.o $(LIBIBERTY) INIT_FILES = \ $(patsubst %.o,%.c, \ $(patsubst %-exp.o,%-exp.y, \ - $(filter-out $(NATDEPFILES) init.o version.o %_S.o %_U.o,\ + $(filter-out init.o version.o %_S.o %_U.o,\ $(COMMON_OBS)))) init.c: stamp-init; @true diff --git a/gdb/configure.nat b/gdb/configure.nat index 200b716924..a38a3380d8 100644 --- a/gdb/configure.nat +++ b/gdb/configure.nat @@ -54,40 +54,41 @@ case ${gdb_host} in *linux*) NAT_FILE='config/nm-linux.h' - NATDEPFILES='inf-ptrace.o fork-child.o fork-inferior.o proc-service.o \ - linux-thread-db.o linux-nat.o linux-osdata.o linux-fork.o \ - linux-procfs.o linux-ptrace.o linux-waitpid.o \ - linux-personality.o linux-namespaces.o' + NATDEPFILES='inf-ptrace.o fork-child.o nat/fork-inferior.o \ + proc-service.o \ + linux-thread-db.o linux-nat.o nat/linux-osdata.o linux-fork.o \ + nat/linux-procfs.o nat/linux-ptrace.o nat/linux-waitpid.o \ + nat/linux-personality.o nat/linux-namespaces.o' NAT_CDEPS='$(srcdir)/proc-service.list' LOADLIBES='-ldl $(RDYNAMIC)' ;; fbsd*) - NATDEPFILES='fork-child.o fork-inferior.o inf-ptrace.o fbsd-nat.o' + NATDEPFILES='fork-child.o nat/fork-inferior.o inf-ptrace.o fbsd-nat.o' HAVE_NATIVE_GCORE_HOST=1 LOADLIBES='-lkvm' ;; nbsd*) - NATDEPFILES='fork-child.o fork-inferior.o inf-ptrace.o' + NATDEPFILES='fork-child.o nat/fork-inferior.o inf-ptrace.o' HAVE_NATIVE_GCORE_HOST=1 ;; obsd*) - NATDEPFILES='fork-child.o fork-inferior.o inf-ptrace.o' + NATDEPFILES='fork-child.o nat/fork-inferior.o inf-ptrace.o' ;; cygwin*) - NATDEPFILES='x86-nat.o x86-dregs.o windows-nat.o' + NATDEPFILES='x86-nat.o nat/x86-dregs.o windows-nat.o' ;; mingw*) - NATDEPFILES='x86-nat.o x86-dregs.o windows-nat.o' + NATDEPFILES='x86-nat.o nat/x86-dregs.o windows-nat.o' ;; aix) - NATDEPFILES='fork-inferior.o fork-child.o inf-ptrace.o' + NATDEPFILES='nat/fork-inferior.o fork-child.o inf-ptrace.o' ;; darwin) - NATDEPFILES='fork-child.o fork-inferior.o darwin-nat.o \ + NATDEPFILES='fork-child.o nat/fork-inferior.o darwin-nat.o \ darwin-nat-info.o' ;; sol2) - NATDEPFILES='fork-child.o fork-inferior.o \ + NATDEPFILES='fork-child.o nat/fork-inferior.o \ procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o \ sol-thread.o' HAVE_NATIVE_GCORE_HOST=1 @@ -145,7 +146,7 @@ case ${gdb_host} in i386) # Host: IA86 running Darwin NATDEPFILES="${NATDEPFILES} i386-darwin-nat.o x86-nat.o \ - x86-dregs.o amd64-nat.o" + nat/x86-dregs.o amd64-nat.o" ;; esac ;; @@ -163,7 +164,7 @@ case ${gdb_host} in ;; i386) # Host: FreeBSD/i386 - NATDEPFILES="${NATDEPFILES} x86-nat.o x86-dregs.o \ + NATDEPFILES="${NATDEPFILES} x86-nat.o nat/x86-dregs.o \ x86-bsd-nat.o i386-bsd-nat.o i386-fbsd-nat.o bsd-kvm.o" NAT_FILE='nm-fbsd.h' ;; @@ -193,7 +194,8 @@ case ${gdb_host} in i386) # Host: FreeBSD/amd64 NATDEPFILES="${NATDEPFILES} amd64-nat.o amd64-bsd-nat.o \ - amd64-fbsd-nat.o bsd-kvm.o x86-nat.o x86-dregs.o x86-bsd-nat.o" + amd64-fbsd-nat.o bsd-kvm.o x86-nat.o nat/x86-dregs.o \ + x86-bsd-nat.o" ;; esac ;; @@ -203,7 +205,7 @@ case ${gdb_host} in # Host: Intel x86 running DJGPP # We include several header files from config/djgpp MH_CFLAGS='-I$(srcdir)/config/djgpp' - NATDEPFILES='go32-nat.o x86-nat.o x86-dregs.o' + NATDEPFILES='go32-nat.o x86-nat.o nat/x86-dregs.o' XM_CLIBS='-ldbg' ;; esac @@ -213,7 +215,7 @@ case ${gdb_host} in i386) # Host: Intel 386 running the GNU Hurd NATDEPFILES='i386-gnu-nat.o gnu-nat.o \ - x86-nat.o x86-dregs.o fork-child.o \ + x86-nat.o nat/x86-dregs.o fork-child.o \ notify_S.o process_reply_S.o msg_reply_S.o \ msg_U.o exc_request_U.o exc_request_S.o' HAVE_NATIVE_GCORE_HOST=1 @@ -232,8 +234,9 @@ case ${gdb_host} in aarch64) # Host: AArch64 based machine running GNU/Linux NATDEPFILES="${NATDEPFILES} aarch64-linux-nat.o \ - aarch32-linux-nat.o aarch64-linux-hw-point.o aarch64-linux.o \ - aarch64-sve-linux-ptrace.o" + aarch32-linux-nat.o nat/aarch64-linux-hw-point.o \ + nat/aarch64-linux.o \ + nat/aarch64-sve-nat/linux-ptrace.o" ;; arm) # Host: ARM based machine running GNU/Linux @@ -242,9 +245,9 @@ case ${gdb_host} in ;; i386) # Host: Intel 386 running GNU/Linux. - NATDEPFILES="${NATDEPFILES} x86-nat.o x86-dregs.o \ - i386-linux-nat.o x86-linux-nat.o linux-btrace.o \ - x86-linux.o x86-linux-dregs.o" + NATDEPFILES="${NATDEPFILES} x86-nat.o nat/x86-dregs.o \ + i386-linux-nat.o x86-linux-nat.o nat/linux-btrace.o \ + nat/x86-linux.o nat/x86-linux-dregs.o" ;; ia64) # Host: Intel IA-64 running GNU/Linux @@ -261,7 +264,7 @@ case ${gdb_host} in mips) # Host: Linux/MIPS NATDEPFILES="${NATDEPFILES} linux-nat-trad.o \ - mips-linux-nat.o mips-linux-watch.o" + mips-linux-nat.o nat/mips-linux-watch.o" ;; pa) # Host: Hewlett-Packard PA-RISC machine, running Linux @@ -269,7 +272,7 @@ case ${gdb_host} in ;; powerpc) # Host: PowerPC, running Linux - NATDEPFILES="${NATDEPFILES} ppc-linux-nat.o ppc-linux.o" + NATDEPFILES="${NATDEPFILES} ppc-linux-nat.o nat/ppc-linux.o" ;; riscv*) # Host: RISC-V, running Linux @@ -298,9 +301,11 @@ case ${gdb_host} in case ${gdb_host_cpu} in i386) # Host: GNU/Linux x86-64 - NATDEPFILES="${NATDEPFILES} x86-nat.o x86-dregs.o \ - amd64-nat.o amd64-linux-nat.o x86-linux-nat.o linux-btrace.o \ - x86-linux.o x86-linux-dregs.o amd64-linux-siginfo.o" + NATDEPFILES="${NATDEPFILES} x86-nat.o nat/x86-dregs.o \ + amd64-nat.o amd64-linux-nat.o x86-linux-nat.o \ + nat/linux-btrace.o \ + nat/x86-linux.o nat/x86-linux-dregs.o \ + nat/amd64-linux-siginfo.o" ;; sparc) # Host: GNU/Linux UltraSPARC @@ -355,7 +360,7 @@ case ${gdb_host} in i386) # Host: NetBSD/amd64 NATDEPFILES="${NATDEPFILES} nbsd-nat.o amd64-nat.o x86-nat.o \ - x86-dregs.o x86-bsd-nat.o amd64-bsd-nat.o amd64-nbsd-nat.o" + nat/x86-dregs.o x86-bsd-nat.o amd64-bsd-nat.o amd64-nbsd-nat.o" ;; sparc) # Host: NetBSD/sparc64 @@ -374,7 +379,8 @@ case ${gdb_host} in ;; i386) # Host: NetBSD/i386 ELF - NATDEPFILES="${NATDEPFILES} nbsd-nat.o x86-nat.o x86-dregs.o \ + NATDEPFILES="${NATDEPFILES} nbsd-nat.o x86-nat.o \ + nat/x86-dregs.o \ x86-bsd-nat.o i386-bsd-nat.o i386-nbsd-nat.o bsd-kvm.o" LOADLIBES='-lkvm' ;; @@ -460,7 +466,7 @@ case ${gdb_host} in powerpc) # Host: PowerPC64, running Linux XM_CLIBS= - NATDEPFILES="${NATDEPFILES} ppc-linux-nat.o ppc-linux.o" + NATDEPFILES="${NATDEPFILES} ppc-linux-nat.o nat/ppc-linux.o" ;; esac ;; @@ -488,9 +494,10 @@ case ${gdb_host} in NAT_CDEPS= LOADLIBES= NATDEPFILES='spu-linux-nat.o \ - inf-ptrace.o fork-child.o fork-inferior.o \ - linux-procfs.o linux-ptrace.o linux-waitpid.o \ - linux-personality.o linux-namespaces.o' + inf-ptrace.o fork-child.o nat/fork-inferior.o \ + nat/linux-procfs.o nat/linux-ptrace.o \ + nat/linux-waitpid.o \ + nat/linux-personality.o nat/linux-namespaces.o' ;; esac ;; -- 2.17.2