28c28
< __FBSDID("$FreeBSD: head/gnu/usr.bin/gdb/kgdb/kthr.c 203823 2010-02-13 11:47:04Z avg $");
---
> __FBSDID("$FreeBSD: head/gnu/usr.bin/gdb/kgdb/kthr.c 210852 2010-08-04 21:02:04Z jhb $");
47c47
< static uintptr_t dumppcb;
---
> static CORE_ADDR dumppcb;
50c50
< static uintptr_t stoppcbs;
---
> static CORE_ADDR stoppcbs;
56c56
< uintptr_t
---
> CORE_ADDR
59c59,60
< struct nlist nl[2];
---
> CORE_ADDR addr;
> char *name;
61,66c62,65
< nl[0].n_type = N_UNDF;
< nl[0].n_name = (char *)(uintptr_t)sym;
< nl[1].n_name = NULL;
< if (kvm_nlist(kvm, nl) != 0)
< return (0);
< return (nl[0].n_value);
---
> asprintf(&name, "&%s", sym);
> addr = kgdb_parse(name);
> free(name);
> return (addr);
81c80,81
< uintptr_t addr, paddr;
---
> CORE_ADDR addr;
> uintptr_t paddr;
89,91c89,90
< addr = kgdb_lookup("_allproc");
< if (addr == 0) {
< warnx("kvm_nlist(_allproc): %s", kvm_geterr(kvm));
---
> addr = kgdb_lookup("allproc");
> if (addr == 0)
93d91
< }
96,98c94,95
< dumppcb = kgdb_lookup("_dumppcb");
< if (dumppcb == 0) {
< warnx("kvm_nlist(_dumppcb): %s", kvm_geterr(kvm));
---
> dumppcb = kgdb_lookup("dumppcb");
> if (dumppcb == 0)
100d96
< }
102c98
< addr = kgdb_lookup("_dumptid");
---
> addr = kgdb_lookup("dumptid");
108c104
< addr = kgdb_lookup("_stopped_cpus");
---
> addr = kgdb_lookup("stopped_cpus");
114c110
< stoppcbs = kgdb_lookup("_stoppcbs");
---
> stoppcbs = kgdb_lookup("stoppcbs");