From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 102417 invoked by alias); 24 Feb 2020 14:16:37 -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 102271 invoked by uid 89); 24 Feb 2020 14:16:37 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.8 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 spammy=specially, OBS, sk:libiber X-HELO: EUR04-HE1-obe.outbound.protection.outlook.com Received: from mail-eopbgr70080.outbound.protection.outlook.com (HELO EUR04-HE1-obe.outbound.protection.outlook.com) (40.107.7.80) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 24 Feb 2020 14:16:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=smGgfcTnCBC3vAnrAiYN7RhqFrjd+u0/OhQjAyVshvY=; b=SQOW6/at2ufVOaE4o0lGHDX+UfT3B4PqC674iSmiUF0K0CtwrojFMgPOuGDO37mC4ddGpiJjqWm08rcVGktAWgPh1sbPys6J3pf3Z6yCN3D3gM9TViokQjDEPGDaUPcOiTbI0um6X7vi1o3647BcOINuX//fzzTbkKdDcjUR+K0= Received: from HE1PR08CA0055.eurprd08.prod.outlook.com (2603:10a6:7:2a::26) by AM0PR08MB4100.eurprd08.prod.outlook.com (2603:10a6:208:130::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2750.21; Mon, 24 Feb 2020 14:16:22 +0000 Received: from VE1EUR03FT051.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::206) by HE1PR08CA0055.outlook.office365.com (2603:10a6:7:2a::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2750.18 via Frontend Transport; Mon, 24 Feb 2020 14:16:22 +0000 Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; sourceware.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;sourceware.org; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT051.mail.protection.outlook.com (10.152.19.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2750.17 via Frontend Transport; Mon, 24 Feb 2020 14:16:21 +0000 Received: ("Tessian outbound d1ceabc7047e:v42"); Mon, 24 Feb 2020 14:16:21 +0000 X-CR-MTA-TID: 64aa7808 Received: from 11f3bdcd05d1.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 769EB815-FCD9-4792-B835-679B751BD098.1; Mon, 24 Feb 2020 14:16:16 +0000 Received: from FRA01-PR2-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 11f3bdcd05d1.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 24 Feb 2020 14:16:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bz7B95j1ziouP3RMPK/+3jCH6FZIRbfBG995VE6zXMwJQGmTLB9WWONxrE1+t7XuAy6cDbY55nPlT2Ed+YTeBC2cM5wHFFvwCJIN4TpEueTIeYn02ngR5/a0AHcPBug8B0dAtTJTfEs90aV2Dr0jE76m/JlpTm4U1wSYqxq583k0/dY2MwiVd1OEsI5dk3StaYsM8OgaXw/sxaOrjx9bYOXwOsbDp6g2qAW+5nXim3tHWKw3u0NBCY1ALMSSnc91FJWaZLwfWTPCU4jlUJYh1Biv0ruOKOVyoXLkU/zb3YaCVty2BTaV95X3pLHUjSegoFPV9p6Ow1Sc4cJwUxha0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=smGgfcTnCBC3vAnrAiYN7RhqFrjd+u0/OhQjAyVshvY=; b=louPJy1XMOj/Pz99r3gFCORxobusRt6gCHVJESop3ipYdjkPI6TZwWAesGZozZvVKzWSh+HisIy5Kw8f7WYfa2aTX3mlivYpb2h0sJHqQJ7P9aqzZ7EtKXsP9ap+9gsVXq5xxtRp/xNdkIHA9EfSMJWgpdcxvcZMUjffE6iZNhmZEkzCIbCCSzsdx8Gb6hPElCq4/Goh5StFYsAwStGwK5TUmeI8Q2bX1UY5kN93ALYMhP6GMYNwYf/VerEa3eAtMC+EZ7geCPXEGAjk1ENwHxqlwGLbJ2n3GDy/I650SRRwYdwXxwa3brfA2V6TlrsZMxL/Z0Bjh8UBYi4jnqd8jA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=smGgfcTnCBC3vAnrAiYN7RhqFrjd+u0/OhQjAyVshvY=; b=SQOW6/at2ufVOaE4o0lGHDX+UfT3B4PqC674iSmiUF0K0CtwrojFMgPOuGDO37mC4ddGpiJjqWm08rcVGktAWgPh1sbPys6J3pf3Z6yCN3D3gM9TViokQjDEPGDaUPcOiTbI0um6X7vi1o3647BcOINuX//fzzTbkKdDcjUR+K0= Received: from PR2PR08MB4747.eurprd08.prod.outlook.com (52.133.111.74) by PR2PR08MB4794.eurprd08.prod.outlook.com (52.133.110.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2750.21; Mon, 24 Feb 2020 14:16:15 +0000 Received: from PR2PR08MB4747.eurprd08.prod.outlook.com ([fe80::ecad:c4ac:c56b:25fb]) by PR2PR08MB4747.eurprd08.prod.outlook.com ([fe80::ecad:c4ac:c56b:25fb%4]) with mapi id 15.20.2750.021; Mon, 24 Feb 2020 14:16:15 +0000 From: Tamar Christina To: Tom Tromey , "gdb-patches@sourceware.org" CC: nd Subject: RE: [PATCH] Change gdbserver to use existing gnulib and libiberty Date: Mon, 24 Feb 2020 14:16:00 -0000 Message-ID: References: <20200207225313.31092-1-tom@tromey.com> In-Reply-To: <20200207225313.31092-1-tom@tromey.com> x-ts-tracking-id: de30f306-d021-49eb-8788-5509f315e7bc.1 x-checkrecipientchecked: true Authentication-Results-Original: spf=none (sender IP is ) smtp.mailfrom=Tamar.Christina@arm.com; x-checkrecipientrouted: true x-ms-oob-tlc-oobclassifiers: OLM:7691;OLM:7691; X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(4636009)(376002)(396003)(366004)(136003)(39860400002)(346002)(199004)(189003)(64756008)(66446008)(76116006)(66946007)(52536014)(2906002)(71200400001)(33656002)(81166006)(81156014)(66476007)(66556008)(86362001)(8936002)(478600001)(30864003)(7696005)(55016002)(26005)(186003)(9686003)(8676002)(316002)(53546011)(110136005)(5660300002)(4326008)(6506007)(579004);DIR:OUT;SFP:1101;SCL:1;SRVR:PR2PR08MB4794;H:PR2PR08MB4747.eurprd08.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: WyN30lryMaZTBxSQbW6xVSCor6r2iaKjeqL5jrgcRn+alsFE85X+KCAxDpxM5Fy7unWhFnL/8J5J9FhCsfgsQdE8sgkc+bNNjzHLZWkJAqu1F3eHphcMG3THlEx1Map4ScvlERN4iaR3JsmcPJxDnZgx5Qk8C/sJAPuF/Kq4hTP4ddjOIFEeiD8Rwlp3Jd++utfhDoA4OXGFrpZvSNBi4ZHAaVMD6nkVNOhfcRGF8hcoTfY1/u/Q2DGvb/zNL05Gy89J7OEd0AICMIZSOlT5TSdPutOU1acZ3G/ONCoQLwJ6aHWmKEdBbOPoxYshLXFdfvBZAZDqMvKeYCW04XaIJYDE1xQFGFKqYXN5hKJV0bX+diUy6cFWxHh5MMTzACiw/aks9mDgcQsCjrJiDeijujgc00GwF9C7eKObOUqTKjRtVW83spzlfGU+cyFYGjlw x-ms-exchange-antispam-messagedata: BdzTf/SY7j6CUnT7IDcoaxTNK0FPGvdRSEyyHTJlxTqwE0cDQj75KrN34KE0fQcd9WtLIvplWbUkI9SBaiTEeGlGGGjQuzTNMkX4J0gdvnfJxB5GdJ+kGjCXBWcteoxuR45TSryinfKgjBuBoTy9gA== x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Tamar.Christina@arm.com; Return-Path: Tamar.Christina@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT051.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 11076e94-65a5-4232-ba5f-08d7b9341bcb X-IsSubscribed: yes X-SW-Source: 2020-02/txt/msg00921.txt.bz2 Hi Tom, We're having trouble building cross toolchains after this change. Before this we were able to build gdb running on HOST but build gdbserver r= unning on TARGET. After this change we can no longer do this since you can't link objects fro= m different architectures. Is this not a supported workflow anymore? Any suggestions how to do this af= ter these changes? Thanks, Tamar > -----Original Message----- > From: gdb-patches-owner@sourceware.org owner@sourceware.org> On Behalf Of Tom Tromey > Sent: Friday, February 7, 2020 10:53 PM > To: gdb-patches@sourceware.org > Cc: Tom Tromey > Subject: [PATCH] Change gdbserver to use existing gnulib and libiberty >=20 > This changes gdbserver so that it no longer builds its own gnulib and lib= iberty. > Instead, it now relies on the ones that were already built at the top lev= el. >=20 > gdbsupport is still built specially for gdbserver. This is more complica= ted and > will be tackled in a subsequent patch. >=20 > ChangeLog > 2020-02-07 Tom Tromey >=20 > * Makefile.in: Rebuild. > * Makefile.def: Make gdbserver require gnulib and libiberty. >=20 > gdbserver/ChangeLog > 2020-02-07 Tom Tromey >=20 > * Makefile.in (LIBIBERTY_BUILDDIR, GNULIB_BUILDDIR): Update. > (SUBDIRS, CLEANDIRS, REQUIRED_SUBDIRS): Remove. > (all, install-only, uninstall, clean-info, clean) > (maintainer-clean): Don't recurse. > (subdir_do, all-lib): Remove. > ($(LIBGNU) $(LIBIBERTY) $(GNULIB_H)): Remove rule. > (GNULIB_H): Remove. > (generated_files): Update. > ($(GNULIB_BUILDDIR)/Makefile): Remove rule. > * configure: Rebuild. > * configure.ac: Don't configure gnulib or libiberty. > (GNULIB): Update. >=20 > gdbsupport/ChangeLog > 2020-02-07 Tom Tromey >=20 > * common-defs.h: Change path to gnulib/config.h. >=20 > Change-Id: I469cbbf5db2ab37109c058e9e3a1e4f4dabdfc98 > --- > ChangeLog | 5 + > Makefile.def | 5 + > Makefile.in | 4 + > gdbserver/ChangeLog | 15 +++ > gdbserver/Makefile.in | 59 +---------- > gdbserver/configure | 219 +-------------------------------------- > gdbserver/configure.ac | 18 +--- > gdbsupport/ChangeLog | 4 + > gdbsupport/common-defs.h | 2 +- > 9 files changed, 40 insertions(+), 291 deletions(-) >=20 > diff --git a/Makefile.def b/Makefile.def index 72cb133a09a..2fe8204366c > 100644 > --- a/Makefile.def > +++ b/Makefile.def > @@ -410,6 +410,11 @@ dependencies =3D { module=3Dall-gdb; on=3Dall- > libdecnumber; }; dependencies =3D { module=3Dall-gdb; on=3Dall-libtermca= p; }; > dependencies =3D { module=3Dall-gdb; on=3Dall-libctf; }; >=20 > +// Host modules specific to gdbserver. > +dependencies =3D { module=3Dconfigure-gdbserver; on=3Dall-gnulib; }; > +dependencies =3D { module=3Dall-gdbserver; on=3Dall-gnulib; }; dependenc= ies =3D > +{ module=3Dall-gdbserver; on=3Dall-libiberty; }; > + > dependencies =3D { module=3Dconfigure-libgui; on=3Dconfigure-tcl; }; > dependencies =3D { module=3Dconfigure-libgui; on=3Dconfigure-tk; }; > dependencies =3D { module=3Dall-libgui; on=3Dall-tcl; }; diff --git a/Mak= efile.in > b/Makefile.in index 80fa458d8d0..be38b34e9bf 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -51976,6 +51976,8 @@ all-gdb: maybe-all-readline > all-gdb: maybe-all-build-bison > all-gdb: maybe-all-sim > all-gdb: maybe-all-libtermcap > +configure-gdbserver: maybe-all-gnulib > +all-gdbserver: maybe-all-gnulib > configure-libgui: maybe-configure-tcl > configure-libgui: maybe-configure-tk > all-libgui: maybe-all-tcl > @@ -52427,6 +52429,7 @@ configure-gnattools: stage_last > configure-libcc1: stage_last > configure-utils: stage_last > configure-gdb: stage_last > +configure-gdbserver: stage_last > configure-gdbsupport: stage_last > configure-gprof: stage_last > configure-sid: stage_last > @@ -52450,6 +52453,7 @@ all-gdb: maybe-all-libiconv > all-gdb: maybe-all-opcodes > all-gdb: maybe-all-libdecnumber > all-gdb: maybe-all-libctf > +all-gdbserver: maybe-all-libiberty > configure-gdbsupport: maybe-configure-bfd > all-gdbsupport: maybe-all-bfd > configure-gprof: maybe-configure-intl > diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index > 60a52d3412b..e0f50d2f3e4 100644 > --- a/gdbserver/Makefile.in > +++ b/gdbserver/Makefile.in > @@ -97,7 +97,7 @@ CC_LD =3D $(CXX) $(CXX_DIALECT) INCLUDE_DIR =3D > ${srcdir}/../include INCLUDE_DEP =3D $$(INCLUDE_DIR) >=20 > -LIBIBERTY_BUILDDIR =3D build-libiberty-gdbserver > +LIBIBERTY_BUILDDIR =3D ../libiberty > LIBIBERTY =3D $(LIBIBERTY_BUILDDIR)/libiberty.a >=20 > # Where is ust? These will be empty if ust was not available. > @@ -105,14 +105,10 @@ ustlibs =3D @ustlibs@ ustinc =3D @ustinc@ >=20 > # gnulib > -GNULIB_BUILDDIR =3D build-gnulib-gdbserver > +GNULIB_BUILDDIR =3D ../gnulib > LIBGNU =3D $(GNULIB_BUILDDIR)/import/libgnu.a > INCGNU =3D -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import >=20 > -# Generated headers in the gnulib directory. These must be listed -# so= that > they are generated before other files are compiled. > -GNULIB_H =3D $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@ > - > INCSUPPORT =3D -I$(srcdir)/.. -I.. >=20 > # All the includes used for CFLAGS and for lint. > @@ -329,15 +325,6 @@ XML_BUILTIN =3D @srv_xmlbuiltin@ IPA_DEPFILES =3D > @IPA_DEPFILES@ extra_libraries =3D @extra_libraries@ >=20 > -SUBDIRS =3D $(GNULIB_BUILDDIR) $(LIBIBERTY_BUILDDIR) -CLEANDIRS =3D > $(SUBDIRS) > - > -# List of subdirectories in the build tree that must exist. > -# This is used to force build failures in existing trees when -# a new d= irectory > is added. > -# The format here is for the `case' shell command. > -REQUIRED_SUBDIRS =3D $(GNULIB_BUILDDIR) | $(LIBIBERTY_BUILDDIR) > - > FLAGS_TO_PASS =3D \ > "prefix=3D$(prefix)" \ > "exec_prefix=3D$(exec_prefix)" \ > @@ -371,10 +358,9 @@ FLAGS_TO_PASS =3D \ > "RUNTESTFLAGS=3D$(RUNTESTFLAGS)" >=20 > # All generated files which can be included by another file. > -generated_files =3D config.h $(GNULIB_H) > +generated_files =3D config.h >=20 > all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries) > - @$(MAKE) $(FLAGS_TO_PASS) DO=3D$@ "DODIRS=3D$(SUBDIRS)" > subdir_do >=20 > # Traditionally "install" depends on "all". But it may be useful # not= to; for > example, if the user has made some trivial change to a @@ -393,10 +379,6 > @@ install-only: > fi; \ > $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir); \ > $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) > gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) > - # Note that we run install and not install-only, as the latter > - # is not part of GNU standards and in particular not provided > - # in libiberty. > - @$(MAKE) $(FLAGS_TO_PASS) DO=3Dinstall "DODIRS=3D$(SUBDIRS)" > subdir_do >=20 > install-strip: > $(MAKE) $(FLAGS_TO_PASS) > INSTALL_PROGRAM=3D"$(INSTALL_STRIP_PROGRAM)" \ @@ -408,7 +390,6 > @@ uninstall: force > n=3D`echo gdbserver | sed '$(program_transform_name)'`; \ > if [ x$$n =3D x ]; then n=3Dgdbserver; else true; fi; \ > rm -f $(DESTDIR)/$(bindir)/$$n$(EXEEXT) > $(DESTDIR)$(man1dir)/$$n.1 > - @$(MAKE) $(FLAGS_TO_PASS) DO=3D$@ "DODIRS=3D$(SUBDIRS)" > subdir_do >=20 > installcheck: > check: > @@ -417,8 +398,7 @@ install-info: > install-pdf: > html: > install-html: > -clean-info: force > - @$(MAKE) $(FLAGS_TO_PASS) DO=3D$@ "DODIRS=3D$(SUBDIRS)" > subdir_do > +clean-info: >=20 > gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) > $(SILENCE) rm -f gdbserver$(EXEEXT) > @@ -426,11 +406,6 @@ gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} > $(LIBGNU) $(LIBIBERTY) > -o gdbserver$(EXEEXT) $(OBS) $(LIBGNU) $(LIBIBERTY) \ > $(GDBSERVER_LIBS) $(XM_CLIBS) >=20 > -$(LIBGNU) $(LIBIBERTY) $(GNULIB_H): all-lib > -all-lib: $(GNULIB_BUILDDIR)/Makefile $(LIBIBERTY_BUILDDIR)/Makefile > - @$(MAKE) $(FLAGS_TO_PASS) DO=3Dall DODIRS=3D"$(SUBDIRS)" > subdir_do > -.PHONY: all-lib > - > gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) > $(SILENCE) rm -f gdbreplay$(EXEEXT) > $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) > $(INTERNAL_LDFLAGS) \ @@ -488,33 +463,14 @@ clean: > rm -f $$i/*.o; \ > rm -f $$i/$(DEPDIR)/*; \ > done > - @$(MAKE) $(FLAGS_TO_PASS) DO=3D$@ "DODIRS=3D$(SUBDIRS)" > subdir_do >=20 > maintainer-clean realclean distclean: clean > - @$(MAKE) $(FLAGS_TO_PASS) DO=3D$@ "DODIRS=3D$(SUBDIRS)" > subdir_do > - rm -rf $(GNULIB_BUILDDIR) > rm -f Makefile config.status config.h stamp-h config.log > rm -f Makefile > for i in $(CONFIG_SRC_SUBDIR); do \ > rmdir $$i/$(DEPDIR); \ > done >=20 > -subdir_do: force > - @for i in $(DODIRS); do \ > - case $$i in \ > - $(REQUIRED_SUBDIRS)) \ > - if [ ! -f ./$$i/Makefile ] ; then \ > - echo "Missing $$i/Makefile" >&2 ; \ > - exit 1 ; \ > - fi ;; \ > - esac ; \ > - if [ -f ./$$i/Makefile ] ; then \ > - if (cd ./$$i; \ > - $(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then > true ; \ > - else exit 1 ; fi ; \ > - else true ; fi ; \ > - done > - > config.h: stamp-h ; @true > stamp-h: config.in config.status > $(SHELL) ./config.status config.h > @@ -522,13 +478,6 @@ stamp-h: config.in config.status > Makefile: Makefile.in config.status > $(SHELL) ./config.status $@ >=20 > -$(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../gnulib/Makefile.in config.stat= us > - @cd $(GNULIB_BUILDDIR); CONFIG_FILES=3D"Makefile" \ > - CONFIG_COMMANDS=3D"depfiles" \ > - CONFIG_HEADERS=3D \ > - CONFIG_LINKS=3D \ > - $(SHELL) config.status > - > config.status: configure configure.srv $(srcdir)/../bfd/development.sh > $(SHELL) ./config.status --recheck >=20 > diff --git a/gdbserver/configure b/gdbserver/configure index > 4b9d7e3718f..eb8aa80c2c5 100755 > --- a/gdbserver/configure > +++ b/gdbserver/configure > @@ -6243,223 +6243,6 @@ else > CCDEPMODE=3Ddepmode=3D$am_cv_CC_dependencies_compiler_type > fi >=20 >=20 > -gnulib_extra_configure_args=3D > -# If large-file support is disabled, make sure gnulib does the same. > -if test "$enable_largefile" =3D no; then > -gnulib_extra_configure_args=3D"$gnulib_extra_configure_args --disable- > largefile" > -fi > - > -# Configure gnulib. We can't use AC_CONFIG_SUBDIRS as that'd expect -# > to find the the source subdir to be configured directly under -# gdbserve= r/. > We need to build gnulib under some other directory not -# "gnulib", to av= oid > the problem of both GDB and GDBserver wanting to -# build it in the same > directory, when building in the source dir. > - > - in_src=3D"../gnulib" > - in_build=3D"build-gnulib-gdbserver" > - in_extra_args=3D"$gnulib_extra_configure_args" > - > - # Remove --cache-file, --srcdir, and --disable-option-checking argumen= ts > - # so they do not pile up. > - ac_sub_configure_args=3D > - ac_prev=3D > - eval "set x $ac_configure_args" > - shift > - for ac_arg > - do > - if test -n "$ac_prev"; then > - ac_prev=3D > - continue > - fi > - case $ac_arg in > - -cache-file | --cache-file | --cache-fil | --cache-fi \ > - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) > - ac_prev=3Dcache_file ;; > - -cache-file=3D* | --cache-file=3D* | --cache-fil=3D* | --cache-fi=3D= * \ > - | --cache-f=3D* | --cache-=3D* | --cache=3D* | --cach=3D* | --cac=3D= * | --ca=3D* \ > - | --c=3D*) > - ;; > - --config-cache | -C) > - ;; > - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) > - ac_prev=3Dsrcdir ;; > - -srcdir=3D* | --srcdir=3D* | --srcdi=3D* | --srcd=3D* | --src=3D* | = --sr=3D*) > - ;; > - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) > - ac_prev=3Dprefix ;; > - -prefix=3D* | --prefix=3D* | --prefi=3D* | --pref=3D* | --pre=3D* | = --pr=3D* | --p=3D*) > - ;; > - --disable-option-checking) > - ;; > - *) > - case $ac_arg in > - *\'*) ac_arg=3D`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; > - esac > - as_fn_append ac_sub_configure_args " '$ac_arg'" ;; > - esac > - done > - > - # Always prepend --prefix to ensure using the same prefix > - # in subdir configurations. > - ac_arg=3D"--prefix=3D$prefix" > - case $ac_arg in > - *\'*) ac_arg=3D`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; > - esac > - ac_sub_configure_args=3D"'$ac_arg' $ac_sub_configure_args" > - > - # Pass --silent > - if test "$silent" =3D yes; then > - ac_sub_configure_args=3D"--silent $ac_sub_configure_args" > - fi > - > - # Always prepend --disable-option-checking to silence warnings, since > - # different subdirs can have different --enable and --with options. > - ac_sub_configure_args=3D"--disable-option-checking > $ac_sub_configure_args" > - > - ac_popdir=3D`pwd` > - ac_dir=3D$in_build > - > - ac_msg=3D"=3D=3D=3D configuring in $ac_dir (`pwd`/$ac_dir)" > - $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 > - $as_echo "$ac_msg" >&6 > - as_dir=3D"$ac_dir"; as_fn_mkdir_p > - > - case $srcdir in > - [\\/]* | ?:[\\/]* ) > - ac_srcdir=3D$srcdir/$in_src ;; > - *) # Relative name. > - ac_srcdir=3D../$srcdir/$in_src ;; > - esac > - > - cd "$ac_dir" > - > - ac_sub_configure=3D$ac_srcdir/configure > - > - # Make the cache file name correct relative to the subdirectory. > - case $cache_file in > - [\\/]* | ?:[\\/]* ) ac_sub_cache_file=3D$cache_file ;; > - *) # Relative name. > - ac_sub_cache_file=3D$ac_top_build_prefix$cache_file ;; > - esac > - > - if test -n "$in_extra_args"; then > - # Add the extra args at the end. > - ac_sub_configure_args=3D"$ac_sub_configure_args $in_extra_args" > - fi > - > - { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL > $ac_sub_configure $ac_sub_configure_args --cache-file=3D$ac_sub_cache_file > --srcdir=3D$ac_srcdir" >&5 -$as_echo "$as_me: running $SHELL > $ac_sub_configure $ac_sub_configure_args --cache-file=3D$ac_sub_cache_file > --srcdir=3D$ac_srcdir" >&6;} > - # The eval makes quoting arguments work. > - eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ > - --cache-file=3D\"\$ac_sub_cache_file\" --srcdir=3D\"\$ac_srcdir\"= " || > - as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 > - > - cd "$ac_popdir" > - > - > - > - in_src=3D"../libiberty" > - in_build=3D"build-libiberty-gdbserver" > - in_extra_args=3D > - > - # Remove --cache-file, --srcdir, and --disable-option-checking argumen= ts > - # so they do not pile up. > - ac_sub_configure_args=3D > - ac_prev=3D > - eval "set x $ac_configure_args" > - shift > - for ac_arg > - do > - if test -n "$ac_prev"; then > - ac_prev=3D > - continue > - fi > - case $ac_arg in > - -cache-file | --cache-file | --cache-fil | --cache-fi \ > - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) > - ac_prev=3Dcache_file ;; > - -cache-file=3D* | --cache-file=3D* | --cache-fil=3D* | --cache-fi=3D= * \ > - | --cache-f=3D* | --cache-=3D* | --cache=3D* | --cach=3D* | --cac=3D= * | --ca=3D* \ > - | --c=3D*) > - ;; > - --config-cache | -C) > - ;; > - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) > - ac_prev=3Dsrcdir ;; > - -srcdir=3D* | --srcdir=3D* | --srcdi=3D* | --srcd=3D* | --src=3D* | = --sr=3D*) > - ;; > - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) > - ac_prev=3Dprefix ;; > - -prefix=3D* | --prefix=3D* | --prefi=3D* | --pref=3D* | --pre=3D* | = --pr=3D* | --p=3D*) > - ;; > - --disable-option-checking) > - ;; > - *) > - case $ac_arg in > - *\'*) ac_arg=3D`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; > - esac > - as_fn_append ac_sub_configure_args " '$ac_arg'" ;; > - esac > - done > - > - # Always prepend --prefix to ensure using the same prefix > - # in subdir configurations. > - ac_arg=3D"--prefix=3D$prefix" > - case $ac_arg in > - *\'*) ac_arg=3D`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; > - esac > - ac_sub_configure_args=3D"'$ac_arg' $ac_sub_configure_args" > - > - # Pass --silent > - if test "$silent" =3D yes; then > - ac_sub_configure_args=3D"--silent $ac_sub_configure_args" > - fi > - > - # Always prepend --disable-option-checking to silence warnings, since > - # different subdirs can have different --enable and --with options. > - ac_sub_configure_args=3D"--disable-option-checking > $ac_sub_configure_args" > - > - ac_popdir=3D`pwd` > - ac_dir=3D$in_build > - > - ac_msg=3D"=3D=3D=3D configuring in $ac_dir (`pwd`/$ac_dir)" > - $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 > - $as_echo "$ac_msg" >&6 > - as_dir=3D"$ac_dir"; as_fn_mkdir_p > - > - case $srcdir in > - [\\/]* | ?:[\\/]* ) > - ac_srcdir=3D$srcdir/$in_src ;; > - *) # Relative name. > - ac_srcdir=3D../$srcdir/$in_src ;; > - esac > - > - cd "$ac_dir" > - > - ac_sub_configure=3D$ac_srcdir/configure > - > - # Make the cache file name correct relative to the subdirectory. > - case $cache_file in > - [\\/]* | ?:[\\/]* ) ac_sub_cache_file=3D$cache_file ;; > - *) # Relative name. > - ac_sub_cache_file=3D$ac_top_build_prefix$cache_file ;; > - esac > - > - if test -n "$in_extra_args"; then > - # Add the extra args at the end. > - ac_sub_configure_args=3D"$ac_sub_configure_args $in_extra_args" > - fi > - > - { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL > $ac_sub_configure $ac_sub_configure_args --cache-file=3D$ac_sub_cache_file > --srcdir=3D$ac_srcdir" >&5 -$as_echo "$as_me: running $SHELL > $ac_sub_configure $ac_sub_configure_args --cache-file=3D$ac_sub_cache_file > --srcdir=3D$ac_srcdir" >&6;} > - # The eval makes quoting arguments work. > - eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ > - --cache-file=3D\"\$ac_sub_cache_file\" --srcdir=3D\"\$ac_srcdir\"= " || > - as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 > - > - cd "$ac_popdir" > - > - > for ac_header in termios.h sys/reg.h string.h sys/procfs.h > linux/elf.h fcntl.h signal.h sys/file.h sys/ioctl.h > netinet/in.h sys/socket.h netdb.h netinet/tcp.h arpa/inet.h > do : > as_ac_Header=3D`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ - > 10838,7 +10621,7 @@ fi >=20 >=20 >=20 > -GNULIB=3Dbuild-gnulib-gdbserver/import > +GNULIB=3D../gnulib/import >=20 > GNULIB_STDINT_H=3D > if test x"$STDINT_H" !=3D x; then > diff --git a/gdbserver/configure.ac b/gdbserver/configure.ac index > 285a297a1c6..cbd12ea2ed0 100644 > --- a/gdbserver/configure.ac > +++ b/gdbserver/configure.ac > @@ -69,22 +69,6 @@ AC_CONFIG_COMMANDS([gdbdepdir],[ >=20 > ZW_PROG_COMPILER_DEPENDENCIES([CC]) >=20 > -gnulib_extra_configure_args=3D > -# If large-file support is disabled, make sure gnulib does the same. > -if test "$enable_largefile" =3D no; then > -gnulib_extra_configure_args=3D"$gnulib_extra_configure_args --disable- > largefile" > -fi > - > -# Configure gnulib. We can't use AC_CONFIG_SUBDIRS as that'd expect -# > to find the the source subdir to be configured directly under -# gdbserve= r/. > We need to build gnulib under some other directory not -# "gnulib", to av= oid > the problem of both GDB and GDBserver wanting to -# build it in the same > directory, when building in the source dir. > -ACX_CONFIGURE_DIR(["../gnulib"], ["build-gnulib-gdbserver"], > - ["$gnulib_extra_configure_args"]) > - > -ACX_CONFIGURE_DIR(["../libiberty"], ["build-libiberty-gdbserver"]) > - > AC_CHECK_HEADERS(termios.h sys/reg.h string.h dnl > sys/procfs.h linux/elf.h dnl > fcntl.h signal.h sys/file.h dnl > @@ -432,7 +416,7 @@ AC_SUBST(srv_xmlfiles) > AC_SUBST(IPA_DEPFILES) > AC_SUBST(extra_libraries) >=20 > -GNULIB=3Dbuild-gnulib-gdbserver/import > +GNULIB=3D../gnulib/import >=20 > GNULIB_STDINT_H=3D > if test x"$STDINT_H" !=3D x; then > diff --git a/gdbsupport/common-defs.h b/gdbsupport/common-defs.h index > 027bf099c1a..a5c57de2f27 100644 > --- a/gdbsupport/common-defs.h > +++ b/gdbsupport/common-defs.h > @@ -22,7 +22,7 @@ >=20 > #ifdef GDBSERVER >=20 > -#include > +#include >=20 > #undef PACKAGE_NAME > #undef PACKAGE > -- > 2.17.2