From: Joel Brobecker <brobecker@gnat.com>
Date: Sat, 17 Oct 2009 04:19:19 +0000 (+0000)
Subject:         * amd64fbsd-nat.c (amd64fbsd_supply_pcb): Conditionally compile in
X-Git-Tag: gdb_7_0_1-2009-12-22-release~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f60d3c4d46df8ab52e802c0a6f2a7c3807a0b14;p=thirdparty%2Fbinutils-gdb.git

    * amd64fbsd-nat.c (amd64fbsd_supply_pcb): Conditionally compile in
        support for pcb->pcb_{fs,ds,es,gs} on FreeBSD older than 8.0.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2e2a107e1aa..78e9bbddc9d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-16  Steven G. Kargl  <kargl@gcc.gnu.org>  (tiny patch)
+
+	* amd64fbsd-nat.c (amd64fbsd_supply_pcb): Conditionally compile in
+	support for pcb->pcb_{fs,ds,es,gs} on FreeBSD older than 8.0.
+
 2009-10-08  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
 	PR gdb/10457
diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c
index d3da39e70a4..5a93ec30b9b 100644
--- a/gdb/amd64fbsd-nat.c
+++ b/gdb/amd64fbsd-nat.c
@@ -95,6 +95,7 @@ static int amd64fbsd32_r_reg_offset[I386_NUM_GREGS] =
 
 #include <sys/types.h>
 #include <machine/pcb.h>
+#include <osreldate.h>
 
 #include "bsd-kvm.h"
 
@@ -123,10 +124,12 @@ 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)
   regcache_raw_supply (regcache, AMD64_DS_REGNUM, &pcb->pcb_ds);
   regcache_raw_supply (regcache, AMD64_ES_REGNUM, &pcb->pcb_es);
   regcache_raw_supply (regcache, AMD64_FS_REGNUM, &pcb->pcb_fs);
   regcache_raw_supply (regcache, AMD64_GS_REGNUM, &pcb->pcb_gs);
+#endif
 
   return 1;
 }