Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3/gdb Redo the previous alpha change differently...



details:   https://anonhg.NetBSD.org/src/rev/05abb53f297c
branches:  trunk
changeset: 828875:05abb53f297c
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jan 08 18:56:20 2018 +0000

description:
Redo the previous alpha change differently (don't add a new file since we need
ifdefs anyway), and regen.

diffstat:

 external/gpl3/gdb/dist/gdb/alpha-bsd-nat.c              |  14 +++-
 external/gpl3/gdb/dist/gdb/alpha-bsd-tdep.h             |   2 -
 external/gpl3/gdb/dist/gdb/alpha-nbsd-nat.c             |  44 -----------------
 external/gpl3/gdb/dist/gdb/config/alpha/nbsd.mh         |   3 +-
 external/gpl3/gdb/dist/gdb/configure.tgt                |   3 +-
 external/gpl3/gdb/lib/libbfd/arch/alpha/bfd_stdint.h    |   4 +-
 external/gpl3/gdb/lib/libdecnumber/arch/alpha/gstdint.h |   4 +-
 external/gpl3/gdb/lib/libgdb/arch/alpha/defs.mk         |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/alpha/init.c          |   2 -
 9 files changed, 17 insertions(+), 61 deletions(-)

diffs (179 lines):

diff -r 3f06dffa8d54 -r 05abb53f297c external/gpl3/gdb/dist/gdb/alpha-bsd-nat.c
--- a/external/gpl3/gdb/dist/gdb/alpha-bsd-nat.c        Mon Jan 08 14:40:18 2018 +0000
+++ b/external/gpl3/gdb/dist/gdb/alpha-bsd-nat.c        Mon Jan 08 18:56:20 2018 +0000
@@ -25,6 +25,10 @@
 #include "alpha-bsd-tdep.h"
 #include "inf-ptrace.h"
 
+#ifdef __NetBSD__
+#include "nbsd-nat.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
@@ -195,9 +199,6 @@
   t->to_fetch_registers = alphabsd_fetch_inferior_registers;
   t->to_store_registers = alphabsd_store_inferior_registers;
 
-  /* Support debugging kernel virtual memory images.  */
-  bsd_kvm_add_target (alphabsd_supply_pcb);
-
   return t;
 }
 
@@ -209,10 +210,15 @@
 void
 _initialize_alphabsd_nat (void)
 {
-#ifndef __NetBSD__
   struct target_ops *t;
 
   t = alphabsd_target ();
+#ifndef __NetBSD__
   add_target (t);
+#else
+   nbsd_nat_add_target (t);
 #endif
+
+  /* Support debugging kernel virtual memory images.  */
+  bsd_kvm_add_target (alphabsd_supply_pcb);
 }
diff -r 3f06dffa8d54 -r 05abb53f297c external/gpl3/gdb/dist/gdb/alpha-bsd-tdep.h
--- a/external/gpl3/gdb/dist/gdb/alpha-bsd-tdep.h       Mon Jan 08 14:40:18 2018 +0000
+++ b/external/gpl3/gdb/dist/gdb/alpha-bsd-tdep.h       Mon Jan 08 18:56:20 2018 +0000
@@ -37,6 +37,4 @@
                                             void *cb_data,
                                             const struct regcache *regcache);
 
-struct target_ops *alphabsd_target (void);
-
 #endif /* alpha-bsd-tdep.h */
diff -r 3f06dffa8d54 -r 05abb53f297c external/gpl3/gdb/dist/gdb/alpha-nbsd-nat.c
--- a/external/gpl3/gdb/dist/gdb/alpha-nbsd-nat.c       Mon Jan 08 14:40:18 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/* Native-dependent code for NetBSD/alpha.
-
-   Copyright (C) 2018 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/>.  */
-
-#include "defs.h"
-#include "inferior.h"
-#include "regcache.h"
-
-#include "alpha-tdep.h"
-#include "alpha-bsd-tdep.h"
-#include "inf-ptrace.h"
-
-#include "nbsd-nat.h"
-
-#include <sys/types.h>
-#include <sys/ptrace.h>
-#include <machine/reg.h>
-
-/* Provide a prototype to silence -Wmissing-prototypes.  */
-void _initialize_alphanbsd_nat (void);
-
-void
-_initialize_alphanbsd_nat (void)
-{
-  struct target_ops *t;
-
-  t = alphabsd_target ();
-  nbsd_nat_add_target (t);
-}
diff -r 3f06dffa8d54 -r 05abb53f297c external/gpl3/gdb/dist/gdb/config/alpha/nbsd.mh
--- a/external/gpl3/gdb/dist/gdb/config/alpha/nbsd.mh   Mon Jan 08 14:40:18 2018 +0000
+++ b/external/gpl3/gdb/dist/gdb/config/alpha/nbsd.mh   Mon Jan 08 18:56:20 2018 +0000
@@ -1,5 +1,4 @@
 # Host: NetBSD/alpha
