From: Daniel Jacobowitz Date: Wed, 3 Feb 2010 15:30:25 +0000 (+0000) Subject: * amd64fbsd-nat.c (amd64fbsd_supply_pcb): Also check for X-Git-Tag: gdb_7_1-2010-02-18-branchpoint~211 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1dec97bf174ee0e1f1e96e53d34a78b4a2d9a6a;p=thirdparty%2Fbinutils-gdb.git * amd64fbsd-nat.c (amd64fbsd_supply_pcb): Also check for __FreeBSD_kernel_version. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fb0ea02d32b..c4ae15e2875 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2010-02-03 Daniel Jacobowitz + + * amd64fbsd-nat.c (amd64fbsd_supply_pcb): Also check for + __FreeBSD_kernel_version. + 2010-02-03 Tristan Gingold * symfile.h (struct sym_fns): Add sym_relocate field. diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c index 1f4720cc1ed..2ad64026aa7 100644 --- a/gdb/amd64fbsd-nat.c +++ b/gdb/amd64fbsd-nat.c @@ -125,7 +125,7 @@ amd64fbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb) regcache_raw_supply (regcache, 13, &pcb->pcb_r13); regcache_raw_supply (regcache, 14, &pcb->pcb_r14); regcache_raw_supply (regcache, 15, &pcb->pcb_r15); -#if (__FreeBSD_version < 800075) +#if (__FreeBSD_version < 800075) && (__FreeBSD_kernel_version < 800075) /* struct pcb provides the pcb_ds/pcb_es/pcb_fs/pcb_gs fields only up until __FreeBSD_version 800074: The removal of these fields occurred on 2009-04-01 while the __FreeBSD_version number was