3 files changed, 17 insertions, 29 deletions

diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile
index 8af2e1821edb..39f4cd520c89 100644
--- a/gnu/usr.bin/gdb/kgdb/Makefile
+++ b/gnu/usr.bin/gdb/kgdb/Makefile
@@ -9,11 +9,7 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
 GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 
 DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM}
-LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX}
+LDADD=	${GDBLIBS} ${BULIBS} -lkvm
 LIBADD+=	m readline ncursesw gnuregex
 
-.if defined(GDB_CROSS_DEBUGGER)
-CFLAGS+= -Wl,-export-dynamic
-.endif
-
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gdb/kgdb/main.c b/gnu/usr.bin/gdb/kgdb/main.c
index 19246c050466..aa062a2dd8c0 100644
--- a/gnu/usr.bin/gdb/kgdb/main.c
+++ b/gnu/usr.bin/gdb/kgdb/main.c
@@ -41,9 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <kvm.h>
 #include <limits.h>
 #include <paths.h>
-#ifdef CROSS_DEBUGGER
-#include <proc_service.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -81,24 +78,6 @@ static struct ui_file *parse_gdberr;
 
 static void (*kgdb_new_objfile_chain)(struct objfile * objfile);
 
-#ifdef CROSS_DEBUGGER
-ps_err_e
-ps_pglobal_lookup(struct ps_prochandle *ph, const char *obj, const char *name,
-    psaddr_t *sym_addr)
-{
-	struct minimal_symbol *ms;
-	CORE_ADDR addr;
-
-	ms = lookup_minimal_symbol (name, NULL, NULL);
-	if (ms == NULL)
-		return PS_NOSYM;
-
-	addr = SYMBOL_VALUE_ADDRESS (ms);
-	store_typed_address(sym_addr, builtin_type_void_data_ptr, addr);
-	return PS_OK;
-}
-#endif
-
 static void
 usage(void)
 {
diff --git a/gnu/usr.bin/gdb/kgdb/trgt.c b/gnu/usr.bin/gdb/kgdb/trgt.c
index c75edf000dba..0e29b7af9d67 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt.c
@@ -78,6 +78,19 @@ static char kvm_err[_POSIX2_LINE_MAX];
 #define	KERNOFF		(kgdb_kernbase ())
 #define	PINKERNEL(x)	((x) >= KERNOFF)
 
+static int
+kgdb_resolve_symbol(const char *name, kvaddr_t *kva)
+{
+	struct minimal_symbol *ms;
+
+	ms = lookup_minimal_symbol (name, NULL, NULL);
+	if (ms == NULL)
+		return (1);
+
+	*kva = SYMBOL_VALUE_ADDRESS (ms);
+	return (0);;
+}
+
 static CORE_ADDR
 kgdb_kernbase (void)
 {
@@ -120,8 +133,8 @@ kgdb_trgt_open(char *filename, int from_tty)
 
 	old_chain = make_cleanup (xfree, filename);
 
-	nkvm = kvm_openfiles(bfd_get_filename(exec_bfd), filename, NULL,
-	    write_files ? O_RDWR : O_RDONLY, kvm_err);
+	nkvm = kvm_open2(bfd_get_filename(exec_bfd), filename,
+	    write_files ? O_RDWR : O_RDONLY, kvm_err, kgdb_resolve_symbol);
 	if (nkvm == NULL)
 		error ("Failed to open vmcore: %s", kvm_err);
 
@@ -254,7 +267,7 @@ kgdb_trgt_xfer_memory(CORE_ADDR memaddr, char *myaddr, int len, int write,
 		if (len == 0)
 			return (0);
 		if (!write)
-			return (kvm_read(kvm, memaddr, myaddr, len));
+			return (kvm_read2(kvm, memaddr, myaddr, len));
 		else
 			return (kvm_write(kvm, memaddr, myaddr, len));
 	}