[v2,1/2] Introduce "gdb/configure.nat" (and delete "gdb/config/*/*.mh" files)
Commit Message
Due to my ongoing work to make it possible for gdbserver to start the
inferior using the shell, I had to share the fork_inferior function
under the "nat/" directory. In order to do that, I created a new file
and put the function there; however, this meant that I now had to
update some of the *.mh files (under "gdb/config") and add the new
file as a dependency to be built natively. Bleh...
After talking a bit to Pedro about this, the idea came up to write a
new "gdb/configure.nat" file, a la "gdb/configure.tgt", which would
concentrate all of the native settings for each host/system. I
decided to tackle this issue.
The patch is simple. All of the previous Makefile variables that were
being declared inside the *.mh files are now inside "gdb/Makefile.in",
and "gdb/configure" is responsible for AC_SUBST'ing them. The
definitions of these variables were put inside "gdb/configure.nat", so
now they're shell variables. For excerpts of Makefile code, one must
create a file under "gdb/config/${gdb_cpu_host}" and reference it on
the "NAT_EXTRA_FRAGS_FILE" variable.
It should now be easier to update the native dependencies of hosts in
this single file.
This has been tested on x86_64 without regressions.
gdb/ChangeLog:
yyyy-mm-dd Sergio Durigan Junior <sergiodj@redhat.com>
* Makefile.in: Remove "@host_makefile_frag@". Add variables
NAT_FILE, NATDEPFILES, NAT_CDEPS, LOADLIBES, MH_CFLAGS, XM_CLIBS,
NAT_GENERATED_FILES, HAVE_NATIVE_GCORE_TARGET. Add
"@NAT_EXTRA_FRAGS_FILE@".
(Makefile): Remove dependency on "@frags@".
($(GNULIB_BUILDDIR)/Makefile): Likewise.
(data-directory/Makefile): Likewise.
* config/aarch64/linux.mh: Deleted; moved contents to
"gdb/configure.nat".
* config/alpha/alpha-linux.mh: Likewise.
* config/alpha/nbsd.mh: Likewise.
* config/arm/linux.mh: Likewise.
* config/arm/nbsdelf.mh: Likewise.
* config/i386/cygwin.mh: Likewise.
* config/i386/cygwin64.mh: Likewise.
* config/i386/darwin.mh: Likewise.
* config/i386/fbsd.mh: Likewise.
* config/i386/fbsd64.mh: Likewise.
* config/i386/go32.mh: Likewise.
* config/i386/i386gnu.mh: Likewise.
* config/i386/i386sol2.mh: Likewise.
* config/i386/linux.mh: Likewise.
* config/i386/linux64.mh: Likewise.
* config/i386/mingw.mh: Likewise.
* config/i386/mingw64.mh: Likewise.
* config/i386/nbsd64.mh: Likewise.
* config/i386/nbsdelf.mh: Likewise.
* config/i386/nto.mh: Likewise.
* config/i386/obsd.mh: Likewise.
* config/i386/obsd64.mh: Likewise.
* config/i386/sol2-64.mh: Likewise.
* config/ia64/linux.mh: Likewise.
* config/m32r/linux.mh: Likewise.
* config/m68k/linux.mh: Likewise.
* config/m68k/nbsdelf.mh: Likewise.
* config/m68k/obsd.mh: Likewise.
* config/m88k/obsd.mh: Likewise.
* config/mips/fbsd.mh: Likewise.
* config/mips/linux.mh: Likewise.
* config/mips/nbsd.mh: Likewise.
* config/mips/obsd64.mh: Likewise.
* config/pa/linux.mh: Likewise.
* config/pa/nbsd.mh: Likewise.
* config/pa/obsd.mh: Likewise.
* config/powerpc/aix.mh: Likewise.
* config/powerpc/fbsd.mh: Likewise.
* config/powerpc/linux.mh: Likewise.
* config/powerpc/nbsd.mh: Likewise.
* config/powerpc/obsd.mh: Likewise.
* config/powerpc/ppc64-linux.mh: Likewise.
* config/powerpc/spu-linux.mh: Likewise.
* config/s390/linux.mh: Likewise.
* config/sh/nbsd.mh: Likewise.
* config/sparc/fbsd.mh: Likewise.
* config/sparc/linux.mh: Likewise.
* config/sparc/linux64.mh: Likewise.
* config/sparc/nbsd64.mh: Likewise.
* config/sparc/nbsdelf.mh: Likewise.
* config/sparc/obsd64.mh: Likewise.
* config/sparc/sol2.mh: Likewise.
* config/tilegx/linux.mh: Likewise.
* config/vax/nbsdelf.mh: Likewise.
* config/vax/obsd.mh: Likewise.
* config/xtensa/linux.mh: Likewise.
* config/i386/i386gnu-extra.mh: New file.
* configure: Regenerate.
* configure.ac: Rewrite code to use "gdb/configure.nat" instead of
*.mh files under "gdb/config".
* configure.nat: New file, with contents from the
"gdb/config/*/*.mh" files.
gdb/doc/ChangeLog:
yyyy-mm-dd Sergio Durigan Junior <sergiodj@redhat.com>
* Makefile: Remove "@host_makefile_frag".
---
gdb/Makefile.in | 17 +-
gdb/config/aarch64/linux.mh | 29 --
gdb/config/alpha/alpha-linux.mh | 15 -
gdb/config/alpha/nbsd.mh | 4 -
gdb/config/arm/linux.mh | 10 -
gdb/config/arm/nbsdelf.mh | 2 -
gdb/config/i386/cygwin.mh | 3 -
gdb/config/i386/cygwin64.mh | 20 -
gdb/config/i386/darwin.mh | 4 -
gdb/config/i386/fbsd.mh | 8 -
gdb/config/i386/fbsd64.mh | 7 -
gdb/config/i386/go32.mh | 11 -
gdb/config/i386/{i386gnu.mh => i386gnu-extra.mh} | 23 +-
gdb/config/i386/i386sol2.mh | 4 -
gdb/config/i386/linux.mh | 14 -
gdb/config/i386/linux64.mh | 15 -
gdb/config/i386/mingw.mh | 3 -
gdb/config/i386/mingw64.mh | 1 -
gdb/config/i386/nbsd64.mh | 3 -
gdb/config/i386/nbsdelf.mh | 5 -
gdb/config/i386/nto.mh | 4 -
gdb/config/i386/obsd.mh | 5 -
gdb/config/i386/obsd64.mh | 5 -
gdb/config/i386/sol2-64.mh | 4 -
gdb/config/ia64/linux.mh | 13 -
gdb/config/m32r/linux.mh | 10 -
gdb/config/m68k/linux.mh | 14 -
gdb/config/m68k/nbsdelf.mh | 4 -
gdb/config/m68k/obsd.mh | 4 -
gdb/config/m88k/obsd.mh | 2 -
gdb/config/mips/fbsd.mh | 3 -
gdb/config/mips/linux.mh | 11 -
gdb/config/mips/nbsd.mh | 2 -
gdb/config/mips/obsd64.mh | 2 -
gdb/config/pa/linux.mh | 10 -
gdb/config/pa/nbsd.mh | 2 -
gdb/config/pa/obsd.mh | 2 -
gdb/config/powerpc/aix.mh | 8 -
gdb/config/powerpc/fbsd.mh | 24 -
gdb/config/powerpc/linux.mh | 12 -
gdb/config/powerpc/nbsd.mh | 4 -
gdb/config/powerpc/obsd.mh | 4 -
gdb/config/powerpc/ppc64-linux.mh | 15 -
gdb/config/powerpc/spu-linux.mh | 8 -
gdb/config/s390/linux.mh | 9 -
gdb/config/sh/nbsd.mh | 2 -
gdb/config/sparc/fbsd.mh | 7 -
gdb/config/sparc/linux.mh | 13 -
gdb/config/sparc/linux64.mh | 13 -
gdb/config/sparc/nbsd64.mh | 5 -
gdb/config/sparc/nbsdelf.mh | 5 -
gdb/config/sparc/obsd64.mh | 5 -
gdb/config/sparc/sol2.mh | 6 -
gdb/config/tilegx/linux.mh | 13 -
gdb/config/vax/nbsdelf.mh | 5 -
gdb/config/vax/obsd.mh | 5 -
gdb/config/xtensa/linux.mh | 11 -
gdb/configure | 34 +-
gdb/configure.ac | 33 +-
gdb/configure.nat | 608 +++++++++++++++++++++++
gdb/doc/Makefile.in | 3 -
61 files changed, 654 insertions(+), 493 deletions(-)
delete mode 100644 gdb/config/aarch64/linux.mh
delete mode 100644 gdb/config/alpha/alpha-linux.mh
delete mode 100644 gdb/config/alpha/nbsd.mh
delete mode 100644 gdb/config/arm/linux.mh
delete mode 100644 gdb/config/arm/nbsdelf.mh
delete mode 100644 gdb/config/i386/cygwin.mh
delete mode 100644 gdb/config/i386/cygwin64.mh
delete mode 100644 gdb/config/i386/darwin.mh
delete mode 100644 gdb/config/i386/fbsd.mh
delete mode 100644 gdb/config/i386/fbsd64.mh
delete mode 100644 gdb/config/i386/go32.mh
rename gdb/config/i386/{i386gnu.mh => i386gnu-extra.mh} (58%)
delete mode 100644 gdb/config/i386/i386sol2.mh
delete mode 100644 gdb/config/i386/linux.mh
delete mode 100644 gdb/config/i386/linux64.mh
delete mode 100644 gdb/config/i386/mingw.mh
delete mode 100644 gdb/config/i386/mingw64.mh
delete mode 100644 gdb/config/i386/nbsd64.mh
delete mode 100644 gdb/config/i386/nbsdelf.mh
delete mode 100644 gdb/config/i386/nto.mh
delete mode 100644 gdb/config/i386/obsd.mh
delete mode 100644 gdb/config/i386/obsd64.mh
delete mode 100644 gdb/config/i386/sol2-64.mh
delete mode 100644 gdb/config/ia64/linux.mh
delete mode 100644 gdb/config/m32r/linux.mh
delete mode 100644 gdb/config/m68k/linux.mh
delete mode 100644 gdb/config/m68k/nbsdelf.mh
delete mode 100644 gdb/config/m68k/obsd.mh
delete mode 100644 gdb/config/m88k/obsd.mh
delete mode 100644 gdb/config/mips/fbsd.mh
delete mode 100644 gdb/config/mips/linux.mh
delete mode 100644 gdb/config/mips/nbsd.mh
delete mode 100644 gdb/config/mips/obsd64.mh
delete mode 100644 gdb/config/pa/linux.mh
delete mode 100644 gdb/config/pa/nbsd.mh
delete mode 100644 gdb/config/pa/obsd.mh
delete mode 100644 gdb/config/powerpc/aix.mh
delete mode 100644 gdb/config/powerpc/fbsd.mh
delete mode 100644 gdb/config/powerpc/linux.mh
delete mode 100644 gdb/config/powerpc/nbsd.mh
delete mode 100644 gdb/config/powerpc/obsd.mh
delete mode 100644 gdb/config/powerpc/ppc64-linux.mh
delete mode 100644 gdb/config/powerpc/spu-linux.mh
delete mode 100644 gdb/config/s390/linux.mh
delete mode 100644 gdb/config/sh/nbsd.mh
delete mode 100644 gdb/config/sparc/fbsd.mh
delete mode 100644 gdb/config/sparc/linux.mh
delete mode 100644 gdb/config/sparc/linux64.mh
delete mode 100644 gdb/config/sparc/nbsd64.mh
delete mode 100644 gdb/config/sparc/nbsdelf.mh
delete mode 100644 gdb/config/sparc/obsd64.mh
delete mode 100644 gdb/config/sparc/sol2.mh
delete mode 100644 gdb/config/tilegx/linux.mh
delete mode 100644 gdb/config/vax/nbsdelf.mh
delete mode 100644 gdb/config/vax/obsd.mh
delete mode 100644 gdb/config/xtensa/linux.mh
create mode 100644 gdb/configure.nat
Comments
On 05/03/2017 04:49 AM, Sergio Durigan Junior wrote:
> diff --git a/gdb/Makefile.in b/gdb/Makefile.in
> index b865b7c..e26079a 100644
> --- a/gdb/Makefile.in
> +++ b/gdb/Makefile.in
> @@ -903,7 +903,16 @@ ALL_TARGET_OBS = \
> xtensa-tdep.o
>
> # Host-dependent makefile fragment comes in here.
Stale comment. Should say something about the variables being
defined in configure.nat.
> -@host_makefile_frag@
> +NAT_FILE = @NAT_FILE@
> +NATDEPFILES = @NATDEPFILES@
> +NAT_CDEPS = @NAT_CDEPS@
> +LOADLIBES = @LOADLIBES@
> +MH_CFLAGS = @MH_CFLAGS@
> +XM_CLIBS = @XM_CLIBS@
> +NAT_GENERATED_FILES = @NAT_GENERATED_FILES@
> +HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@
> +
> +@NAT_EXTRA_FRAGS_FILE@
And this last line here is where we source the
fragment, so that comment above should move here
with s/Host/Native-target/
I think it should be "FRAG", singular.
"makefile fragment file" is the term most often used.
Also, I think "host_makefile_frag" was lowercase because
that variable is not meant to be passed to make or any
tool make invokes.
> # End of host-dependent makefile fragment
Likewise, mind the comments.
>
> -# Copyright (C) 2013-2017 Free Software Foundation, Inc.
> -#
> diff --git a/gdb/config/i386/i386gnu.mh b/gdb/config/i386/i386gnu-extra.mh
> similarity index 58%
> rename from gdb/config/i386/i386gnu.mh
> rename to gdb/config/i386/i386gnu-extra.mh
Why the "extra" rename ? If anything, I'd expect i386gnu.mh -> i386gnu.mn?
> # Use our own user stubs for the msg rpcs, so we can make them time out, in
> # case the program is fucked, or we guess the wrong signal thread.
> -msg-MIGUFLAGS = -D'MSG_IMPORTS=waittime 1000;'
> +msg-MIGUFLAGS=-D'MSG_IMPORTS=waittime 1000;'
>
> # ick
> -MIGCOM = $(MIG) -cc cat - /dev/null
> +MIGCOM=$(MIG) -cc cat - /dev/null
Simon recently went through all variables making sure
there's a space around the "=". This goes in the other
direction.
>
> # Reply servers need special massaging of the code mig generates, to make
> # them work correctly for error returns in some cases.
> @@ -33,9 +21,4 @@ MIGCOM = $(MIG) -cc cat - /dev/null
> | $(MIGCOM) -sheader /dev/null -server /dev/null -user $*_U.c -header $*_U.h
>
> # MIG stubs are not yet ready for C++ compilation.
> -%_S.o %_U.o : COMPILE.post += -x c
> -
> -NAT_GENERATED_FILES = notify_S.h notify_S.c \
> - process_reply_S.h process_reply_S.c \
> - msg_reply_S.h msg_reply_S.c msg_U.h msg_U.c \
> - exc_request_U.h exc_request_U.c exc_request_S.h exc_request_S.c
> +%_S.o %_U.o : COMPILE.post +=-x c"
Was that quote char (") at the end added on purpose?
Looks like a typo.
Since most of the MIG related bits are left in the makefile
fragment, I wonder whether it really makes sense to move
the NAT_GENERATED_FILES setting far away from them.
> diff --git a/gdb/configure.ac b/gdb/configure.ac
> index 50f6f59..f9d8aac 100644
> --- a/gdb/configure.ac
> +++ b/gdb/configure.ac
> @@ -2199,29 +2199,22 @@ if test "${host}" != "${target}"; then
> fi
> AC_SUBST(target_subdir)
>
> -frags=
> +# Importing nat definitions.
s/Importing/Import/
> +NAT_EXTRA_FRAGS_FILE=/dev/null
> if test "${gdb_native}" = "yes"; then
> - host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh
> - if test ! -f ${host_makefile_frag}; then
> - AC_MSG_ERROR("*** Gdb does not support native target ${host}")
> - fi
> - frags="$frags $host_makefile_frag"
> -else
> - host_makefile_frag=/dev/null
> + . ${srcdir}/configure.nat
> + nativefile=$NAT_FILE
> fi
There's (at least) a related comment that would be good
to update:
# If nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link
# to an empty version.
as NAT_FILE now comes from configure.nat, not the .mh files.
> +# Variables defined here:
> +#
> +# NAT_FILE - The header file with definitions for this native target.
> +#
> +# NATDEPFILES - Source files required for native debugging on this
> +# native target.
> +#
> +# NAT_CDEPS - Dynamic symbols to be exported for libthread_db.
> +#
> +# LOADLIBES - Libraries against which GDB will be linked for this
> +# native target.
> +#
> +# MH_CFLAGS - Additional CFLAGS for this native target.
At least MH_CFLAGS above is host-specific, not related to the
native target. See for example:
# doublest.c currently assumes some properties of FP arithmetic
# on the host which require this.
MH_CFLAGS = -mieee
# When compiled with cc, for debugging, this argument should be passed.
# We have no idea who our current compiler is though, so we skip it.
# MH_CFLAGS = -bnodelcsect
These are clearly always needed to build gdb on this host,
independently of whether native target is being built. I.e.,
when gdb is being built as a cross debugger, with
--target=something-else-not-the-host. Hence the MH_ prefix.
Some of those variables are ripe for a rename / normalization,
but that's something that can always be done after, and will
actually be simpler with your patchset in.
Thanks,
Pedro Alves
Thanks for the review, Pedro.
I am assuming that the issues pointed here should be addressed before I
push the patch 2/2. I'm sending a v3 of the patch just to make sure
everything is addressed properly.
On Thursday, May 04 2017, Pedro Alves wrote:
> On 05/03/2017 04:49 AM, Sergio Durigan Junior wrote:
>
>> diff --git a/gdb/Makefile.in b/gdb/Makefile.in
>> index b865b7c..e26079a 100644
>> --- a/gdb/Makefile.in
>> +++ b/gdb/Makefile.in
>> @@ -903,7 +903,16 @@ ALL_TARGET_OBS = \
>> xtensa-tdep.o
>>
>> # Host-dependent makefile fragment comes in here.
>
> Stale comment. Should say something about the variables being
> defined in configure.nat.
Fixed.
>> -@host_makefile_frag@
>> +NAT_FILE = @NAT_FILE@
>> +NATDEPFILES = @NATDEPFILES@
>> +NAT_CDEPS = @NAT_CDEPS@
>> +LOADLIBES = @LOADLIBES@
>> +MH_CFLAGS = @MH_CFLAGS@
>> +XM_CLIBS = @XM_CLIBS@
>> +NAT_GENERATED_FILES = @NAT_GENERATED_FILES@
>> +HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@
>> +
>> +@NAT_EXTRA_FRAGS_FILE@
>
> And this last line here is where we source the
> fragment, so that comment above should move here
> with s/Host/Native-target/
Done.
> I think it should be "FRAG", singular.
> "makefile fragment file" is the term most often used.
OK.
> Also, I think "host_makefile_frag" was lowercase because
> that variable is not meant to be passed to make or any
> tool make invokes.
I was naming everything using uppercase because I thought it would be
more consistent. But since you asked, I renamed the variable
"nat_extra_makefile_frag".
>> # End of host-dependent makefile fragment
>
> Likewise, mind the comments.
Fixed.
>>
>
>> -# Copyright (C) 2013-2017 Free Software Foundation, Inc.
>> -#
>
>> diff --git a/gdb/config/i386/i386gnu.mh b/gdb/config/i386/i386gnu-extra.mh
>> similarity index 58%
>> rename from gdb/config/i386/i386gnu.mh
>> rename to gdb/config/i386/i386gnu-extra.mh
>
> Why the "extra" rename ? If anything, I'd expect i386gnu.mh -> i386gnu.mn?
git showed this as a rename, but it's really a new file. i386gnu.mh is
gone, like every other previous *.mh file. Instead of using the old
name, I decided to add the "-extra" suffix to make it explicit that the
file contains only extra definitions, and is not the only thing taken
into account for this native target.
I initially disagree with your proposal to rename it to i386gnu.mn, so
I'm keeping it this way. Please let me know if you really thing the
"-extra" suffix shouldn't be there, and I can remove it.
>> # Use our own user stubs for the msg rpcs, so we can make them time out, in
>> # case the program is fucked, or we guess the wrong signal thread.
>> -msg-MIGUFLAGS = -D'MSG_IMPORTS=waittime 1000;'
>> +msg-MIGUFLAGS=-D'MSG_IMPORTS=waittime 1000;'
>>
>> # ick
>> -MIGCOM = $(MIG) -cc cat - /dev/null
>> +MIGCOM=$(MIG) -cc cat - /dev/null
>
> Simon recently went through all variables making sure
> there's a space around the "=". This goes in the other
> direction.
You're right. I think this comes from an older version of the patch in
which I was trying to define these as shell variables on configure.nat.
Sorry about that, fixed in the new version.
>>
>> # Reply servers need special massaging of the code mig generates, to make
>> # them work correctly for error returns in some cases.
>> @@ -33,9 +21,4 @@ MIGCOM = $(MIG) -cc cat - /dev/null
>> | $(MIGCOM) -sheader /dev/null -server /dev/null -user $*_U.c -header $*_U.h
>>
>> # MIG stubs are not yet ready for C++ compilation.
>> -%_S.o %_U.o : COMPILE.post += -x c
>> -
>> -NAT_GENERATED_FILES = notify_S.h notify_S.c \
>> - process_reply_S.h process_reply_S.c \
>> - msg_reply_S.h msg_reply_S.c msg_U.h msg_U.c \
>> - exc_request_U.h exc_request_U.c exc_request_S.h exc_request_S.c
>> +%_S.o %_U.o : COMPILE.post +=-x c"
>
> Was that quote char (") at the end added on purpose?
> Looks like a typo.
It is a typo. Same explanation as above. Sorry. Fixed.
> Since most of the MIG related bits are left in the makefile
> fragment, I wonder whether it really makes sense to move
> the NAT_GENERATED_FILES setting far away from them.
Good point, I hadn't thought of that. I moved NAT_GENERATED_FILES to
i386gnu-extra.mh and removed it from configure.nat.
>> diff --git a/gdb/configure.ac b/gdb/configure.ac
>> index 50f6f59..f9d8aac 100644
>> --- a/gdb/configure.ac
>> +++ b/gdb/configure.ac
>> @@ -2199,29 +2199,22 @@ if test "${host}" != "${target}"; then
>> fi
>> AC_SUBST(target_subdir)
>>
>> -frags=
>> +# Importing nat definitions.
>
> s/Importing/Import/
Fixed.
>> +NAT_EXTRA_FRAGS_FILE=/dev/null
>> if test "${gdb_native}" = "yes"; then
>> - host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh
>> - if test ! -f ${host_makefile_frag}; then
>> - AC_MSG_ERROR("*** Gdb does not support native target ${host}")
>> - fi
>> - frags="$frags $host_makefile_frag"
>> -else
>> - host_makefile_frag=/dev/null
>> + . ${srcdir}/configure.nat
>> + nativefile=$NAT_FILE
>> fi
>
> There's (at least) a related comment that would be good
> to update:
>
> # If nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link
> # to an empty version.
>
> as NAT_FILE now comes from configure.nat, not the .mh files.
Updated.
>> +# Variables defined here:
>> +#
>> +# NAT_FILE - The header file with definitions for this native target.
>> +#
>> +# NATDEPFILES - Source files required for native debugging on this
>> +# native target.
>> +#
>> +# NAT_CDEPS - Dynamic symbols to be exported for libthread_db.
>> +#
>> +# LOADLIBES - Libraries against which GDB will be linked for this
>> +# native target.
>> +#
>> +# MH_CFLAGS - Additional CFLAGS for this native target.
>
> At least MH_CFLAGS above is host-specific, not related to the
> native target. See for example:
>
> # doublest.c currently assumes some properties of FP arithmetic
> # on the host which require this.
> MH_CFLAGS = -mieee
>
> # When compiled with cc, for debugging, this argument should be passed.
> # We have no idea who our current compiler is though, so we skip it.
> # MH_CFLAGS = -bnodelcsect
>
> These are clearly always needed to build gdb on this host,
> independently of whether native target is being built. I.e.,
> when gdb is being built as a cross debugger, with
> --target=something-else-not-the-host. Hence the MH_ prefix.
Hm, OK, thanks for the explanation. I updated the description to say
that the variable is host-specific.
> Some of those variables are ripe for a rename / normalization,
> but that's something that can always be done after, and will
> actually be simpler with your patchset in.
Absolutely.
Thanks,
On 05/05/2017 04:57 AM, Sergio Durigan Junior wrote:
>> Also, I think "host_makefile_frag" was lowercase because
>> that variable is not meant to be passed to make or any
>> tool make invokes.
>
> I was naming everything using uppercase because I thought it would be
> more consistent.
But it'd make it inconsistent with all the other lowercase variables
in Makefile.in that are acsubsted and not passed down to some child.
>>> diff --git a/gdb/config/i386/i386gnu.mh b/gdb/config/i386/i386gnu-extra.mh
>>> similarity index 58%
>>> rename from gdb/config/i386/i386gnu.mh
>>> rename to gdb/config/i386/i386gnu-extra.mh
>>
>> Why the "extra" rename ? If anything, I'd expect i386gnu.mh -> i386gnu.mn?
>
> git showed this as a rename, but it's really a new file.
That's kind of stretching it. :-)
> i386gnu.mh is
> gone, like every other previous *.mh file. Instead of using the old
> name, I decided to add the "-extra" suffix to make it explicit that the
> file contains only extra definitions, and is not the only thing taken
> into account for this native target.
I find the "extra" redundant -- the way I see it, some targets have a
makefile fragment file that needs to be glued into the Makefile,
others don't. There's no "main fragment, and then maybe some other/extra ones".
> I initially disagree with your proposal to rename it to i386gnu.mn, so
> I'm keeping it this way.
Why do you disagree? ".mh" obviously meant "makefile + host",
but the fragment file is now described as being about the
native target. Hence, "makefile + native => .mn".
I don't understand the rationale for renaming the file, saying it
is a native target fragment, but _still_ calling it ".mh".
So, I'd understand either not bothering to change the file name
at all, or if renaming it, then giving it a name that matches reality.
> Please let me know if you really thing the
> "-extra" suffix shouldn't be there, and I can remove it.
I really think the -extra suffix shouldn't be there.
Thanks,
Pedro Alves
On Friday, May 05 2017, Pedro Alves wrote:
>>>> diff --git a/gdb/config/i386/i386gnu.mh b/gdb/config/i386/i386gnu-extra.mh
>>>> similarity index 58%
>>>> rename from gdb/config/i386/i386gnu.mh
>>>> rename to gdb/config/i386/i386gnu-extra.mh
>>>
>>> Why the "extra" rename ? If anything, I'd expect i386gnu.mh -> i386gnu.mn?
>>
>> git showed this as a rename, but it's really a new file.
>
> That's kind of stretching it. :-)
Well, my intention from the beginning was to introduce this as a new
file. I'm not stretching it my intention :-).
>> i386gnu.mh is
>> gone, like every other previous *.mh file. Instead of using the old
>> name, I decided to add the "-extra" suffix to make it explicit that the
>> file contains only extra definitions, and is not the only thing taken
>> into account for this native target.
>
> I find the "extra" redundant -- the way I see it, some targets have a
> makefile fragment file that needs to be glued into the Makefile,
> others don't. There's no "main fragment, and then maybe some other/extra ones".
OK, I see your rationale now. In my previous understanding, the main
fragment was being generated from configure.nat, which is just a
copy-and-paste from the old *.mh files. But one could also argue that
there's not actual fragment there, since we just have variables being
AC_SUBST'ed.
>> I initially disagree with your proposal to rename it to i386gnu.mn, so
>> I'm keeping it this way.
>
> Why do you disagree? ".mh" obviously meant "makefile + host",
> but the fragment file is now described as being about the
> native target. Hence, "makefile + native => .mn".
Ahhh. You're not going to believe it, but until now I was not linking
the fact that ".mh" meant "makefile + host". I obviously agree that the
new extension should be .mn.
> I don't understand the rationale for renaming the file, saying it
> is a native target fragment, but _still_ calling it ".mh".
> So, I'd understand either not bothering to change the file name
> at all, or if renaming it, then giving it a name that matches reality.
>
>> Please let me know if you really thing the
>> "-extra" suffix shouldn't be there, and I can remove it.
>
> I really think the -extra suffix shouldn't be there.
Fair enough. Sorry about the confusion; I'll remove the -extra and
use .mn as the extension.
Thanks,
On 05/06/2017 03:04 PM, Sergio Durigan Junior wrote:
> On Friday, May 05 2017, Pedro Alves wrote:
>
>>>>> diff --git a/gdb/config/i386/i386gnu.mh b/gdb/config/i386/i386gnu-extra.mh
>>>>> similarity index 58%
>>>>> rename from gdb/config/i386/i386gnu.mh
>>>>> rename to gdb/config/i386/i386gnu-extra.mh
>>>>
>>>> Why the "extra" rename ? If anything, I'd expect i386gnu.mh -> i386gnu.mn?
>>>
>>> git showed this as a rename, but it's really a new file.
>>
>> That's kind of stretching it. :-)
>
> Well, my intention from the beginning was to introduce this as a new
> file. I'm not stretching it my intention :-).
>
>>> i386gnu.mh is
>>> gone, like every other previous *.mh file. Instead of using the old
>>> name, I decided to add the "-extra" suffix to make it explicit that the
>>> file contains only extra definitions, and is not the only thing taken
>>> into account for this native target.
>>
>> I find the "extra" redundant -- the way I see it, some targets have a
>> makefile fragment file that needs to be glued into the Makefile,
>> others don't. There's no "main fragment, and then maybe some other/extra ones".
>
> OK, I see your rationale now. In my previous understanding, the main
> fragment was being generated from configure.nat, which is just a
> copy-and-paste from the old *.mh files.
And I see yours now.
> But one could also argue that
> there's not actual fragment there, since we just have variables being
> AC_SUBST'ed.
Right, that's not what is usually called a fragment. Note that Makefile
"fragments" are a well known term in the GNU toolchain's build
machinery . See e.g., old GCC docs describing their fragment files:
https://gcc.gnu.org/onlinedocs/gcc-2.95.2/gcc_19.html
>
>>> I initially disagree with your proposal to rename it to i386gnu.mn, so
>>> I'm keeping it this way.
>>
>> Why do you disagree? ".mh" obviously meant "makefile + host",
>> but the fragment file is now described as being about the
>> native target. Hence, "makefile + native => .mn".
>
> Ahhh. You're not going to believe it, but until now I was not linking
> the fact that ".mh" meant "makefile + host". I obviously agree that the
> new extension should be .mn.
:-)
Note this is described in the internal's manual urls I pointed at
before:
https://sourceware.org/gdb/wiki/Internals%20Adding-a-New-Host
https://sourceware.org/gdb/wiki/Internals%20Native-Debugging
"Maintainer’s note: The .mh suffix is because this file originally contained Makefile fragments for hosting GDB on machine xyz. While the file is no longer used for this purpose, the .mh suffix remains. Perhaps someone will eventually rename these fragments so that they have a .mn suffix."
These pages are now in need of an update.
Thanks,
Pedro Alves
@@ -903,7 +903,16 @@ ALL_TARGET_OBS = \
xtensa-tdep.o
# Host-dependent makefile fragment comes in here.
-@host_makefile_frag@
+NAT_FILE = @NAT_FILE@
+NATDEPFILES = @NATDEPFILES@
+NAT_CDEPS = @NAT_CDEPS@
+LOADLIBES = @LOADLIBES@
+MH_CFLAGS = @MH_CFLAGS@
+XM_CLIBS = @XM_CLIBS@
+NAT_GENERATED_FILES = @NAT_GENERATED_FILES@
+HAVE_NATIVE_GCORE_HOST = @HAVE_NATIVE_GCORE_HOST@
+
+@NAT_EXTRA_FRAGS_FILE@
# End of host-dependent makefile fragment
FLAGS_TO_PASS = \
@@ -2315,21 +2324,21 @@ subdir_do: force
else true ; fi ; \
done
-Makefile: Makefile.in config.status @frags@
+Makefile: Makefile.in config.status
# Regenerate the Makefile and the tm.h / nm.h links.
CONFIG_FILES="Makefile" \
CONFIG_COMMANDS= \
CONFIG_HEADERS= \
$(SHELL) config.status
-$(GNULIB_BUILDDIR)/Makefile: gnulib/Makefile.in config.status @frags@
+$(GNULIB_BUILDDIR)/Makefile: gnulib/Makefile.in config.status
@cd $(GNULIB_BUILDDIR); CONFIG_FILES="Makefile" \
CONFIG_COMMANDS="depfiles" \
CONFIG_HEADERS= \
CONFIG_LINKS= \
$(SHELL) config.status
-data-directory/Makefile: data-directory/Makefile.in config.status @frags@
+data-directory/Makefile: data-directory/Makefile.in config.status
CONFIG_FILES="data-directory/Makefile" \
CONFIG_COMMANDS="depfiles" \
CONFIG_HEADERS= \
deleted file mode 100644
@@ -1,29 +0,0 @@
-# Host: AArch64 based machine running GNU/Linux
-#
-# Copyright (C) 2013-2017 Free Software Foundation, Inc.
-# Contributed by ARM Ltd.
-#
-# This file is part of GDB.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o aarch64-linux-nat.o aarch32-linux-nat.o \
- proc-service.o linux-thread-db.o linux-nat.o linux-fork.o \
- linux-procfs.o linux-ptrace.o linux-osdata.o linux-waitpid.o \
- linux-personality.o linux-namespaces.o aarch64-linux-hw-point.o \
- aarch64-linux.o
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-LOADLIBES= -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,15 +0,0 @@
-# Host: Little-endian Alpha running Linux
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o alpha-linux-nat.o \
- fork-child.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
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-# The dynamically loaded libthread_db needs access to symbols in the
-# gdb executable.
-LOADLIBES = -ldl $(RDYNAMIC)
-
-# doublest.c currently assumes some properties of FP arithmetic
-# on the host which require this.
-MH_CFLAGS = -mieee
deleted file mode 100644
@@ -1,4 +0,0 @@
-# Host: NetBSD/alpha
-NATDEPFILES= fork-child.o inf-ptrace.o alpha-bsd-nat.o bsd-kvm.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,10 +0,0 @@
-# Host: ARM based machine running GNU/Linux
-
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o arm-linux-nat.o \
- aarch32-linux-nat.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
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-LOADLIBES= -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,2 +0,0 @@
-# Host: NetBSD/arm
-NATDEPFILES= fork-child.o inf-ptrace.o arm-nbsd-nat.o
deleted file mode 100644
@@ -1,3 +0,0 @@
-MH_CFLAGS=
-NATDEPFILES= x86-nat.o x86-dregs.o windows-nat.o i386-windows-nat.o
-XM_CLIBS=
deleted file mode 100644
@@ -1,20 +0,0 @@
-# Native config information for GDB on PowerPC systems running FreeBSD.
-#
-# Copyright (C) 2013-2017 Free Software Foundation, Inc.
-#
-# This file is part of GDB.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-NATDEPFILES= x86-nat.o x86-dregs.o windows-nat.o amd64-windows-nat.o
deleted file mode 100644
@@ -1,4 +0,0 @@
-# Host: IA86 running Darwin
-
-NATDEPFILES = fork-child.o darwin-nat.o \
- i386-darwin-nat.o x86-nat.o x86-dregs.o amd64-nat.o darwin-nat-info.o
deleted file mode 100644
@@ -1,8 +0,0 @@
-# Host: FreeBSD/i386
-NATDEPFILES= fork-child.o inf-ptrace.o \
- fbsd-nat.o x86-nat.o x86-dregs.o x86-bsd-nat.o i386-bsd-nat.o \
- i386-fbsd-nat.o bsd-kvm.o
-NAT_FILE= nm-fbsd.h
-HAVE_NATIVE_GCORE_HOST = 1
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,7 +0,0 @@
-# Host: FreeBSD/amd64
-NATDEPFILES= fork-child.o inf-ptrace.o \
- fbsd-nat.o amd64-nat.o amd64-bsd-nat.o amd64-fbsd-nat.o \
- bsd-kvm.o x86-nat.o x86-dregs.o x86-bsd-nat.o
-HAVE_NATIVE_GCORE_HOST = 1
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,11 +0,0 @@
-# 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
-
-HOST_IPC=
-XM_CLIBS= -ldbg
-
-
similarity index 58%
rename from gdb/config/i386/i386gnu.mh
rename to gdb/config/i386/i386gnu-extra.mh
@@ -1,21 +1,9 @@
-# Host: Intel 386 running the GNU Hurd
-NATDEPFILES= i386-gnu-nat.o gnu-nat.o \
- x86-nat.o 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
-
-NAT_FILE= nm-i386gnu.h
-MH_CFLAGS = -D_GNU_SOURCE
-
-XM_CLIBS = -lshouldbeinlibc
-
# Use our own user stubs for the msg rpcs, so we can make them time out, in
# case the program is fucked, or we guess the wrong signal thread.
-msg-MIGUFLAGS = -D'MSG_IMPORTS=waittime 1000;'
+msg-MIGUFLAGS=-D'MSG_IMPORTS=waittime 1000;'
# ick
-MIGCOM = $(MIG) -cc cat - /dev/null
+MIGCOM=$(MIG) -cc cat - /dev/null
# Reply servers need special massaging of the code mig generates, to make
# them work correctly for error returns in some cases.
@@ -33,9 +21,4 @@ MIGCOM = $(MIG) -cc cat - /dev/null
| $(MIGCOM) -sheader /dev/null -server /dev/null -user $*_U.c -header $*_U.h
# MIG stubs are not yet ready for C++ compilation.
-%_S.o %_U.o : COMPILE.post += -x c
-
-NAT_GENERATED_FILES = notify_S.h notify_S.c \
- process_reply_S.h process_reply_S.c \
- msg_reply_S.h msg_reply_S.c msg_U.h msg_U.c \
- exc_request_U.h exc_request_U.c exc_request_S.h exc_request_S.c
+%_S.o %_U.o : COMPILE.post +=-x c"
deleted file mode 100644
@@ -1,4 +0,0 @@
-# Host: Solaris x86
-NATDEPFILES= fork-child.o i386-v4-nat.o i386-sol2-nat.o \
- procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o
-HAVE_NATIVE_GCORE_HOST = 1
deleted file mode 100644
@@ -1,14 +0,0 @@
-# Host: Intel 386 running GNU/Linux.
-
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o \
- x86-nat.o x86-dregs.o i386-linux-nat.o x86-linux-nat.o \
- proc-service.o linux-thread-db.o \
- linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
- linux-btrace.o linux-waitpid.o linux-personality.o x86-linux.o \
- x86-linux-dregs.o linux-namespaces.o
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-# The dynamically loaded libthread_db needs access to symbols in the
-# gdb executable.
-LOADLIBES = -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,15 +0,0 @@
-# Host: GNU/Linux x86-64
-NATDEPFILES= inf-ptrace.o fork-child.o \
- x86-nat.o x86-dregs.o amd64-nat.o amd64-linux-nat.o \
- x86-linux-nat.o \
- linux-nat.o linux-osdata.o \
- proc-service.o linux-thread-db.o linux-fork.o \
- linux-procfs.o linux-ptrace.o linux-btrace.o \
- linux-waitpid.o linux-personality.o x86-linux.o \
- x86-linux-dregs.o amd64-linux-siginfo.o linux-namespaces.o
-NAT_FILE= config/nm-linux.h
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-# The dynamically loaded libthread_db needs access to symbols in the
-# gdb executable.
-LOADLIBES = -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,3 +0,0 @@
-MH_CFLAGS=
-NATDEPFILES= x86-nat.o x86-dregs.o windows-nat.o i386-windows-nat.o
-XM_CLIBS=
deleted file mode 100644
@@ -1 +0,0 @@
-NATDEPFILES= x86-nat.o x86-dregs.o windows-nat.o amd64-windows-nat.o
deleted file mode 100644
@@ -1,3 +0,0 @@
-# Host: NetBSD/amd64
-NATDEPFILES= fork-child.o inf-ptrace.o \
- nbsd-nat.o amd64-nat.o x86-bsd-nat.o amd64-bsd-nat.o amd64-nbsd-nat.o
deleted file mode 100644
@@ -1,5 +0,0 @@
-# Host: NetBSD/i386 ELF
-NATDEPFILES= fork-child.o inf-ptrace.o \
- nbsd-nat.o x86-bsd-nat.o i386-bsd-nat.o i386-nbsd-nat.o bsd-kvm.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,4 +0,0 @@
-# Host: Intel 386 running QNX.
-
-NATDEPFILES= nto-procfs.o
-NAT_FILE= config/nm-nto.h
deleted file mode 100644
@@ -1,5 +0,0 @@
-# Host: OpenBSD/i386 ELF
-NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o \
- x86-bsd-nat.o i386-bsd-nat.o i386-obsd-nat.o bsd-kvm.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,5 +0,0 @@
-# Host: OpenBSD/amd64
-NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o \
- amd64-nat.o x86-bsd-nat.o amd64-bsd-nat.o amd64-obsd-nat.o bsd-kvm.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,4 +0,0 @@
-# Host: Solaris x86_64
-NATDEPFILES= fork-child.o amd64-nat.o i386-v4-nat.o i386-sol2-nat.o \
- procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o
-HAVE_NATIVE_GCORE_HOST = 1
deleted file mode 100644
@@ -1,13 +0,0 @@
-# Host: Intel IA-64 running GNU/Linux
-
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o \
- ia64-linux-nat.o \
- proc-service.o linux-thread-db.o \
- linux-nat.o linux-osdata.o linux-fork.o \
- linux-personality.o \
- linux-procfs.o linux-ptrace.o linux-waitpid.o \
- linux-namespaces.o
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-LOADLIBES = -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,10 +0,0 @@
-# Host: M32R based machine running GNU/Linux
-
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o \
- m32r-linux-nat.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
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-LOADLIBES= -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,14 +0,0 @@
-# Host: Motorola m68k running GNU/Linux.
-
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o \
- m68k-linux-nat.o \
- proc-service.o linux-thread-db.o \
- linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
- linux-personality.o \
- linux-waitpid.o linux-namespaces.o
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-# The dynamically loaded libthread_db needs access to symbols in the
-# gdb executable.
-LOADLIBES = -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,4 +0,0 @@
-# Host: NetBSD/m68k ELF
-NATDEPFILES= m68k-bsd-nat.o bsd-kvm.o fork-child.o inf-ptrace.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,4 +0,0 @@
-# Host: OpenBSD/m68k
-NATDEPFILES= m68k-bsd-nat.o bsd-kvm.o fork-child.o inf-ptrace.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,2 +0,0 @@
-# Host: OpenBSD/m88k
-NATDEPFILES= fork-child.o inf-ptrace.o m88k-bsd-nat.o
deleted file mode 100644
@@ -1,3 +0,0 @@
-# Host: FreeBSD/mips
-NATDEPFILES= fork-child.o inf-ptrace.o fbsd-nat.o mips-fbsd-nat.o
-HAVE_NATIVE_GCORE_HOST = 1
deleted file mode 100644
@@ -1,11 +0,0 @@
-# Host: Linux/MIPS
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o mips-linux-nat.o \
- linux-thread-db.o proc-service.o \
- linux-nat.o linux-osdata.o linux-fork.o \
- linux-procfs.o linux-ptrace.o linux-waitpid.o \
- linux-personality.o \
- mips-linux-watch.o linux-namespaces.o
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-LOADLIBES = -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,2 +0,0 @@
-# Host: NetBSD/mips
-NATDEPFILES= fork-child.o inf-ptrace.o mips-nbsd-nat.o
deleted file mode 100644
@@ -1,2 +0,0 @@
-# Host: OpenBSD/mips64
-NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o mips64-obsd-nat.o
deleted file mode 100644
@@ -1,10 +0,0 @@
-# Host: Hewlett-Packard PA-RISC machine, running Linux
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o \
- hppa-linux-nat.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
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-LOADLIBES = -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,2 +0,0 @@
-# Host: NetBSD/hppa
-NATDEPFILES= fork-child.o inf-ptrace.o nbsd-nat.o hppa-nbsd-nat.o
deleted file mode 100644
@@ -1,2 +0,0 @@
-# Host: OpenBSD/hppa
-NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o hppa-obsd-nat.o
deleted file mode 100644
@@ -1,8 +0,0 @@
-# Host: IBM PowerPC running AIX
-
-# aix-thread.o is not listed in NATDEPFILES as it is pulled in by configure.
-NATDEPFILES= fork-child.o inf-ptrace.o rs6000-nat.o
-
-# When compiled with cc, for debugging, this argument should be passed.
-# We have no idea who our current compiler is though, so we skip it.
-# MH_CFLAGS = -bnodelcsect
deleted file mode 100644
@@ -1,24 +0,0 @@
-# Native config information for GDB on PowerPC systems running FreeBSD.
-#
-# Copyright (C) 2013-2017 Free Software Foundation, Inc.
-#
-# This file is part of GDB.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-NATDEPFILES= fbsd-nat.o fork-child.o inf-ptrace.o ppc-fbsd-nat.o bsd-kvm.o
-HAVE_NATIVE_GCORE_HOST = 1
-
-LOADLIBES= -lkvm
-
deleted file mode 100644
@@ -1,12 +0,0 @@
-# Host: PowerPC, running Linux
-
-XM_CLIBS=
-
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o \
- ppc-linux-nat.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
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-LOADLIBES = -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,4 +0,0 @@
-# Host: NetBSD/powerpc
-NATDEPFILES= fork-child.o inf-ptrace.o ppc-nbsd-nat.o bsd-kvm.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,4 +0,0 @@
-# Host: OpenBSD/powerpc
-NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o ppc-obsd-nat.o bsd-kvm.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,15 +0,0 @@
-# Host: PowerPC64, running Linux
-
-XM_CLIBS=
-
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o \
- ppc-linux-nat.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 ppc-linux.o linux-personality.o \
- linux-namespaces.o
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-# The dynamically loaded libthread_db needs access to symbols in the
-# gdb executable.
-LOADLIBES= -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,8 +0,0 @@
-# Target: Cell BE (PowerPC64 + SPU)
-
-# This implements a 'pseudo-native' GDB running on the
-# PPU side of the Cell BE and debugging the SPU side.
-
-NATDEPFILES = spu-linux-nat.o fork-child.o inf-ptrace.o \
- linux-procfs.o linux-ptrace.o linux-waitpid.o \
- linux-personality.o linux-namespaces.o
deleted file mode 100644
@@ -1,9 +0,0 @@
-# Host: S390, running Linux
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o s390-linux-nat.o \
- linux-thread-db.o proc-service.o \
- linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
- linux-personality.o \
- linux-waitpid.o linux-namespaces.o
-NAT_CDEPS = $(srcdir)/proc-service.list
-LOADLIBES = -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,2 +0,0 @@
-# Host: NetBSD/sh
-NATDEPFILES= fork-child.o inf-ptrace.o sh-nbsd-nat.o
deleted file mode 100644
@@ -1,7 +0,0 @@
-# Host: FreeBSD/sparc64
-NATDEPFILES= fork-child.o inf-ptrace.o \
- fbsd-nat.o sparc-nat.o sparc64-nat.o sparc64-fbsd-nat.o \
- bsd-kvm.o
-HAVE_NATIVE_GCORE_HOST = 1
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,13 +0,0 @@
-# Host: GNU/Linux SPARC
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= sparc-nat.o sparc-linux-nat.o \
- fork-child.o inf-ptrace.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
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-# The dynamically loaded libthread_db needs access to symbols in the
-# gdb executable.
-LOADLIBES = -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,13 +0,0 @@
-# Host: GNU/Linux UltraSPARC
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= sparc-nat.o sparc64-nat.o sparc64-linux-nat.o \
- fork-child.o inf-ptrace.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
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-# The dynamically loaded libthread_db needs access to symbols in the
-# gdb executable.
-LOADLIBES = -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,5 +0,0 @@
-# Host: NetBSD/sparc64
-NATDEPFILES= fork-child.o inf-ptrace.o \
- sparc64-nbsd-nat.o sparc-nat.o bsd-kvm.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,5 +0,0 @@
-# Host: NetBSD/sparc ELF
-NATDEPFILES= fork-child.o inf-ptrace.o \
- sparc-nat.o sparc-nbsd-nat.o bsd-kvm.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,5 +0,0 @@
-# Host: OpenBSD/sparc64
-NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o \
- sparc64-obsd-nat.o sparc-nat.o bsd-kvm.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,6 +0,0 @@
-# Host: Solaris SPARC & UltraSPARC
-NAT_FILE= nm-sol2.h
-NATDEPFILES= sparc-sol2-nat.o \
- fork-child.o \
- procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o
-HAVE_NATIVE_GCORE_HOST = 1
deleted file mode 100644
@@ -1,13 +0,0 @@
-# Host: Tilera TILE-Gx running GNU/Linux.
-
-NAT_FILE= config/nm-linux.h
-NATDEPFILES= inf-ptrace.o fork-child.o \
- tilegx-linux-nat.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
-
-# The dynamically loaded libthread_db needs access to symbols in the
-# gdb executable.
-LOADLIBES = -ldl $(RDYNAMIC)
deleted file mode 100644
@@ -1,5 +0,0 @@
-# Host: NetBSD/vax ELF
-NATDEPFILES= fork-child.o inf-ptrace.o \
- vax-bsd-nat.o bsd-kvm.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,5 +0,0 @@
-# Host: OpenBSD/vax
-NATDEPFILES= fork-child.o inf-ptrace.o \
- vax-bsd-nat.o bsd-kvm.o
-
-LOADLIBES= -lkvm
deleted file mode 100644
@@ -1,11 +0,0 @@
-# Host: Xtensa, running GNU/Linux.
-
-NAT_FILE= config/nm-linux.h
-
-NATDEPFILES= inf-ptrace.o fork-child.o xtensa-linux-nat.o \
- linux-thread-db.o proc-service.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
-NAT_CDEPS = $(srcdir)/proc-service.list
-
-LOADLIBES = -ldl $(RDYNAMIC)
@@ -598,7 +598,13 @@ GDB_NM_FILE
LTLIBBABELTRACE
LIBBABELTRACE
HAVE_LIBBABELTRACE
-frags
+NAT_GENERATED_FILES
+XM_CLIBS
+MH_CFLAGS
+LOADLIBES
+NAT_CDEPS
+NATDEPFILES
+NAT_FILE
target_subdir
CONFIG_UNINSTALL
CONFIG_INSTALL
@@ -799,7 +805,7 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL'
-ac_subst_files='host_makefile_frag'
+ac_subst_files='NAT_EXTRA_FRAGS_FILE'
ac_user_opts='
enable_option_checking
enable_maintainer_mode
@@ -16724,27 +16730,21 @@ if test "${host}" != "${target}"; then
fi
-frags=
+# Importing nat definitions.
+NAT_EXTRA_FRAGS_FILE=/dev/null
if test "${gdb_native}" = "yes"; then
- host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh
- if test ! -f ${host_makefile_frag}; then
- as_fn_error "\"*** Gdb does not support native target ${host}\"" "$LINENO" 5
- fi
- frags="$frags $host_makefile_frag"
-else
- host_makefile_frag=/dev/null
+ . ${srcdir}/configure.nat
+ nativefile=$NAT_FILE
fi
-if test "${gdb_native}" = "yes"; then
-# We pick this up from the host configuration file (.mh) because we
-# do not have a native configuration Makefile fragment.
-nativefile=`sed -n '
-s/NAT_FILE[ ]*=[ ]*\([^ ]*\)/\1/p
-' ${host_makefile_frag}`
-fi
+
+
+
+
+
if test x"${gdb_osabi}" != x ; then
@@ -2199,29 +2199,22 @@ if test "${host}" != "${target}"; then
fi
AC_SUBST(target_subdir)
-frags=
+# Importing nat definitions.
+NAT_EXTRA_FRAGS_FILE=/dev/null
if test "${gdb_native}" = "yes"; then
- host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh
- if test ! -f ${host_makefile_frag}; then
- AC_MSG_ERROR("*** Gdb does not support native target ${host}")
- fi
- frags="$frags $host_makefile_frag"
-else
- host_makefile_frag=/dev/null
+ . ${srcdir}/configure.nat
+ nativefile=$NAT_FILE
fi
-AC_SUBST_FILE(host_makefile_frag)
-AC_SUBST(frags)
-
-changequote(,)dnl
-if test "${gdb_native}" = "yes"; then
-# We pick this up from the host configuration file (.mh) because we
-# do not have a native configuration Makefile fragment.
-nativefile=`sed -n '
-s/NAT_FILE[ ]*=[ ]*\([^ ]*\)/\1/p
-' ${host_makefile_frag}`
-fi
-changequote([,])
+AC_SUBST(NAT_FILE)
+AC_SUBST(NATDEPFILES)
+AC_SUBST(NAT_CDEPS)
+AC_SUBST(LOADLIBES)
+AC_SUBST(MH_CFLAGS)
+AC_SUBST(XM_CLIBS)
+AC_SUBST(NAT_GENERATED_FILES)
+AC_SUBST(HAVE_NATIVE_GCORE_TARGET)
+AC_SUBST_FILE(NAT_EXTRA_FRAGS_FILE)
if test x"${gdb_osabi}" != x ; then
AC_DEFINE_UNQUOTED(GDB_OSABI_DEFAULT, $gdb_osabi,
new file mode 100644
@@ -0,0 +1,608 @@
+# ; -*- mode: sh ; -*-
+# Copyright (C) 2013-2017 Free Software Foundation, Inc.
+#
+# This file is part of GDB.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Variables defined here:
+#
+# NAT_FILE - The header file with definitions for this native target.
+#
+# NATDEPFILES - Source files required for native debugging on this
+# native target.
+#
+# NAT_CDEPS - Dynamic symbols to be exported for libthread_db.
+#
+# LOADLIBES - Libraries against which GDB will be linked for this
+# native target.
+#
+# MH_CFLAGS - Additional CFLAGS for this native target.
+#
+# XM_CLIBS - Host-dependent libraries against which GDB will be linked
+# for this native target.
+#
+# NAT_GENERATED_FILES - Generated files for this native target.
+#
+# HAVE_NATIVE_GCORE_HOST - Whether gcore should be installed on this
+# native target.
+#
+# NAT_EXTRA_FRAGS_FILE - File containing extra fragments of Makefile
+# that will be used by this native target.
+#
+# Notes:
+#
+# - To avoid shell expansion of variables, declare them with single
+# quotes.
+#
+# - NAT_EXTRA_FRAGS_FILE should contain the full path of the file.
+
+
+case ${gdb_host_cpu} in
+ aarch64)
+ case ${gdb_host} in
+ linux)
+ # Host: AArch64 based machine running GNU/Linux
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o aarch64-linux-nat.o aarch32-linux-nat.o \
+ proc-service.o linux-thread-db.o linux-nat.o linux-fork.o \
+ linux-procfs.o linux-ptrace.o linux-osdata.o linux-waitpid.o \
+ linux-personality.o linux-namespaces.o aarch64-linux-hw-point.o \
+ aarch64-linux.o'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ esac
+ ;;
+ alpha)
+ case ${gdb_host} in
+ alpha-linux)
+ # Host: Little-endian Alpha running Linux
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o alpha-linux-nat.o \
+ fork-child.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'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ # The dynamically loaded libthread_db needs access to symbols in the
+ # gdb executable.
+ LOADLIBES='-ldl $(RDYNAMIC)'
+
+ # doublest.c currently assumes some properties of FP arithmetic
+ # on the host which require this.
+ MH_CFLAGS='-mieee'
+ ;;
+ nbsd)
+ # Host: NetBSD/alpha
+ NATDEPFILES='fork-child.o inf-ptrace.o alpha-bsd-nat.o bsd-kvm.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ esac
+ ;;
+ arm)
+ case ${gdb_host} in
+ linux)
+ # Host: ARM based machine running GNU/Linux
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o arm-linux-nat.o \
+ aarch32-linux-nat.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'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ nbsdelf)
+ # Host: NetBSD/arm
+ NATDEPFILES='fork-child.o inf-ptrace.o arm-nbsd-nat.o'
+ ;;
+ esac
+ ;;
+ i386)
+ case ${gdb_host} in
+ cygwin64)
+ # Native config information for GDB on PowerPC systems running FreeBSD.
+ NATDEPFILES='x86-nat.o x86-dregs.o windows-nat.o amd64-windows-nat.o'
+ ;;
+ cygwin)
+ MH_CFLAGS=
+ NATDEPFILES='x86-nat.o x86-dregs.o windows-nat.o i386-windows-nat.o'
+ XM_CLIBS=
+ ;;
+ darwin)
+ # Host: IA86 running Darwin
+ NATDEPFILES='fork-child.o darwin-nat.o \
+ i386-darwin-nat.o x86-nat.o x86-dregs.o amd64-nat.o darwin-nat-info.o'
+ ;;
+ fbsd64)
+ # Host: FreeBSD/amd64
+ NATDEPFILES='fork-child.o inf-ptrace.o \
+ fbsd-nat.o amd64-nat.o amd64-bsd-nat.o amd64-fbsd-nat.o \
+ bsd-kvm.o x86-nat.o x86-dregs.o x86-bsd-nat.o'
+ HAVE_NATIVE_GCORE_HOST=1
+
+ LOADLIBES='-lkvm'
+ ;;
+ fbsd)
+ # Host: FreeBSD/i386
+ NATDEPFILES='fork-child.o inf-ptrace.o \
+ fbsd-nat.o x86-nat.o x86-dregs.o x86-bsd-nat.o i386-bsd-nat.o \
+ i386-fbsd-nat.o bsd-kvm.o'
+ NAT_FILE='nm-fbsd.h'
+ HAVE_NATIVE_GCORE_HOST=1
+
+ LOADLIBES='-lkvm'
+ ;;
+ go32)
+ # 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'
+
+ XM_CLIBS='-ldbg'
+ ;;
+ i386gnu)
+ # Host: Intel 386 running the GNU Hurd
+ NATDEPFILES='i386-gnu-nat.o gnu-nat.o \
+ x86-nat.o 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
+
+ NAT_FILE='nm-i386gnu.h'
+ MH_CFLAGS='-D_GNU_SOURCE'
+
+ XM_CLIBS='-lshouldbeinlibc'
+
+ NAT_EXTRA_FRAGS_FILE="${srcdir}/config/${gdb_host_cpu}/i386gnu-extra.mh"
+
+ NAT_GENERATED_FILES='notify_S.h notify_S.c \
+ process_reply_S.h process_reply_S.c \
+ msg_reply_S.h msg_reply_S.c msg_U.h msg_U.c \
+ exc_request_U.h exc_request_U.c exc_request_S.h exc_request_S.c'
+ ;;
+ i386sol2)
+ # Host: Solaris x86
+ NATDEPFILES='fork-child.o i386-v4-nat.o i386-sol2-nat.o \
+ procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o'
+ HAVE_NATIVE_GCORE_HOST=1
+ ;;
+ linux64)
+ # Host: GNU/Linux x86-64
+ NATDEPFILES='inf-ptrace.o fork-child.o \
+ x86-nat.o x86-dregs.o amd64-nat.o amd64-linux-nat.o \
+ x86-linux-nat.o \
+ linux-nat.o linux-osdata.o \
+ proc-service.o linux-thread-db.o linux-fork.o \
+ linux-procfs.o linux-ptrace.o linux-btrace.o \
+ linux-waitpid.o linux-personality.o x86-linux.o \
+ x86-linux-dregs.o amd64-linux-siginfo.o linux-namespaces.o'
+ NAT_FILE='config/nm-linux.h'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ # The dynamically loaded libthread_db needs access to symbols in the
+ # gdb executable.
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ linux)
+ # Host: Intel 386 running GNU/Linux.
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o \
+ x86-nat.o x86-dregs.o i386-linux-nat.o x86-linux-nat.o \
+ proc-service.o linux-thread-db.o \
+ linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
+ linux-btrace.o linux-waitpid.o linux-personality.o x86-linux.o \
+ x86-linux-dregs.o linux-namespaces.o'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ # The dynamically loaded libthread_db needs access to symbols in the
+ # gdb executable.
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ mingw64)
+ NATDEPFILES='x86-nat.o x86-dregs.o windows-nat.o amd64-windows-nat.o'
+ ;;
+ mingw)
+ MH_CFLAGS=
+ NATDEPFILES='x86-nat.o x86-dregs.o windows-nat.o i386-windows-nat.o'
+ XM_CLIBS=
+ ;;
+ nbsd64)
+ # Host: NetBSD/amd64
+ NATDEPFILES='fork-child.o inf-ptrace.o \
+ nbsd-nat.o amd64-nat.o x86-bsd-nat.o amd64-bsd-nat.o amd64-nbsd-nat.o'
+ ;;
+ nbsdelf)
+ # Host: NetBSD/i386 ELF
+ NATDEPFILES='fork-child.o inf-ptrace.o \
+ nbsd-nat.o x86-bsd-nat.o i386-bsd-nat.o i386-nbsd-nat.o bsd-kvm.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ nto)
+ # Host: Intel 386 running QNX.
+ NATDEPFILES='nto-procfs.o'
+ NAT_FILE='config/nm-nto.h'
+ ;;
+ obsd64)
+ # Host: OpenBSD/amd64
+ NATDEPFILES='fork-child.o inf-ptrace.o obsd-nat.o \
+ amd64-nat.o x86-bsd-nat.o amd64-bsd-nat.o amd64-obsd-nat.o bsd-kvm.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ obsd)
+ # Host: OpenBSD/i386 ELF
+ NATDEPFILES='fork-child.o inf-ptrace.o obsd-nat.o \
+ x86-bsd-nat.o i386-bsd-nat.o i386-obsd-nat.o bsd-kvm.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ sol2-64)
+ # Host: Solaris x86_64
+ NATDEPFILES='fork-child.o amd64-nat.o i386-v4-nat.o i386-sol2-nat.o \
+ procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o'
+ HAVE_NATIVE_GCORE_HOST=1
+ ;;
+ esac
+ ;;
+ ia64)
+ case ${gdb_host} in
+ linux)
+ # Host: Intel IA-64 running GNU/Linux
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o \
+ ia64-linux-nat.o \
+ proc-service.o linux-thread-db.o \
+ linux-nat.o linux-osdata.o linux-fork.o \
+ linux-personality.o \
+ linux-procfs.o linux-ptrace.o linux-waitpid.o \
+ linux-namespaces.o'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ esac
+ ;;
+ m32r)
+ case ${gdb_host} in
+ linux)
+ # Host: M32R based machine running GNU/Linux
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o \
+ m32r-linux-nat.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'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ esac
+ ;;
+ m68k)
+ case ${gdb_host} in
+ linux)
+ # Host: Motorola m68k running GNU/Linux.
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o \
+ m68k-linux-nat.o \
+ proc-service.o linux-thread-db.o \
+ linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
+ linux-personality.o \
+ linux-waitpid.o linux-namespaces.o'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ # The dynamically loaded libthread_db needs access to symbols in the
+ # gdb executable.
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ nbsdelf)
+ # Host: NetBSD/m68k ELF
+ NATDEPFILES='m68k-bsd-nat.o bsd-kvm.o fork-child.o inf-ptrace.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ obsd)
+ # Host: OpenBSD/m68k
+ NATDEPFILES='m68k-bsd-nat.o bsd-kvm.o fork-child.o inf-ptrace.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ esac
+ ;;
+ m88k)
+ case ${gdb_host} in
+ obsd)
+ # Host: OpenBSD/m88k
+ NATDEPFILES='fork-child.o inf-ptrace.o m88k-bsd-nat.o'
+ ;;
+ esac
+ ;;
+ mips)
+ case ${gdb_host} in
+ fbsd)
+ # Host: FreeBSD/mips
+ NATDEPFILES='fork-child.o inf-ptrace.o fbsd-nat.o mips-fbsd-nat.o'
+ HAVE_NATIVE_GCORE_HOST=1
+ ;;
+ linux)
+ # Host: Linux/MIPS
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o mips-linux-nat.o \
+ linux-thread-db.o proc-service.o \
+ linux-nat.o linux-osdata.o linux-fork.o \
+ linux-procfs.o linux-ptrace.o linux-waitpid.o \
+ linux-personality.o \
+ mips-linux-watch.o linux-namespaces.o'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ nbsd)
+ # Host: NetBSD/mips
+ NATDEPFILES='fork-child.o inf-ptrace.o mips-nbsd-nat.o'
+ ;;
+ obsd64)
+ # Host: OpenBSD/mips64
+ NATDEPFILES='fork-child.o inf-ptrace.o obsd-nat.o mips64-obsd-nat.o'
+ ;;
+ esac
+ ;;
+ pa)
+ case ${gdb_host} in
+ linux)
+ # Host: Hewlett-Packard PA-RISC machine, running Linux
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o \
+ hppa-linux-nat.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'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ nbsd)
+ # Host: NetBSD/hppa
+ NATDEPFILES='fork-child.o inf-ptrace.o nbsd-nat.o hppa-nbsd-nat.o'
+ ;;
+ obsd)
+ # Host: OpenBSD/hppa
+ NATDEPFILES='fork-child.o inf-ptrace.o obsd-nat.o hppa-obsd-nat.o'
+ ;;
+ esac
+ ;;
+ powerpc)
+ case ${gdb_host} in
+ aix)
+ # Host: IBM PowerPC running AIX
+ # aix-thread.o is not listed in NATDEPFILES as it is pulled in by configure.
+ NATDEPFILES='fork-child.o inf-ptrace.o rs6000-nat.o'
+
+ # When compiled with cc, for debugging, this argument should be passed.
+ # We have no idea who our current compiler is though, so we skip it.
+ # MH_CFLAGS='-bnodelcsect'
+ ;;
+ fbsd)
+ # Native config information for GDB on PowerPC systems running FreeBSD.
+ NATDEPFILES='fbsd-nat.o fork-child.o inf-ptrace.o ppc-fbsd-nat.o bsd-kvm.o'
+ HAVE_NATIVE_GCORE_HOST=1
+
+ LOADLIBES='-lkvm'
+ ;;
+ linux)
+ # Host: PowerPC, running Linux
+ XM_CLIBS=
+
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o \
+ ppc-linux-nat.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'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ nbsd)
+ # Host: NetBSD/powerpc
+ NATDEPFILES='fork-child.o inf-ptrace.o ppc-nbsd-nat.o bsd-kvm.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ obsd)
+ # Host: OpenBSD/powerpc
+ NATDEPFILES='fork-child.o inf-ptrace.o obsd-nat.o ppc-obsd-nat.o bsd-kvm.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ ppc64-linux)
+ # Host: PowerPC64, running Linux
+ XM_CLIBS=
+
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o \
+ ppc-linux-nat.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 ppc-linux.o linux-personality.o \
+ linux-namespaces.o'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ # The dynamically loaded libthread_db needs access to symbols in the
+ # gdb executable.
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ spu-linux)
+ # Target: Cell BE (PowerPC64 + SPU)
+ # This implements a 'pseudo-native' GDB running on the
+ # PPU side of the Cell BE and debugging the SPU side.
+
+ NATDEPFILES='spu-linux-nat.o fork-child.o inf-ptrace.o \
+ linux-procfs.o linux-ptrace.o linux-waitpid.o \
+ linux-personality.o linux-namespaces.o'
+ ;;
+ esac
+ ;;
+ s390)
+ case ${gdb_host} in
+ linux)
+ # Host: S390, running Linux
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o s390-linux-nat.o \
+ linux-thread-db.o proc-service.o \
+ linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
+ linux-personality.o \
+ linux-waitpid.o linux-namespaces.o'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ esac
+ ;;
+ sh)
+ case ${gdb_host} in
+ nbsd)
+ # Host: NetBSD/sh
+ NATDEPFILES='fork-child.o inf-ptrace.o sh-nbsd-nat.o'
+ ;;
+ esac
+ ;;
+ sparc)
+ case ${gdb_host} in
+ fbsd)
+ # Host: FreeBSD/sparc64
+ NATDEPFILES='fork-child.o inf-ptrace.o \
+ fbsd-nat.o sparc-nat.o sparc64-nat.o sparc64-fbsd-nat.o \
+ bsd-kvm.o'
+ HAVE_NATIVE_GCORE_HOST=1
+
+ LOADLIBES='-lkvm'
+ ;;
+ linux64)
+ # Host: GNU/Linux UltraSPARC
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='sparc-nat.o sparc64-nat.o sparc64-linux-nat.o \
+ fork-child.o inf-ptrace.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'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ # The dynamically loaded libthread_db needs access to symbols in the
+ # gdb executable.
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ linux)
+ # Host: GNU/Linux SPARC
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='sparc-nat.o sparc-linux-nat.o \
+ fork-child.o inf-ptrace.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'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ # The dynamically loaded libthread_db needs access to symbols in the
+ # gdb executable.
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ nbsd64)
+ # Host: NetBSD/sparc64
+ NATDEPFILES='fork-child.o inf-ptrace.o \
+ sparc64-nbsd-nat.o sparc-nat.o bsd-kvm.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ nbsdelf)
+ # Host: NetBSD/sparc ELF
+ NATDEPFILES='fork-child.o inf-ptrace.o \
+ sparc-nat.o sparc-nbsd-nat.o bsd-kvm.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ obsd64)
+ # Host: OpenBSD/sparc64
+ NATDEPFILES='fork-child.o inf-ptrace.o obsd-nat.o \
+ sparc64-obsd-nat.o sparc-nat.o bsd-kvm.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ sol2)
+ # Host: Solaris SPARC & UltraSPARC
+ NAT_FILE='nm-sol2.h'
+ NATDEPFILES='sparc-sol2-nat.o \
+ fork-child.o \
+ procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o'
+ HAVE_NATIVE_GCORE_HOST=1
+ ;;
+ esac
+ ;;
+ tilegx)
+ case ${gdb_host} in
+ linux)
+ # Host: Tilera TILE-Gx running GNU/Linux.
+ NAT_FILE='config/nm-linux.h'
+ NATDEPFILES='inf-ptrace.o fork-child.o \
+ tilegx-linux-nat.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'
+
+ # The dynamically loaded libthread_db needs access to symbols in the
+ # gdb executable.
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ esac
+ ;;
+ vax)
+ case ${gdb_host} in
+ nbsdelf)
+ # Host: NetBSD/vax ELF
+ NATDEPFILES='fork-child.o inf-ptrace.o \
+ vax-bsd-nat.o bsd-kvm.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ obsd)
+ # Host: OpenBSD/vax
+ NATDEPFILES='fork-child.o inf-ptrace.o \
+ vax-bsd-nat.o bsd-kvm.o'
+
+ LOADLIBES='-lkvm'
+ ;;
+ esac
+ ;;
+ xtensa)
+ case ${gdb_host} in
+ linux)
+ # Host: Xtensa, running GNU/Linux.
+ NAT_FILE='config/nm-linux.h'
+
+ NATDEPFILES='inf-ptrace.o fork-child.o xtensa-linux-nat.o \
+ linux-thread-db.o proc-service.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'
+ NAT_CDEPS='$(srcdir)/proc-service.list'
+
+ LOADLIBES='-ldl $(RDYNAMIC)'
+ ;;
+ esac
+ ;;
+esac
@@ -178,9 +178,6 @@ MAN1S = gdb.1 gdbserver.1 gcore.1
MAN5S = gdbinit.5
MANS = $(MAN1S) $(MAN5S)
-# Host-dependent makefile fragment comes in here.
-@host_makefile_frag@
-# End of host-dependent makefile fragment
HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@
###