From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22565 invoked by alias); 17 May 2017 13:22:32 -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 22546 invoked by uid 89); 17 May 2017 13:22:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.2 spammy=UD:mh, junior, Junior, H*r:sk:15.2017 X-HELO: mail-wm0-f41.google.com Received: from mail-wm0-f41.google.com (HELO mail-wm0-f41.google.com) (74.125.82.41) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 17 May 2017 13:22:29 +0000 Received: by mail-wm0-f41.google.com with SMTP id 70so10395255wmq.1 for ; Wed, 17 May 2017 06:22:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=9dGKelDsCqIipdJjwQkcDV9omVyPMO9Ax04/ZagwyQs=; b=UQjzQXACZsg2dvi4/e07x8zf/7m/wKQg1oXflLoaQeAWNMN3E/ieV8WlRIijwRQ7my tyysqdU5DiYe9V940xlq8TWvxeIMgnw0HKVBCaInLq8qW9/oM52Tu8d7+X7Ugh2ExiEL NxNv7Y33jQQf+JqrZhW/eB2bgQ/t+dOmBacU20PDsiXrxXQS4/e6JDnIMhxCTBRYmVLg 4urQCSbw1LucrgxvZ/IBUQLI5x4Vp1k33/E9YjVdIs+rtDx9ShPl3LqTauGZkMoTBONK /11b1bxnoAIMYLBkfvwaEtpmI7D9tYj9y/jJ8R5VBbhSoMFG0SmvgxLA5wwUHLPOn+Ps A0Bg== X-Gm-Message-State: AODbwcCD9UwmzlpsebtZsteZv0aFxiUAtOG0lSl+YPO4E3p935pxK2vY h3g6bF20mrNSZCdS X-Received: by 10.28.9.204 with SMTP id 195mr2665281wmj.97.1495027350620; Wed, 17 May 2017 06:22:30 -0700 (PDT) Received: from [192.168.0.101] ([37.189.166.198]) by smtp.gmail.com with ESMTPSA id l1sm3068731wrl.15.2017.05.17.06.22.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 May 2017 06:22:29 -0700 (PDT) Subject: Re: [PATCH v3 1/2] Introduce "gdb/configure.nat" (and delete "gdb/config/*/*.mh" files) To: Sergio Durigan Junior References: <20170425202309.15771-1-sergiodj@redhat.com> <20170505042951.32097-1-sergiodj@redhat.com> <20170505042951.32097-2-sergiodj@redhat.com> <87pofmt6nz.fsf@redhat.com> Cc: GDB Patches , Simon Marchi , John Baldwin From: Pedro Alves Message-ID: <5c87ca5d-99c6-9dc2-6708-fab09142f64b@redhat.com> Date: Wed, 17 May 2017 13:22:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <87pofmt6nz.fsf@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2017-05/txt/msg00388.txt.bz2 On 05/06/2017 03:13 PM, Sergio Durigan Junior wrote: > On Friday, May 05 2017, Pedro Alves wrote: > >> On 05/05/2017 05:29 AM, Sergio Durigan Junior wrote: >> >>> +# Native-target dependent makefile fragment comes in here. >>> +@nat_extra_makefile_frag@ >>> + >> >> Apart from the naming issue and the spurious whitespace changes, >> this looks fine to me. > > Thanks, pushed with the nits addressed. > > 21ea5acdd1bcfe89984b16b5bac730050c5cf05e Catching up on older some emails, I noticed that the "extra" stayed behind in the variable name. I pushed this in as an obvious fix. >From 2b351b19efc8dd36ac8a8bda005c7411536b93ec Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 17 May 2017 13:56:19 +0100 Subject: [PATCH] nat_extra_makefile_frag -> nat_makefile_frag gdb/ChangeLog: 2017-05-17 Pedro Alves * Makefile.in (nat_extra_makefile_frag): Rename to ... (nat_makefile_frag): ... this. All references updated. * configure.ac: Likewise. * configure.nat: Likewise. Enhance comments. * configure: Regenerate. --- gdb/ChangeLog | 8 ++++++++ gdb/Makefile.in | 2 +- gdb/configure | 4 ++-- gdb/configure.ac | 4 ++-- gdb/configure.nat | 11 ++++++----- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 980bd3f..f2068d2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2017-05-17 Pedro Alves + + * Makefile.in (nat_extra_makefile_frag): Rename to ... + (nat_makefile_frag): ... this. All references updated. + * configure.ac: Likewise. + * configure.nat: Likewise. Enhance comments. + * configure: Regenerate. + 2017-05-15 Rainer Orth * procfs.c (procfs_create_inferior): Change prototype to match diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 70d7d50..452f146 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -916,7 +916,7 @@ NAT_GENERATED_FILES = @NAT_GENERATED_FILES@ HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@ # Native-target dependent makefile fragment comes in here. -@nat_extra_makefile_frag@ +@nat_makefile_frag@ # End of native-target dependent variables. diff --git a/gdb/configure b/gdb/configure index 9aeef35..8df81ac 100755 --- a/gdb/configure +++ b/gdb/configure @@ -806,7 +806,7 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR SHELL' -ac_subst_files='nat_extra_makefile_frag' +ac_subst_files='nat_makefile_frag' ac_user_opts=' enable_option_checking enable_maintainer_mode @@ -16732,7 +16732,7 @@ fi # Import nat definitions. -nat_extra_makefile_frag=/dev/null +nat_makefile_frag=/dev/null if test "${gdb_native}" = "yes"; then . ${srcdir}/configure.nat nativefile=$NAT_FILE diff --git a/gdb/configure.ac b/gdb/configure.ac index 05ea0c0..fd11cf0 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -2200,7 +2200,7 @@ fi AC_SUBST(target_subdir) # Import nat definitions. -nat_extra_makefile_frag=/dev/null +nat_makefile_frag=/dev/null if test "${gdb_native}" = "yes"; then . ${srcdir}/configure.nat nativefile=$NAT_FILE @@ -2214,7 +2214,7 @@ AC_SUBST(MH_CFLAGS) AC_SUBST(XM_CLIBS) AC_SUBST(NAT_GENERATED_FILES) AC_SUBST(HAVE_NATIVE_GCORE_HOST) -AC_SUBST_FILE(nat_extra_makefile_frag) +AC_SUBST_FILE(nat_makefile_frag) if test x"${gdb_osabi}" != x ; then AC_DEFINE_UNQUOTED(GDB_OSABI_DEFAULT, $gdb_osabi, diff --git a/gdb/configure.nat b/gdb/configure.nat index 4bf06c5..e6c96da 100644 --- a/gdb/configure.nat +++ b/gdb/configure.nat @@ -36,16 +36,17 @@ # HAVE_NATIVE_GCORE_HOST - Whether gcore should be installed on this # native target. # -# nat_extra_makefile_frag - File containing extra fragments of -# Makefile that will be used by this native -# target. +# nat_makefile_frag - Name of the (optional) Makefile fragment file +# required to build the native target. The +# fragment is incorporated into the Makefile that +# configure constructs from Makefile.in. # # Notes: # # - To avoid shell expansion of variables, declare them with single # quotes. # -# - nat_extra_makefile_frag should contain the full path of the file. +# - nat_makefile_frag must contain the full path of the file. # This first case is useful for filling default values for each @@ -195,7 +196,7 @@ case ${gdb_host} in XM_CLIBS='-lshouldbeinlibc' - nat_extra_makefile_frag="${srcdir}/config/${gdb_host_cpu}/i386gnu.mn" + nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/i386gnu.mn" ;; esac ;; -- 2.5.5