[src/trunk]: src/external/gpl3/gdb/dist/gdb Move definitions into configure.n...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/17c89661e9a5
branches:  trunk
changeset: 451651:17c89661e9a5
user:      christos <christos%NetBSD.org@localhost>
date:      Wed May 29 22:07:47 2019 +0000

description:
Move definitions into configure.nat; harmonize and refactor the NetBSD
nat definitions.

diffstat:

 external/gpl3/gdb/dist/gdb/config/i386/nbsd64.mh  |   6 ---
 external/gpl3/gdb/dist/gdb/config/i386/nbsdelf.mh |   7 ----
 external/gpl3/gdb/dist/gdb/configure.nat          |  38 ++++++++++------------
 3 files changed, 17 insertions(+), 34 deletions(-)

diffs (116 lines):

diff -r ba6757695d4e -r 17c89661e9a5 external/gpl3/gdb/dist/gdb/config/i386/nbsd64.mh
--- a/external/gpl3/gdb/dist/gdb/config/i386/nbsd64.mh  Wed May 29 18:19:03 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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 \
-       bsd-kvm.o x86-nat.o x86-dregs.o
-
-LOADLIBES= -lkvm
diff -r ba6757695d4e -r 17c89661e9a5 external/gpl3/gdb/dist/gdb/config/i386/nbsdelf.mh
--- a/external/gpl3/gdb/dist/gdb/config/i386/nbsdelf.mh Wed May 29 18:19:03 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# Host: NetBSD/i386 ELF
-NATDEPFILES= fork-child.o inf-ptrace.o \
-       nbsd-nat.o x86-bsd-nat.o x86-nat.o x86-dregs.o \
-       i386-bsd-nat.o i386-nbsd-nat.o \
-       bsd-kvm.o
-
-LOADLIBES= -lkvm
diff -r ba6757695d4e -r 17c89661e9a5 external/gpl3/gdb/dist/gdb/configure.nat
--- a/external/gpl3/gdb/dist/gdb/configure.nat  Wed May 29 18:19:03 2019 +0000
+++ b/external/gpl3/gdb/dist/gdb/configure.nat  Wed May 29 22:07:47 2019 +0000
@@ -329,11 +329,12 @@
        esac
        ;;
     nbsd)
+       NATDEPFILES="${NATDEPFILES} nbsd-nat.o bsd-kvm.o"
+       LOADLIBES='-lkvm'
        case ${gdb_host_cpu} in
            alpha)
                # Host: NetBSD/alpha
-               NATDEPFILES="${NATDEPFILES} alpha-bsd-nat.o bsd-kvm.o"
-               LOADLIBES='-lkvm'
+               NATDEPFILES="${NATDEPFILES} alpha-bsd-nat.o"
                ;;
            mips)
                # Host: NetBSD/mips
@@ -341,12 +342,11 @@
                ;;
            pa)
                # Host: NetBSD/hppa
-               NATDEPFILES="${NATDEPFILES} nbsd-nat.o hppa-nbsd-nat.o"
+               NATDEPFILES="${NATDEPFILES} hppa-nbsd-nat.o"
                ;;
            powerpc)
                # Host: NetBSD/powerpc
-               NATDEPFILES="${NATDEPFILES} ppc-nbsd-nat.o bsd-kvm.o"
-               LOADLIBES='-lkvm'
+               NATDEPFILES="${NATDEPFILES} ppc-nbsd-nat.o"
                ;;
            sh)
                # Host: NetBSD/sh
@@ -356,22 +356,24 @@
        esac
        ;;
     nbsd64)
+       NATDEPFILES="${NATDEPFILES} nbsd-nat.o bsd-kvm.o"
+       LOADLIBES='-lkvm'
        case ${gdb_host_cpu} in
            i386)
                # Host: NetBSD/amd64
-               NATDEPFILES="${NATDEPFILES} nbsd-nat.o amd64-nat.o x86-nat.o \
-               nat/x86-dregs.o x86-bsd-nat.o amd64-bsd-nat.o amd64-nbsd-nat.o"
+               NATDEPFILES="${NATDEPFILES} amd64-nbsd-nat.o amd64-bsd-nat.o \
+               amd64-nat.o x86-bsd-nat.o x86-nat.o nat/x86-dregs.o"
                ;;
            sparc)
                # Host: NetBSD/sparc64
-               NATDEPFILES="${NATDEPFILES} sparc64-nbsd-nat.o sparc-nat.o \
-               bsd-kvm.o"
-               LOADLIBES='-lkvm'
+               NATDEPFILES="${NATDEPFILES} sparc64-nbsd-nat.o sparc-nat.o"
                ;;
 
        esac
        ;;
     nbsdelf)
+       NATDEPFILES="${NATDEPFILES} nbsd-nat.o bsd-kvm.o"
+       LOADLIBES='-lkvm'
        case ${gdb_host_cpu} in
            arm)
                # Host: NetBSD/arm
@@ -379,26 +381,20 @@
                ;;
            i386)
                # Host: NetBSD/i386 ELF
-               NATDEPFILES="${NATDEPFILES} nbsd-nat.o x86-nat.o \
-               nat/x86-dregs.o \
-               x86-bsd-nat.o i386-bsd-nat.o i386-nbsd-nat.o bsd-kvm.o"
-               LOADLIBES='-lkvm'
+               NATDEPFILES="${NATDEPFILES} i386-nbsd-nat.o i386-bsd-nat.o \
+               x86-bsd-nat.o x86-nat.o nat/x86-dregs.o"
                ;;
            m68k)
                # Host: NetBSD/m68k ELF
-               NATDEPFILES="${NATDEPFILES} m68k-bsd-nat.o bsd-kvm.o"
-               LOADLIBES='-lkvm'
+               NATDEPFILES="${NATDEPFILES} m68k-bsd-nat.o"
                ;;
            sparc)
                # Host: NetBSD/sparc ELF
-               NATDEPFILES="${NATDEPFILES} sparc-nat.o sparc-nbsd-nat.o \
-               bsd-kvm.o"
-               LOADLIBES='-lkvm'
+               NATDEPFILES="${NATDEPFILES} sparc-nat.o sparc-nbsd-nat.o"
                ;;
            vax)
                # Host: NetBSD/vax ELF
-               NATDEPFILES="${NATDEPFILES} vax-bsd-nat.o bsd-kvm.o"
-               LOADLIBES='-lkvm'
+               NATDEPFILES="${NATDEPFILES} vax-bsd-nat.o"
                ;;
 
        esac