-NATDEPFILES= fork-child.o inf-ptrace.o alpha-bsd-nat.o bsd-kvm.o nbsd-nat.o \
-    alpha-nbsd-tdep.o alpha-nbsd-nat.o
+NATDEPFILES= fork-child.o inf-ptrace.o alpha-bsd-nat.o bsd-kvm.o nbsd-nat.o
 
 LOADLIBES= -lkvm
diff -r 3f06dffa8d54 -r 05abb53f297c external/gpl3/gdb/dist/gdb/configure.tgt
--- a/external/gpl3/gdb/dist/gdb/configure.tgt  Mon Jan 08 14:40:18 2018 +0000
+++ b/external/gpl3/gdb/dist/gdb/configure.tgt  Mon Jan 08 18:56:20 2018 +0000
@@ -72,8 +72,7 @@
 alpha*-*-netbsd* | alpha*-*-knetbsd*-gnu)
        # Target: NetBSD/alpha
        gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alpha-bsd-tdep.o \
-                       alpha-nbsd-tdep.o alpha-nbsd-nat.o nbsd-tdep.o \
-                       solib-svr4.o"
+                       alpha-nbsd-tdep.o nbsd-tdep.o solib-svr4.o"
        ;;
 alpha*-*-openbsd*)
        # Target: OpenBSD/alpha
diff -r 3f06dffa8d54 -r 05abb53f297c external/gpl3/gdb/lib/libbfd/arch/alpha/bfd_stdint.h
--- a/external/gpl3/gdb/lib/libbfd/arch/alpha/bfd_stdint.h      Mon Jan 08 14:40:18 2018 +0000
+++ b/external/gpl3/gdb/lib/libbfd/arch/alpha/bfd_stdint.h      Mon Jan 08 18:56:20 2018 +0000
@@ -1,8 +1,8 @@
 /* This file is automatically generated.  DO NOT EDIT! */
 /* Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp  */
-/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp  */
 
-/* generated for  alpha--netbsd-gcc (NetBSD nb1 20160606) 5.4.0 */
+/* generated for  alpha--netbsd-gcc (NetBSD nb1 20171112) 5.5.0 */
 
 #ifndef GCC_GENERATED_STDINT_H
 #define GCC_GENERATED_STDINT_H 1
diff -r 3f06dffa8d54 -r 05abb53f297c external/gpl3/gdb/lib/libdecnumber/arch/alpha/gstdint.h
--- a/external/gpl3/gdb/lib/libdecnumber/arch/alpha/gstdint.h   Mon Jan 08 14:40:18 2018 +0000
+++ b/external/gpl3/gdb/lib/libdecnumber/arch/alpha/gstdint.h   Mon Jan 08 18:56:20 2018 +0000
@@ -1,8 +1,8 @@
 /* This file is automatically generated.  DO NOT EDIT! */
 /* Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp  */
-/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp  */
 
-/* generated for  alpha--netbsd-gcc (NetBSD nb1 20160606) 5.4.0 */
+/* generated for  alpha--netbsd-gcc (NetBSD nb1 20171112) 5.5.0 */
 
 #ifndef GCC_GENERATED_STDINT_H
 #define GCC_GENERATED_STDINT_H 1
