Re: [PATCH v3 1/2] Introduce "gdb/configure.nat" (and delete "gdb/config/*/*.mh" files)

Pedro Alves
2017-05-17T13:22:32Z

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 <palves@redhat.com>
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 <palves@redhat.com>

* 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 <palves@redhat.com>
+
+ * 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 <ro@CeBiTec.Uni-Bielefeld.DE>

* 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