2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b2d39ba5ed..fddec25798 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 11 23:47:00 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* thread_pthread.c (get_stack):  need to adjust stack addr for
+          [Bug #1813] on AIX. backported r32511 from trunk.
+
 Mon Jul 11 15:17:03 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* numeric.c (rb_num2ull): use FIX2LONG instead of FIX2ULONG. see
diff --git a/thread_pthread.c b/thread_pthread.c
index 0cdc220fba..7c486ab11f 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -518,6 +518,7 @@ get_stack(void **addr, size_t *size)
 				   &reg, &regsiz));
     *addr = thinfo.__pi_stackaddr;
     *size = thinfo.__pi_stacksize;
+    STACK_DIR_UPPER((void)0, (void)(*addr = (char *)*addr + *size));
 #else
 #error STACKADDR_AVAILABLE is defined but not implemented.
 #endif