diff -r 3f06dffa8d54 -r 05abb53f297c external/gpl3/gdb/lib/libgdb/arch/alpha/defs.mk
--- a/external/gpl3/gdb/lib/libgdb/arch/alpha/defs.mk   Mon Jan 08 14:40:18 2018 +0000
+++ b/external/gpl3/gdb/lib/libgdb/arch/alpha/defs.mk   Mon Jan 08 18:56:20 2018 +0000
@@ -3,5 +3,5 @@
 # Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp 
 #
 G_INTERNAL_CFLAGS=   -I. -I${GNUHOSTDIST}/gdb -I${GNUHOSTDIST}/gdb/common -I${GNUHOSTDIST}/gdb/config -DLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H -I${GNUHOSTDIST}/gdb/../include/opcode 
-I${GNUHOSTDIST}/gdb/../opcodes/.. -I${GNUHOSTDIST}/gdb/../readline/.. -I${GNUHOSTDIST}/gdb/../zlib -I../bfd -I${GNUHOSTDIST}/gdb/../bfd -I${GNUHOSTDIST}/gdb/../include -I../libdecnumber 
-I${GNUHOSTDIST}/gdb/../libdecnumber -I./../intl -I${GNUHOSTDIST}/gdb/gnulib/import -Ibuild-gnulib/import   -DTUI=1  -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch 
-Wno-char-subscripts -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable -Wno-sign-compare -Wno-narrowing -Wformat-nonliteral 
-G_LIBGDB_OBS=alpha-tdep.o alpha-mdebug-tdep.o alpha-bsd-tdep.o alpha-nbsd-tdep.o alpha-nbsd-nat.o nbsd-tdep.o solib-svr4.o ser-base.o ser-unix.o ser-pipe.o ser-tcp.o fork-child.o inf-ptrace.o 
alpha-bsd-nat.o bsd-kvm.o nbsd-nat.o alpha-nbsd-tdep.o alpha-nbsd-nat.o ax-gdb.o ax-general.o ctf.o dcache.o remote.o remote-fileio.o remote-notif.o tracefile.o tracefile-tfile.o tracepoint.o  
cli-cmds.o cli-decode.o cli-dump.o cli-interp.o cli-logging.o cli-script.o cli-setshow.o cli-utils.o mi-cmd-break.o mi-cmd-catch.o mi-cmd-disas.o mi-cmd-env.o mi-cmd-file.o mi-cmd-info.o 
mi-cmd-stack.o mi-cmd-target.o mi-cmd-var.o mi-cmds.o mi-console.o mi-getopt.o mi-interp.o mi-main.o mi-out.o mi-parse.o mi-symbol-cmds.o tui.o tui-command.o tui-data.o tui-disasm.o tui-file.o 
tui-hooks.o tui-interp.o tui-io.o tui-layout.o tui-out.o tui-regs.o tui-source.o tui-stack.o tui-win.o tui-windata.o tui-wingeneral.o tui-winsource.o python.o guile.o elfread.o stap-probe.o 
dtrace-probe.o posix-hdep.o posix-strerror.o ada-exp.o c-exp.o cp-name-parser.o d-exp.o f-exp.o go-exp.o m2-exp.o p-exp.o rust-exp.o ada-lang.o ada-tasks.o ada-typeprint.o ada-valprint.o ada-varobj.o 
addrmap.o agent.o annotate.o arch-utils.o auto-load.o auxv.o bcache.o bfd-target.o block.o blockframe.o break-catch-sig.o break-catch-syscall.o break-catch-throw.o breakpoint.o btrace.o 
btrace-common.o buffer.o build-id.o buildsym.o c-lang.o c-typeprint.o c-valprint.o c-varobj.o charset.o cleanups.o cli-out.o coff-pe-read.o coffread.o common-agent.o common-debug.o 
common-exceptions.o common-regcache.o common-utils.o complaints.o completer.o continuations.o copying.o corefile.o corelow.o cp-abi.o cp-namespace.o cp-support.o cp-valprint.o d-lang.o d-namespace.o 
d-valprint.o dbxread.o debug.o demangle.o dfp.o dictionary.o disasm.o disasm-selftests.o doublest.o dummy-frame.o dwarf2-frame.o dwarf2-frame-tailcall.o dwarf2expr.o dwarf2loc.o dwarf2read.o 
environ.o errors.o eval.o event-loop.o event-top.o exceptions.o exec.o expprint.o extension.o f-lang.o f-typeprint.o f-valprint.o fileio.o filestuff.o filesystem.o findcmd.o findvar.o format.o 
frame.o frame-base.o frame-unwind.o gcore.o gdb_bfd.o gdb-dlfcn.o gdb_obstack.o gdb_usleep.o gdb_vecs.o gdbarch.o gdbtypes.o gnu-v2-abi.o gnu-v3-abi.o go-lang.o go-typeprint.o go-valprint.o 
inf-child.o inf-loop.o infcall.o infcmd.o inferior.o infrun.o inline-frame.o interps.o jit.o language.o linespec.o location.o m2-lang.o m2-typeprint.o m2-valprint.o macrocmd.o macroexp.o macroscope.o 
macrotab.o main.o maint.o mdebugread.o mem-break.o memattr.o memory-map.o memrange.o mi-common.o minidebug.o minsyms.o mipsread.o namespace.o new-op.o objc-lang.o objfiles.o observer.o opencl-lang.o 
osabi.o osdata.o p-lang.o p-typeprint.o p-valprint.o parse.o print-utils.o printcmd.o probe.o progspace.o prologue-value.o psymtab.o ptid.o record.o record-btrace.o record-full.o regcache.o 
reggroups.o registry.o reverse.o rsp-low.o run-time-clock.o rust-lang.o selftest.o selftest-arch.o sentinel-frame.o ser-event.o serial.o signals.o signals-state-save-restore.o skip.o solib.o 
solib-target.o source.o stabsread.o stack.o std-regs.o symfile.o symfile-debug.o symmisc.o symtab.o target.o target-dcache.o target-descriptions.o target-memory.o thread.o thread-fsm.o tid-parse.o 
top.o trad-frame.o tramp-frame.o typeprint.o ui-file.o ui-out.o user-regs.o utils.o utils-selftests.o valarith.o valops.o valprint.o value.o varobj.o vec.o version.o waitstatus.o xml-builtin.o 
xml-support.o xml-syscall.o xml-tdesc.o xml-utils.o compile.o compile-c-support.o compile-c-symbols.o compile-c-types.o compile-loc2c.o compile-object-load.o compile-object-run.o inflow.o    init.o
+G_LIBGDB_OBS=alpha-tdep.o alpha-mdebug-tdep.o alpha-bsd-tdep.o alpha-nbsd-tdep.o nbsd-tdep.o solib-svr4.o ser-base.o ser-unix.o ser-pipe.o ser-tcp.o fork-child.o inf-ptrace.o alpha-bsd-nat.o 
bsd-kvm.o nbsd-nat.o ax-gdb.o ax-general.o ctf.o dcache.o remote.o remote-fileio.o remote-notif.o tracefile.o tracefile-tfile.o tracepoint.o  cli-cmds.o cli-decode.o cli-dump.o cli-interp.o 
cli-logging.o cli-script.o cli-setshow.o cli-utils.o mi-cmd-break.o mi-cmd-catch.o mi-cmd-disas.o mi-cmd-env.o mi-cmd-file.o mi-cmd-info.o mi-cmd-stack.o mi-cmd-target.o mi-cmd-var.o mi-cmds.o 
mi-console.o mi-getopt.o mi-interp.o mi-main.o mi-out.o mi-parse.o mi-symbol-cmds.o tui.o tui-command.o tui-data.o tui-disasm.o tui-file.o tui-hooks.o tui-interp.o tui-io.o tui-layout.o tui-out.o 
tui-regs.o tui-source.o tui-stack.o tui-win.o tui-windata.o tui-wingeneral.o tui-winsource.o python.o guile.o elfread.o stap-probe.o dtrace-probe.o posix-hdep.o posix-strerror.o ada-exp.o c-exp.o 
cp-name-parser.o d-exp.o f-exp.o go-exp.o m2-exp.o p-exp.o rust-exp.o ada-lang.o ada-tasks.o ada-typeprint.o ada-valprint.o ada-varobj.o addrmap.o agent.o annotate.o arch-utils.o auto-load.o auxv.o 
bcache.o bfd-target.o block.o blockframe.o break-catch-sig.o break-catch-syscall.o break-catch-throw.o breakpoint.o btrace.o btrace-common.o buffer.o build-id.o buildsym.o c-lang.o c-typeprint.o 
c-valprint.o c-varobj.o charset.o cleanups.o cli-out.o coff-pe-read.o coffread.o common-agent.o common-debug.o common-exceptions.o common-regcache.o common-utils.o complaints.o completer.o 
continuations.o copying.o corefile.o corelow.o cp-abi.o cp-namespace.o cp-support.o cp-valprint.o d-lang.o d-namespace.o d-valprint.o dbxread.o debug.o demangle.o dfp.o dictionary.o disasm.o 
disasm-selftests.o doublest.o dummy-frame.o dwarf2-frame.o dwarf2-frame-tailcall.o dwarf2expr.o dwarf2loc.o dwarf2read.o environ.o errors.o eval.o event-loop.o event-top.o exceptions.o exec.o 
expprint.o extension.o f-lang.o f-typeprint.o f-valprint.o fileio.o filestuff.o filesystem.o findcmd.o findvar.o format.o frame.o frame-base.o frame-unwind.o gcore.o gdb_bfd.o gdb-dlfcn.o 
gdb_obstack.o gdb_usleep.o gdb_vecs.o gdbarch.o gdbtypes.o gnu-v2-abi.o gnu-v3-abi.o go-lang.o go-typeprint.o go-valprint.o inf-child.o inf-loop.o infcall.o infcmd.o inferior.o infrun.o 
inline-frame.o interps.o jit.o language.o linespec.o location.o m2-lang.o m2-typeprint.o m2-valprint.o macrocmd.o macroexp.o macroscope.o macrotab.o main.o maint.o mdebugread.o mem-break.o memattr.o 
memory-map.o memrange.o mi-common.o minidebug.o minsyms.o mipsread.o namespace.o new-op.o objc-lang.o objfiles.o observer.o opencl-lang.o osabi.o osdata.o p-lang.o p-typeprint.o p-valprint.o parse.o 
print-utils.o printcmd.o probe.o progspace.o prologue-value.o psymtab.o ptid.o record.o record-btrace.o record-full.o regcache.o reggroups.o registry.o reverse.o rsp-low.o run-time-clock.o 
rust-lang.o selftest.o selftest-arch.o sentinel-frame.o ser-event.o serial.o signals.o signals-state-save-restore.o skip.o solib.o solib-target.o source.o stabsread.o stack.o std-regs.o symfile.o 
symfile-debug.o symmisc.o symtab.o target.o target-dcache.o target-descriptions.o target-memory.o thread.o thread-fsm.o tid-parse.o top.o trad-frame.o tramp-frame.o typeprint.o ui-file.o ui-out.o 
user-regs.o utils.o utils-selftests.o valarith.o valops.o valprint.o value.o varobj.o vec.o version.o waitstatus.o xml-builtin.o xml-support.o xml-syscall.o xml-tdesc.o xml-utils.o compile.o 
compile-c-support.o compile-c-symbols.o compile-c-types.o compile-loc2c.o compile-object-load.o compile-object-run.o inflow.o    init.o
 G_SIM_OBS=
