From 412f3ff50b246282a93fbfc903be0f00f8be9d4d Mon Sep 17 00:00:00 2001
From: "Taylor R. Campbell" <net/mumble/campbell>
Date: Fri, 23 Feb 2007 23:45:28 +0000
Subject: [PATCH] Incorporate changes from Jesper Louis Andersen to make the
 microcode build on FreeBSD again.

---
 v7/src/microcode/configure.ac | 3 ++-
 v7/src/microcode/uxtrap.h     | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/v7/src/microcode/configure.ac b/v7/src/microcode/configure.ac
index a032d39a3..c662300ad 100644
--- a/v7/src/microcode/configure.ac
+++ b/v7/src/microcode/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([MIT/GNU Scheme microcode], [14.18], [bug-mit-scheme@gnu.org], [mit-scheme])
-AC_REVISION([$Id: configure.ac,v 1.36 2007/01/22 08:35:02 riastradh Exp $])
+AC_REVISION([$Id: configure.ac,v 1.37 2007/02/23 23:45:28 riastradh Exp $])
 AC_CONFIG_SRCDIR([boot.c])
 AC_CONFIG_HEADERS([config.h])
 AC_PROG_MAKE_SET
@@ -744,6 +744,7 @@ linux-gnu)
     ;;
 freebsd*)
     M4_FLAGS="${M4_FLAGS} -P SUPPRESS_LEADING_UNDERSCORE,1"
+    DO_GCC_TESTS=yes
     ;;
 darwin*)
     DLD_LDFLAGS="${DLD_LDFLAGS} -Wl,-pagezero_size,04000000"
diff --git a/v7/src/microcode/uxtrap.h b/v7/src/microcode/uxtrap.h
index 81a11da7a..2aa3a0d43 100644
--- a/v7/src/microcode/uxtrap.h
+++ b/v7/src/microcode/uxtrap.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: uxtrap.h,v 1.37 2007/01/05 21:19:25 cph Exp $
+$Id: uxtrap.h,v 1.38 2007/02/23 23:45:28 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -502,6 +502,12 @@ typedef struct
 
 #endif /* __linux__ */
 
+#ifdef __FreeBSD__
+
+#include <ucontext.h>
+
+#endif
+
 #ifdef _MACH_UNIX
 /* The following are true for Mach (BSD 4.3 compatible).
    I don't know about SCO or other versions.  */
-- 
2.25.1