* gc.c (Init_stack): IA64 requires STACK_LEVEL_MAX to be less than

  magic number when optimizer turned on, regardless of rlimit
  values.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 18 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 778ccb8cc6..270fd2cd1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug  1 00:52:58 2003  Yukihiro Matsumoto  <[email protected]>
+
+	* gc.c (Init_stack): IA64 requires STACK_LEVEL_MAX to be less than
+	  magic number when optimizer turned on, regardless of rlimit
+	  values.
+
 Thu Jul 31 23:44:00 2003  Masatoshi SEKI  <[email protected]>
 
 	* lib/erb.rb: import erb-2.0.4b4.
diff --git a/doc/irb/irb.rd b/doc/irb/irb.rd
index c1ac367919..a42cd46680 100644
--- a/doc/irb/irb.rd
+++ b/doc/irb/irb.rd
@@ -221,7 +221,7 @@ For irb commands, both simple name and `irb_'-prefixed name are prepared.
     Whether readline is used or not. 
     true: uses 
     false: doen't use
-    nil: intends to use readline except for inf-reuby-mode (default)
+    nil: intends to use readline except for inf-ruby-mode (default)
 #
 #--- conf.verbose=T/F
 #    Whether verbose messages are display or not. 
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index 7e80c7fc6f..bf8ac5d517 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -53,7 +53,7 @@ irb�λȤ�����, Ruby�����ΤäƤ���Ф����äƴ�ñ�Ǥ�. ����Ū�ˤ� irb ��
   --noinspect	    ��̽��Ϥ�inspect���Ѥ��ʤ�.
   --readline	    readline�饤�֥������Ѥ���.
   --noreadline	    readline�饤�֥������Ѥ��ʤ�. �ǥե���Ȥ�ư���,
-		    inf-reuby-mode�ʳ���readline�饤�֥������Ѥ��褦
+		    inf-ruby-mode�ʳ���readline�饤�֥������Ѥ��褦
 		    �Ȥ���. 
   --prompt prompt-mode
   --prompt-mode prompt-mode
@@ -232,7 +232,7 @@ irb��ĥ���ޥ�ɤ�, ��ñ��̾����Ƭ��`irb_'��Ĥ���̾����ξ����������
     readline��Ȥ����ɤ���?
     true: readline��Ȥ�.
     false: readline��Ȥ�ʤ�.
-    nil: (�ǥե����)inf-reuby-mode�ʳ���readline�饤�֥������Ѥ���
+    nil: (�ǥե����)inf-ruby-mode�ʳ���readline�饤�֥������Ѥ���
          ���Ȥ���.  
 #
 #--- conf.verbose=T/F
@@ -277,7 +277,7 @@ irb��ĥ���ޥ�ɤ�, ��ñ��̾����Ƭ��`irb_'��Ĥ���̾����ξ����������
 
 --- _  
     ���η׻��μ¹Է�̤�Ф��Ƥ���(���������ѿ�).
-___ __ 
+--- __ 
     �¹Է�̤������Ф��Ƥ���.
     __[line_no]�ǡ����ιԤǼ¹Ԥ�����̤����뤳�Ȥ��Ǥ���. line_no�����
     ���ˤϡ��ǿ��η�̤���-line_no���η�̤����뤳�Ȥ��Ǥ���.
diff --git a/gc.c b/gc.c
index ddaa76365d..70502e01f5 100644
--- a/gc.c
+++ b/gc.c
@@ -1318,6 +1318,14 @@ Init_stack(addr)
 	    STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
 	}
     }
+#ifdef __ia64__
+    /* ruby crashes on IA64 if compiled with optimizer on */
+    /* when if STACK_LEVEL_MAX is greater than this magic number */
+    /* I know this is a kludge.  I suspect optimizer bug */
+#define IA64_MAGIC_STACK_LIMIT 65535
+    if (STACK_LEVEL_MAX > IA64_MAGIC_STACK_LIMIT)
+	STACK_LEVEL_MAX = IA64_MAGIC_STACK_LIMIT;
+#endif
 #endif
 }