kosaki	2011-08-30 09:54:09 +0900 (Tue, 30 Aug 2011)

  New Revision: 33120

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33120

  Log:
    merge revision(s) 33118:
    
    * cont.c (fiber_entry): fix stack allocation failure on Debian
      GNU/kFreeBSD.
      Patch by Lucas Nussbaum <lucas at lucas-nussbaum dot net>.
      [Bug #5241] [ruby-core:39147]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/cont.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33119)
+++ ruby_1_9_3/ChangeLog	(revision 33120)
@@ -1,3 +1,10 @@
+Tue Aug 30 09:53:59 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* cont.c (fiber_entry): fix stack allocation failure on Debian
+	  GNU/kFreeBSD.
+	  Patch by Lucas Nussbaum <lucas at lucas-nussbaum dot net>.
+	  [Bug #5241] [ruby-core:39147]
+
 Tue Aug 30 09:52:29 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* backport r33117 from trunk.
Index: ruby_1_9_3/cont.c
===================================================================
--- ruby_1_9_3/cont.c	(revision 33119)
+++ ruby_1_9_3/cont.c	(revision 33120)
@@ -520,8 +520,9 @@
 /*
  * FreeBSD require a first (i.e. addr) argument of mmap(2) is not NULL
  * if MAP_STACK is passed.
+ * http://www.FreeBSD.org/cgi/query-pr.cgi?pr=158755
  */
-#if defined(MAP_STACK) && !defined(__FreeBSD__)
+#if defined(MAP_STACK) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
 #define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_STACK)
 #else
 #define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/