From patchwork Tue Feb 13 11:39:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 25923 Received: (qmail 15396 invoked by alias); 13 Feb 2018 11:39:49 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 15386 invoked by uid 89); 13 Feb 2018 11:39:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LOTSOFHASH, MIME_BASE64_BLANKS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=clash X-HELO: EUR01-HE1-obe.outbound.protection.outlook.com Received: from mail-he1eur01on0071.outbound.protection.outlook.com (HELO EUR01-HE1-obe.outbound.protection.outlook.com) (104.47.0.71) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 13 Feb 2018 11:39:41 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com (10.160.211.19) by AM3PR08MB0070.eurprd08.prod.outlook.com (10.160.211.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Tue, 13 Feb 2018 11:39:37 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::c95:81b8:c681:ae2]) by AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::c95:81b8:c681:ae2%17]) with mapi id 15.20.0464.021; Tue, 13 Feb 2018 11:39:36 +0000 From: Alan Hayward To: Yao Qi CC: "gdb-patches@sourceware.org" , nd Subject: Re: [PATCH] Add common/ dir in build directories Date: Tue, 13 Feb 2018 11:39:36 +0000 Message-ID: References: <59F17949-2E3B-445F-9599-2412B7F4AF72@arm.com> <863726ju49.fsf@gmail.com> In-Reply-To: <863726ju49.fsf@gmail.com> authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM3PR08MB0070; 7:Oauwhq1/9XloEQnCmn7m/GNPgGE8gdq8IHVR4uOc27ft3fubKiye8K7N8/sqT7H8Nqf+EULYTKj2OGPasK4eX7h6spFVyBJ4bw0NE5p686YZsMYz1ftVUVDJDgjx1UJZi8pFTSNtQ7ha1Ph/RwOq0Dk2p3fDeXNJqOMr9Y6xz/H2ZSbJgxWDKz8eNEAQdUMzCe0G7NaxGK++umG8bevH3jYzH2qYBzYfEbENTDu757dIpkncH6NydJcNTVi5oDpd x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 4d02952a-ce19-4321-4e72-08d572d675ed x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:AM3PR08MB0070; x-ms-traffictypediagnostic: AM3PR08MB0070: nodisclaimer: True x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(180628864354917)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231101)(2400082)(944501161)(3002001)(10201501046)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:AM3PR08MB0070; BCL:0; PCL:0; RULEID:; SRVR:AM3PR08MB0070; x-forefront-prvs: 0582641F53 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(366004)(396003)(346002)(376002)(54534003)(377424004)(189003)(199004)(1411001)(2900100001)(8676002)(81166006)(6486002)(99286004)(14454004)(54906003)(81156014)(478600001)(8936002)(33656002)(105586002)(106356001)(316002)(76176011)(3660700001)(72206003)(102836004)(26005)(186003)(59450400001)(6506007)(53546011)(66066001)(36756003)(305945005)(5660300001)(2950100002)(6916009)(82746002)(7736002)(68736007)(229853002)(575784001)(86362001)(25786009)(3280700002)(53936002)(3846002)(6512007)(5250100002)(97736004)(83716003)(2906002)(6116002)(4326008)(39060400002)(6246003)(6436002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR08MB0070; H:AM3PR08MB0101.eurprd08.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: PMi92XOEYVNNenpH0F2v307VaoPZSFhDcekVZYcKmEby7yf5or9FYBatBuc5BYNCYN2LRwdPYNmkVkYMxmlcuQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d02952a-ce19-4321-4e72-08d572d675ed X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Feb 2018 11:39:36.8753 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR08MB0070 X-IsSubscribed: yes > On 12 Feb 2018, at 12:00, Yao Qi wrote: > > Alan Hayward writes: > > Hi Alan, > Thanks for doing this... > This change is about config/makefile, so we need to run configure/make > on various platforms, they are helpful to expose some issues, if any, > > x86_64-linux native and cross, > aarch64-linux native and cross, > native i686-w64-mingw32 and x86_64-w64-mingw32 on linux, > cross with enable all targets, Tested the new patch with the above combinations. Using x86_64-w64-mingw32-gcc (GCC) 4.8.2 on ubuntu 14.04, I have a build failure against HEAD for mingw32: unittests/scoped_fd-selftests.c fails because it cannot find mkstemp(). Not sure if this is a bug, or error in my setup. Commenting out mkstemp code fixes my builds. > >> @@ -1531,35 +1531,35 @@ TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \ >> TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR) >> >> COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ >> - btrace-common.o \ >> - buffer.o \ >> - cleanups.o \ >> - common-agent.o \ >> - common-debug.o \ >> - common-exceptions.o \ >> - job-control.o \ >> - common-regcache.o \ >> - common-utils.o \ >> - environ.o \ >> - errors.o \ >> + common/btrace-common.o \ >> + common/buffer.o \ >> + common/cleanups.o \ >> + common/agent.o \ >> + common/common-debug.o \ >> + common/common-exceptions.o \ >> + common/job-control.o \ >> + common/common-regcache.o \ >> + common/common-utils.o \ >> + common/environ.o \ >> + common/errors.o \ >> + common/fileio.o \ >> + common/filestuff.o \ >> + common/format.o \ >> + common/gdb_tilde_expand.o \ >> + common/gdb_vecs.o \ >> + common/new-op.o \ >> + common/print-utils.o \ >> + common/ptid.o \ >> + common/rsp-low.o \ >> + common/run-time-clock.o \ >> + common/signals.o \ >> + common/signals-state-save-restore.o \ >> + common/vec.o \ >> + common/xml-utils.o \ >> exec.o \ >> - fileio.o \ >> - filestuff.o \ >> - format.o \ >> - gdb_tilde_expand.o \ >> - gdb_vecs.o \ >> mi/mi-common.o \ >> - new-op.o \ >> - print-utils.o \ >> - ptid.o \ >> - rsp-low.o \ >> - run-time-clock.o \ >> - signals.o \ >> - signals-state-save-restore.o \ >> - vec.o \ >> version.o \ >> xml-builtin.o \ >> - xml-utils.o \ >> $(patsubst %.c,%.o,$(COMMON_SFILES)) \ > > *.c files in COMMON_SFILES is replaced to *.o files here, so IMO, the > better way is to move common/*.c files in SFILES to COMMON_SFILES. Done! > >> @@ -1627,7 +1627,7 @@ $(CONFIG_DEP_SUBDIR): >> python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS) >> >> # Rules for compiling .c files in the various source subdirectories. >> -%.o: ${srcdir}/common/%.c >> +common/%.o: ${srcdir}/common/%.c >> $(COMPILE) $< >> $(POSTCOMPILE) >> > > Do we still need this rule? We already had a generic one, > > %.o: %.c | $(CONFIG_DEP_SUBDIR) > $(COMPILE) $< > $(POSTCOMPILE) > We don’t. Good spot. Removed. >> diff --git a/gdb/common/common.host b/gdb/common/common.host >> index b7051d6eb7ab77dff989866a936a78b200e62d49..826088635937603c98f179184d4b97b41ccd760c 100644 >> --- a/gdb/common/common.host >> +++ b/gdb/common/common.host >> @@ -30,7 +30,7 @@ case "${host}" in >> *-mingw*) common_host_obs=mingw-strerror.o > > This should be updated too. > Done. Not sure why I missed that. I do remember seeing it. >> ;; >> *) >> - common_host_obs=posix-strerror.o >> + common_host_obs=common/posix-strerror.o >> ;; >> > >> @@ -537,10 +537,29 @@ ax.o: ax.c >> $(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $< >> $(POSTCOMPILE) >> >> +# Note: Between two matching pattern rules, GNU Make 3.81 chooses the first one. >> +# Therefore, these need to be before "%.o: %.c" for it to be considered for >> +# files such as linux-amd64-ipa.o generated from linux-amd64-ipa.c. >> +# >> +# Later versions of GNU Make choose the rule with the shortest stem, so it would >> +# work in any order. >> + >> +arch/%-ipa.o: ../arch/%.c >> + $(IPAGENT_COMPILE) $< >> + $(POSTCOMPILE) >> + >> +common/%-ipa.o: ../common/%.c >> + $(IPAGENT_COMPILE) $< >> + $(POSTCOMPILE) >> + >> arch/%.o: ../arch/%.c >> $(COMPILE) $< >> $(POSTCOMPILE) > >> I had to move around the rules in the gdbserver makefile, otherwise the build >> gets confused. > > I don't understand why do you move them? You mentioned this move in the > commit log, but I can't see the reason we must do the move. Can you > elaborate? > I had problems with compiling common/tdesc-ipa.c. ...But that file does not exist yet. Instead, I've simplified the change and now only add the common dir. New version below. Thanks for reviewing! Alan. gdb/ChangeLog: 2018-02-13 Alan Hayward * Makefile.in: Add common directory in build. * common/common.host: Add common reference. * configure: Likewise. * configure.ac: Likewise. gdb/gdbserver/ChangeLog: 2018-02-13 Alan Hayward * Makefile.in: Add common directory in build. * configure: Add common reference. * configure.ac: Likewise. --- gdb/Makefile.in | 87 ++++++++++++++-------------------------------- gdb/common/common.host | 4 +-- gdb/configure | 2 +- gdb/configure.ac | 2 +- gdb/gdbserver/Makefile.in | 64 +++++++++++++++++----------------- gdb/gdbserver/configure | 4 +-- gdb/gdbserver/configure.ac | 4 +-- 7 files changed, 66 insertions(+), 101 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 957654c9bd09b5aa7cbe65f163bf4341a292340b..d91d8e01c32a8487010d7d58dca2a8c28a588da4 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -524,7 +524,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ -CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests guile python target +CONFIG_SRC_SUBDIR = arch cli mi common compile tui unittests guile python target CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # -I. for config files. @@ -937,6 +937,31 @@ COMMON_SFILES = \ cli-out.c \ coff-pe-read.c \ coffread.c \ + common/agent.c \ + common/btrace-common.c \ + common/buffer.c \ + common/cleanups.c \ + common/common-debug.c \ + common/common-exceptions.c \ + common/common-regcache.c \ + common/common-utils.c \ + common/errors.c \ + common/environ.c \ + common/fileio.c \ + common/filestuff.c \ + common/format.c \ + common/job-control.c \ + common/gdb_tilde_expand.c \ + common/gdb_vecs.c \ + common/new-op.c \ + common/print-utils.c \ + common/ptid.c \ + common/rsp-low.c \ + common/run-time-clock.c \ + common/signals.c \ + common/signals-state-save-restore.c \ + common/vec.c \ + common/xml-utils.c \ complaints.c \ completer.c \ continuations.c \ @@ -1119,31 +1144,6 @@ SFILES = \ stub-termcap.c \ symfile-mem.c \ ui-file.h \ - common/agent.c \ - common/btrace-common.c \ - common/buffer.c \ - common/cleanups.c \ - common/common-debug.c \ - common/common-exceptions.c \ - common/common-regcache.c \ - common/common-utils.c \ - common/errors.c \ - common/environ.c \ - common/fileio.c \ - common/filestuff.c \ - common/format.c \ - common/job-control.c \ - common/gdb_tilde_expand.c \ - common/gdb_vecs.c \ - common/new-op.c \ - common/print-utils.c \ - common/ptid.c \ - common/rsp-low.c \ - common/run-time-clock.c \ - common/signals.c \ - common/signals-state-save-restore.c \ - common/vec.c \ - common/xml-utils.c \ mi/mi-common.c \ $(SUBDIR_TARGET_SRCS) \ $(COMMON_SFILES) \ @@ -1533,35 +1533,10 @@ TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \ TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR) COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ - btrace-common.o \ - buffer.o \ - cleanups.o \ - common-agent.o \ - common-debug.o \ - common-exceptions.o \ - job-control.o \ - common-regcache.o \ - common-utils.o \ - environ.o \ - errors.o \ exec.o \ - fileio.o \ - filestuff.o \ - format.o \ - gdb_tilde_expand.o \ - gdb_vecs.o \ mi/mi-common.o \ - new-op.o \ - print-utils.o \ - ptid.o \ - rsp-low.o \ - run-time-clock.o \ - signals.o \ - signals-state-save-restore.o \ - vec.o \ version.o \ xml-builtin.o \ - xml-utils.o \ $(patsubst %.c,%.o,$(COMMON_SFILES)) \ $(SUBDIR_TARGET_OBS) \ $(SUBDIR_GCC_COMPILE_OBS) @@ -1629,10 +1604,6 @@ $(CONFIG_DEP_SUBDIR): python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS) # Rules for compiling .c files in the various source subdirectories. -%.o: ${srcdir}/common/%.c - $(COMPILE) $< - $(POSTCOMPILE) - %.o: $(srcdir)/gdbtk/generic/%.c $(COMPILE) $(all_gdbtk_cflags) $< $(POSTCOMPILE) @@ -1641,12 +1612,6 @@ python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS) $(COMPILE) $< $(POSTCOMPILE) -# Specify an explicit rule for gdb/common/agent.c, to avoid a clash with the -# object file generate by gdb/agent.c. -common-agent.o: $(srcdir)/common/agent.c - $(COMPILE) $(srcdir)/common/agent.c - $(POSTCOMPILE) - installcheck: # The check target can not use subdir_do, because subdir_do does not diff --git a/gdb/common/common.host b/gdb/common/common.host index b7051d6eb7ab77dff989866a936a78b200e62d49..87f144c261ab3aaa78c0837af6ad745d08bfa110 100644 --- a/gdb/common/common.host +++ b/gdb/common/common.host @@ -27,10 +27,10 @@ case "${host}" in -*-mingw*) common_host_obs=mingw-strerror.o +*-mingw*) common_host_obs=common/mingw-strerror.o ;; *) - common_host_obs=posix-strerror.o + common_host_obs=common/posix-strerror.o ;; esac diff --git a/gdb/configure b/gdb/configure index 81b35af521e2704e2aca14011362971a030c49fe..ab58187853337c632af046adb589f9c8a5b9e8a3 100755 --- a/gdb/configure +++ b/gdb/configure @@ -17661,7 +17661,7 @@ if $development; then $as_echo "#define GDB_SELF_TEST 1" >>confdefs.h - CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) selftest.o selftest-arch.o" + CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) common/selftest.o selftest-arch.o" CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_UNITTESTS_SRCS) common/selftest.c selftest-arch.c" fi diff --git a/gdb/configure.ac b/gdb/configure.ac index 125e5f30e65a7b046b5fab038bde3c5a2fe485c3..698fc7b83456f8c5a63ae0050dc8ec65069290f7 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -2299,7 +2299,7 @@ AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8", if $development; then AC_DEFINE(GDB_SELF_TEST, 1, [Define if self-testing features should be enabled]) - CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) selftest.o selftest-arch.o" + CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) common/selftest.o selftest-arch.o" CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_UNITTESTS_SRCS) common/selftest.c selftest-arch.c" fi diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 3ce086d70f23df445b174c49c489ec8415d7614a..fcb6e1e817f521385de3986861c430c31a1b7eec 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -231,48 +231,48 @@ SOURCES = $(SFILES) TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS} OBS = \ - agent.o \ ax.o \ - btrace-common.o \ - buffer.o \ - cleanups.o \ - common-debug.o \ - common-exceptions.o \ - job-control.o \ - common-regcache.o \ - common-utils.o \ + common/agent.o \ + common/btrace-common.o \ + common/buffer.o \ + common/cleanups.o \ + common/common-debug.o \ + common/common-exceptions.o \ + common/job-control.o \ + common/common-regcache.o \ + common/common-utils.o \ + common/errors.o \ + common/environ.o \ + common/fileio.o \ + common/filestuff.o \ + common/format.o \ + common/gdb_tilde_expand.o \ + common/gdb_vecs.o \ + common/new-op.o \ + common/print-utils.o \ + common/ptid.o \ + common/rsp-low.o \ + common/signals.o \ + common/signals-state-save-restore.o \ + common/vec.o \ + common/xml-utils.o \ debug.o \ dll.o \ - errors.o \ - environ.o \ event-loop.o \ - fileio.o \ - filestuff.o \ - format.o \ - gdb_tilde_expand.o \ - gdb_vecs.o \ hostio.o \ inferiors.o \ mem-break.o \ - new-op.o \ notif.o \ - print-utils.o \ - ptid.o \ regcache.o \ remote-utils.o \ - rsp-low.o \ server.o \ - signals.o \ - signals-state-save-restore.o \ symbol.o \ target.o \ tdesc.o \ tracepoint.o \ utils.o \ - vec.o \ version.o \ waitstatus.o \ - xml-utils.o \ $(DEPFILES) \ $(LIBOBJS) \ $(XML_BUILTIN) @@ -392,17 +392,17 @@ gdbreplay$(EXEEXT): $(GDBREPLAY_OBS) $(LIBGNU) $(LIBIBERTY) IPA_OBJS = \ ax-ipa.o \ - common-utils-ipa.o \ - errors-ipa.o \ - format-ipa.o \ - print-utils-ipa.o \ + common/common-utils-ipa.o \ + common/errors-ipa.o \ + common/format-ipa.o \ + common/print-utils-ipa.o \ + common/rsp-low-ipa.o \ + common/vec-ipa.o \ regcache-ipa.o \ remote-utils-ipa.o \ - rsp-low-ipa.o \ tdesc-ipa.o \ tracepoint-ipa.o \ utils-ipa.o \ - vec-ipa.o \ ${IPA_DEPFILES} IPA_LIB = libinproctrace.so @@ -562,7 +562,7 @@ arch/%.o: ../arch/%.c $(IPAGENT_COMPILE) $< $(POSTCOMPILE) -%-ipa.o: ../common/%.c +common/%-ipa.o: ../common/%.c $(IPAGENT_COMPILE) $< $(POSTCOMPILE) @@ -580,7 +580,7 @@ arch/%-ipa.o: ../arch/%.c $(COMPILE) $< $(POSTCOMPILE) -%.o: ../common/%.c +common/%.o: ../common/%.c $(COMPILE) $< $(POSTCOMPILE) diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 340ca7a19e5c0bc24ee2fc42226762185295d5ef..ab09261946442f77c85e7fd8d5ecc090527d1d4c 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -5815,7 +5815,7 @@ fi if $development; then - srv_selftest_objs="selftest.o" + srv_selftest_objs="common/selftest.o" $as_echo "#define GDB_SELF_TEST 1" >>confdefs.h @@ -5858,7 +5858,7 @@ ac_config_commands="$ac_config_commands depdir" # Create sub-directories for objects and dependencies. -CONFIG_SRC_SUBDIR="arch" +CONFIG_SRC_SUBDIR="arch common" ac_config_commands="$ac_config_commands gdbdepdir" diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index 6727959e61b656ddfc2101b830539fa18288ccb3..99801681ff47ee8dcd9ad2e5ae282dcd113c83e4 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -57,7 +57,7 @@ fi GDB_AC_LIBMCHECK(${libmcheck_default}) if $development; then - srv_selftest_objs="selftest.o" + srv_selftest_objs="common/selftest.o" AC_DEFINE(GDB_SELF_TEST, 1, [Define if self-testing features should be enabled]) fi @@ -69,7 +69,7 @@ ACX_NONCANONICAL_HOST ZW_CREATE_DEPDIR # Create sub-directories for objects and dependencies. -CONFIG_SRC_SUBDIR="arch" +CONFIG_SRC_SUBDIR="arch common" AC_SUBST(CONFIG_SRC_SUBDIR) AC_CONFIG_COMMANDS([gdbdepdir],[