From 293009710de3e81f6fdb483770a63bc67ef80dbb Mon Sep 17 00:00:00 2001
From: "Taylor R. Campbell" <net/mumble/campbell>
Date: Fri, 24 Aug 2007 13:19:24 +0000
Subject: [PATCH] Implement preliminary support for Dragonfly BSD, thanks to
 Francis Gudin.

---
 v7/doc/ref-manual/os-interface.texi | 3 ++-
 v7/src/microcode/configure.ac       | 6 +++++-
 v7/src/microcode/ux.h               | 6 +++++-
 v7/src/microcode/uxtrap.h           | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/v7/doc/ref-manual/os-interface.texi b/v7/doc/ref-manual/os-interface.texi
index 2482d3ef6..893acb545 100644
--- a/v7/doc/ref-manual/os-interface.texi
+++ b/v7/doc/ref-manual/os-interface.texi
@@ -1,5 +1,5 @@
 @c This file is part of the MIT/GNU Scheme Reference Manual.
-@c $Id: os-interface.texi,v 1.2 2007/01/05 21:48:32 cph Exp $
+@c $Id: os-interface.texi,v 1.3 2007/08/24 13:19:24 riastradh Exp $
 
 @c Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 @c     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -2588,6 +2588,7 @@ possible values:
 @group
 "GNU/Linux"
 "FreeBSD"
+"DragonFlyBSD"
 "HP-UX"
 "SunOS"
 "OS/2 2.1"
diff --git a/v7/src/microcode/configure.ac b/v7/src/microcode/configure.ac
index 19aba4792..02cdaf17b 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], [15.1], [bug-mit-scheme@gnu.org], [mit-scheme])
-AC_REVISION([$Id: configure.ac,v 1.54 2007/06/23 05:47:43 cph Exp $])
+AC_REVISION([$Id: configure.ac,v 1.55 2007/08/24 13:19:24 riastradh Exp $])
 AC_CONFIG_SRCDIR([boot.c])
 AC_CONFIG_HEADERS([config.h])
 AC_PROG_MAKE_SET
@@ -825,6 +825,10 @@ freebsd*)
     M4_FLAGS="${M4_FLAGS} -P SUPPRESS_LEADING_UNDERSCORE,1"
     DO_GCC_TESTS=yes
     ;;
+dragonfly*)
+    M4_FLAGS="${M4_FLAGS} -P SUPPRESS_LEADING_UNDERSCORE,1"
+    DO_GCC_TESTS=yes
+    ;;
 darwin*)
     SCHEME_LDFLAGS="${SCHEME_LDFLAGS} -Wl,-pagezero_size,04000000"
     MODULE_LDFLAGS="${MODULE_LDFLAGS} -bundle -flat_namespace -undefined suppress"
diff --git a/v7/src/microcode/ux.h b/v7/src/microcode/ux.h
index ad141423c..8ef442b6c 100644
--- a/v7/src/microcode/ux.h
+++ b/v7/src/microcode/ux.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ux.h,v 1.84 2007/06/22 08:09:25 riastradh Exp $
+$Id: ux.h,v 1.85 2007/08/24 13:19:24 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -56,6 +56,10 @@ USA.
 #  define SYSTEM_VARIANT "FreeBSD"
 #endif
 
+#ifdef __DragonFly__
+#  define SYSTEM_VARIANT "DragonFlyBSD"
+#endif
+
 #if defined(__hpux) || defined(hpux)
 #  define SYSTEM_VARIANT "HP/UX"
 #endif
diff --git a/v7/src/microcode/uxtrap.h b/v7/src/microcode/uxtrap.h
index 046b14a06..6afbb9f85 100644
--- a/v7/src/microcode/uxtrap.h
+++ b/v7/src/microcode/uxtrap.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: uxtrap.h,v 1.39 2007/04/22 16:31:23 cph Exp $
+$Id: uxtrap.h,v 1.40 2007/08/24 13:19:24 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,7 +502,7 @@ typedef struct
 
 #endif /* __linux__ */
  
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 #  include <ucontext.h>
 #endif
 
-- 
2.25.1