svn commit: r465746 - in head/lang/ccl: . files
Jimmy Olgeni
olgeni at FreeBSD.org
Tue Mar 27 19:46:03 UTC 2018
Author: olgeni
Date: Tue Mar 27 19:46:02 2018
New Revision: 465746
URL: https://svnweb.freebsd.org/changeset/ports/465746
Log:
In lang/ccl:
- Explicitly include <machine/trap.h> for accessing T_PAGEFLT.
- Use 'mc_flags' in mcontext_t to check for valid AVX state, rather than
'mc_trapno'.
PR: 226809
Submitted by: jhb
Added:
head/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8632.h (contents, props changed)
head/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8664.h (contents, props changed)
Modified:
head/lang/ccl/Makefile
Modified: head/lang/ccl/Makefile
==============================================================================
--- head/lang/ccl/Makefile Tue Mar 27 19:30:24 2018 (r465745)
+++ head/lang/ccl/Makefile Tue Mar 27 19:46:02 2018 (r465746)
@@ -2,6 +2,7 @@
PORTNAME= ccl
PORTVERSION= 1.11
+PORTREVISION= 1
CATEGORIES= lang lisp
MASTER_SITES= ftp://ftp.clozure.com/pub/release/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsdx86
Added: head/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8632.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8632.h Tue Mar 27 19:46:02 2018 (r465746)
@@ -0,0 +1,19 @@
+--- lisp-kernel/platform-freebsdx8632.h.orig 2018-03-20 12:24:58.894882000 -0700
++++ lisp-kernel/platform-freebsdx8632.h 2018-03-20 12:26:51.327100000 -0700
+@@ -42,6 +42,7 @@ typedef struct __ucontext ExceptionInfor
+
+ #include <sys/types.h>
+ #include <machine/npx.h>
++#include <machine/trap.h>
+ #define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext)))
+ #define xpGPR(x,gprno) (xpGPRvector(x)[gprno])
+ #define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new)
+@@ -56,7 +57,7 @@ extern void freebsd_sigreturn(ExceptionI
+ #define IS_PAGE_FAULT(info,xp) (xp->uc_mcontext.mc_trapno == T_PAGEFLT)
+ #define SIGRETURN(context) freebsd_sigreturn(context)
+
+-#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_trapno & 4)
++#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_flags & 4)
+ #define AVX_CONTEXT_PTR(xp) (((xp)->uc_mcontext.mc_fpstate[130]))
+ #define AVX_CONTEXT_SIZE(xp) ((natural)((xp)->uc_mcontext.mc_fpstate[131]))
+
Added: head/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8664.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/ccl/files/patch-lisp-kernel_platform-freebsdx8664.h Tue Mar 27 19:46:02 2018 (r465746)
@@ -0,0 +1,19 @@
+--- lisp-kernel/platform-freebsdx8664.h.orig 2018-03-20 12:25:05.151015000 -0700
++++ lisp-kernel/platform-freebsdx8664.h 2018-03-20 12:26:36.751044000 -0700
+@@ -47,6 +47,7 @@ typedef struct __ucontext ExceptionInfor
+ #define REG_RSP 23
+
+ #include <machine/fpu.h>
++#include <machine/trap.h>
+ #define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext)))
+ #define xpGPR(x,gprno) (xpGPRvector(x)[gprno])
+ #define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new)
+@@ -67,7 +68,7 @@ extern void freebsd_sigreturn(ExceptionI
+ fbsd 9.1 headers; if we built on an older OS version, we still need
+ to know about this if we run on 9.1+ */
+
+-#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_trapno & 4)
++#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_flags & 4)
+ #define AVX_CONTEXT_PTR(xp) (((xp)->uc_mcontext.mc_fpstate[66]))
+ #define AVX_CONTEXT_SIZE(xp) ((natural)((xp)->uc_mcontext.mc_fpstate[67]))
+
More information about the svn-ports-all
mailing list