diff --git a/external/gpl3/gdb/dist/gdb/config/i386/nbsd64.mh b/external/gpl3/gdb/dist/gdb/config/i386/nbsd64.mh
new file mode 100644
index 000000000000..7258380b5fe3
--- /dev/null
+++ b/external/gpl3/gdb/dist/gdb/config/i386/nbsd64.mh
@@ -0,0 +1,6 @@
+# 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 --git a/external/gpl3/gdb/dist/gdb/config/i386/nbsdelf.mh b/external/gpl3/gdb/dist/gdb/config/i386/nbsdelf.mh
new file mode 100644
index 000000000000..4f502c234ce8
--- /dev/null
+++ b/external/gpl3/gdb/dist/gdb/config/i386/nbsdelf.mh
@@ -0,0 +1,7 @@
+# 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 --git a/external/gpl3/gdb/dist/gdb/config/ia64/netbsd.mh b/external/gpl3/gdb/dist/gdb/config/ia64/netbsd.mh
new file mode 100644
index 000000000000..93360cd34f49
--- /dev/null
+++ b/external/gpl3/gdb/dist/gdb/config/ia64/netbsd.mh
@@ -0,0 +1,5 @@
+# Host: NetBSD/ia64 ELF
+NATDEPFILES= fork-child.o inf-ptrace.o nbsd-nat.o ia64-bsd-nat.o bsd-kvm.o \
+	ia64-nbsd-tdep.o
+
+LOADLIBES= -lkvm
diff --git a/external/gpl3/gdb/dist/gdb/ia64-nbsd-tdep.c b/external/gpl3/gdb/dist/gdb/ia64-nbsd-tdep.c
new file mode 100644
index 000000000000..387cb3e74463
--- /dev/null
+++ b/external/gpl3/gdb/dist/gdb/ia64-nbsd-tdep.c
@@ -0,0 +1,46 @@
+/* Target-dependent code for NetBSD/ia64.
+
+   Copyright (C) 2004-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/>.  */
+
+#include "defs.h"
+#include "arch-utils.h"
+#include "osabi.h"
+
+#include "ia64-tdep.h"
+#include "solib-svr4.h"
+
+/* NetBSD ELF.  */
+
+static void
+ia64nbsd_elf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+{
+  /* NetBSD ELF uses SVR4-style shared libraries.  */
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_ilp32_fetch_link_map_offsets);
+}
+
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+void _initialize_ia64nbsd_tdep (void);
+
+void
+_initialize_ia64nbsd_tdep (void)
+{
+  gdbarch_register_osabi (bfd_arch_ia64, 0, GDB_OSABI_NETBSD,
+			  ia64nbsd_elf_init_abi);
+}