diff -r 3f06dffa8d54 -r 05abb53f297c external/gpl3/gdb/lib/libgdb/arch/alpha/init.c
--- a/external/gpl3/gdb/lib/libgdb/arch/alpha/init.c    Mon Jan 08 14:40:18 2018 +0000
+++ b/external/gpl3/gdb/lib/libgdb/arch/alpha/init.c    Mon Jan 08 18:56:20 2018 +0000
@@ -9,7 +9,6 @@
 extern initialize_file_ftype _initialize_gdbtypes;
 extern initialize_file_ftype _initialize_alpha_tdep;
 extern initialize_file_ftype _initialize_alphanbsd_tdep;
-extern initialize_file_ftype _initialize_alphanbsd_nat;
 extern initialize_file_ftype _initialize_svr4_solib;
 extern initialize_file_ftype _initialize_ser_hardwire;
 extern initialize_file_ftype _initialize_ser_pipe;
@@ -167,7 +166,6 @@
   _initialize_gdbtypes ();
   _initialize_alpha_tdep ();
   _initialize_alphanbsd_tdep ();
-  _initialize_alphanbsd_nat ();
   _initialize_svr4_solib ();
   _initialize_ser_hardwire ();
   _initialize_ser_pipe ();



Home | Main Index | Thread Index | Old Index