summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-01 15:40:57 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-01 15:40:57 +0000
commit5362d2e2cb0c54c098fd2ff2f5cd0c2a2434ecb7 (patch)
treefa1ce1d0053b9fe83be13170b26b4e0a9cea1402
parent83222f7c654935068fe9f496482cefd671cfa895 (diff)
merge revision(s) 40498:
* thread_pthread.c (ruby_init_stack): Add STACK_GROW_DIR_DETECTION. This fixes a compilation failure while cross-compiling for Tensilica Xtensa Processor. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--thread_pthread.c1
-rw-r--r--version.h2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index abf8612847..1f347c30e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 2 00:30:00 2013 Tanaka Akira <akr@fsij.org>
+
+ * thread_pthread.c (ruby_init_stack): Add STACK_GROW_DIR_DETECTION.
+ This fixes a compilation failure while cross-compiling for Tensilica
+ Xtensa Processor.
+
Thu May 2 00:19:46 2013 Tanaka Akira <akr@fsij.org>
* dir.c (dir_set_pos): Fix a compilation error when seekdir() is not
diff --git a/thread_pthread.c b/thread_pthread.c
index 46a8652192..e08f3decb8 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -669,6 +669,7 @@ ruby_init_stack(volatile VALUE *addr
#elif defined(HAVE_GETRLIMIT)
int pagesize = getpagesize();
struct rlimit rlim;
+ STACK_GROW_DIR_DETECTION;
if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
size = (size_t)rlim.rlim_cur;
}
diff --git a/version.h b/version.h
index ab3142f0ce..6b3657109f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-05-02"
-#define RUBY_PATCHLEVEL 179
+#define RUBY_PATCHLEVEL 180
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 5