diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-30 00:54:09 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-30 00:54:09 +0000 |
commit | f363d4d8c18ca44b641fdbd873c97ce234e053d3 (patch) | |
tree | bc07d81ad1467337468fd3aec20fb0b411fb9d23 | |
parent | 4e9438bc9153f7a1f4ea0af85c8dbe359e1a55d8 (diff) | |
download | ruby-f363d4d8c18ca44b641fdbd873c97ce234e053d3.tar.gz |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | cont.c | 3 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Tue Aug 30 09:53:59 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * 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@gmail.com> * backport r33117 from trunk. @@ -520,8 +520,9 @@ fiber_entry(void *arg) /* * 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) |