CVS commit: pkgsrc/devel/ald

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Jul  2 14:41:59 UTC 2016

Modified Files:
        pkgsrc/devel/ald: distinfo
Added Files:
        pkgsrc/devel/ald/patches: patch-libDebug_arch_ix86_source_netbsd-x86.c

Log Message:
Deal with move of the x87 definitions in NetBSD 7.0.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ald/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/ald/patches/patch-libDebug_arch_ix86_source_netbsd-x86.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ald/distinfo
diff -u pkgsrc/devel/ald/distinfo:1.5 pkgsrc/devel/ald/distinfo:1.6
--- pkgsrc/devel/ald/distinfo:1.5       Tue Nov  3 03:27:13 2015
+++ pkgsrc/devel/ald/distinfo   Sat Jul  2 14:41:59 2016
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:27:13 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/07/02 14:41:59 joerg Exp $
 
 SHA1 (ald-0.1.7.tar.gz) = e9734b434047a3e4b0d8aed48f017bdf12f27039
 RMD160 (ald-0.1.7.tar.gz) = 37a2049005fd7101f69e26212e814ebca14dfdbf
 SHA512 (ald-0.1.7.tar.gz) = dbde0929beebe51ef5f77055b5f396630e16fd01ded4210d828f9ce97c676e7863700a98bf02d26e10cc2d8481adf329d8c8cb11c866302361221f072dbf45bf
 Size (ald-0.1.7.tar.gz) = 665998 bytes
 SHA1 (patch-aa) = eaa0c606b9735fbde224f0a95b822c76626bb35e
+SHA1 (patch-libDebug_arch_ix86_source_netbsd-x86.c) = 1767d5364ac453ad9c041cb2c5c89349c61d782f

Added files:

Index: pkgsrc/devel/ald/patches/patch-libDebug_arch_ix86_source_netbsd-x86.c
diff -u /dev/null pkgsrc/devel/ald/patches/patch-libDebug_arch_ix86_source_netbsd-x86.c:1.1
--- /dev/null   Sat Jul  2 14:41:59 2016
+++ pkgsrc/devel/ald/patches/patch-libDebug_arch_ix86_source_netbsd-x86.c       Sat Jul  2 14:41:59 2016
@@ -0,0 +1,46 @@
+$NetBSD: patch-libDebug_arch_ix86_source_netbsd-x86.c,v 1.1 2016/07/02 14:41:59 joerg Exp $
+
+--- libDebug/arch/ix86/source/netbsd-x86.c.orig        2016-07-02 09:20:24.000000000 +0000
++++ libDebug/arch/ix86/source/netbsd-x86.c
+@@ -20,7 +20,12 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <machine/reg.h>
++#include <sys/param.h>
++#if __NetBSD_Version__ >= 700000000
++#include <x86/fpu.h>
++#else
+ #include <machine/npx.h>
++#endif
+ 
+ /*
+  * Top-level includes
+@@ -261,6 +266,20 @@ x86readFPUDebug(struct debugWorkspace *w
+ 
+   fpframe = (struct save87 *) &(ws->regContents.fpRegs);
+ 
++#if __NetBSD_Version__ >= 700000000
++  fpuState->fctrl = fpframe->s87_cw;
++  fpuState->fstat = fpframe->s87_sw;
++  fpuState->ftag = fpframe->s87_tw;
++  fpuState->fip = fpframe->s87_ip.fa_32.fa_off;
++  fpuState->fcs = fpframe->s87_ip.fa_32.fa_seg;
++  fpuState->fopcode = fpframe->s87_ip.fa_32.fa_opcode;
++  fpuState->fooff = fpframe->s87_ip.fa_32.fa_off;
++  fpuState->foseg = fpframe->s87_ip.fa_32.fa_seg;
++
++  memcpy(fpuState->stptr,
++         fpframe->s87_ac,
++         FPU_NUM_DATA_REGS * FPU_DATA_REG_SIZE);
++#else
+   fpuState->fctrl = fpframe->sv_env.en_cw;
+   fpuState->fstat = fpframe->sv_env.en_sw;
+   fpuState->ftag = fpframe->sv_env.en_tw;
+@@ -273,6 +292,7 @@ x86readFPUDebug(struct debugWorkspace *w
+   memcpy(fpuState->stptr,
+          fpframe->sv_ac,
+          FPU_NUM_DATA_REGS * FPU_DATA_REG_SIZE);
++#endif
+ 
+ #if 0
+   fpuState->fctrl = *((unsigned short *) x86Registers[REG_FCTRL].valptr);