From: Joel Brobecker <brobecker@gnat.com>
Date: Fri, 16 Oct 2009 23:18:27 +0000 (+0000)
Subject:         * amd64fbsd-nat.c (amd64fbsd_supply_pcb): Conditionally compile in
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1f596238d530e809dfe4b6164a1796e9a3cf1954;p=binutils-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 92ec8502449..f11c3c68ce3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-15  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	* 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-15  Michael Eager  <eager@eagercon.com>
 
 	* config/djgpp/fnchange.lst: Add translations for cpu-microblaze.c,
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;
 }