summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--gc.c36
2 files changed, 22 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 43a645a6f3..2c1aead2b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 19 22:24:07 2001 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * gc.c (rb_setjmp): avoid GCC 3.0 warnings.
+
Tue Jun 19 18:19:30 2001 Akinori MUSHA <knu@iDaemons.org>
* ext/readline/readline.c: add new methods:
diff --git a/gc.c b/gc.c
index 912f71c566..cfe981d7ee 100644
--- a/gc.c
+++ b/gc.c
@@ -894,11 +894,11 @@ rb_gc_mark_frame(frame)
#if defined(__human68k__) || defined(DJGPP)
#if defined(__human68k__)
typedef unsigned long rb_jmp_buf[8];
-__asm__ (".even
-_rb_setjmp:
- move.l 4(sp),a0
- movem.l d3-d7/a3-a5,(a0)
- moveq.l #0,d0
+__asm__ (".even\n\
+_rb_setjmp:\n\
+ move.l 4(sp),a0\n\
+ movem.l d3-d7/a3-a5,(a0)\n\
+ moveq.l #0,d0\n\
rts");
#ifdef setjmp
#undef setjmp
@@ -906,19 +906,19 @@ _rb_setjmp:
#else
#if defined(DJGPP)
typedef unsigned long rb_jmp_buf[6];
-__asm__ (".align 4
-_rb_setjmp:
- pushl %ebp
- movl %esp,%ebp
- movl 8(%ebp),%ebp
- movl %eax,(%ebp)
- movl %ebx,4(%ebp)
- movl %ecx,8(%ebp)
- movl %edx,12(%ebp)
- movl %esi,16(%ebp)
- movl %edi,20(%ebp)
- popl %ebp
- xorl %eax,%eax
+__asm__ (".align 4\n\
+_rb_setjmp:\n\
+ pushl %ebp\n\
+ movl %esp,%ebp\n\
+ movl 8(%ebp),%ebp\n\
+ movl %eax,(%ebp)\n\
+ movl %ebx,4(%ebp)\n\
+ movl %ecx,8(%ebp)\n\
+ movl %edx,12(%ebp)\n\
+ movl %esi,16(%ebp)\n\
+ movl %edi,20(%ebp)\n\
+ popl %ebp\n\
+ xorl %eax,%eax\n\
ret");
#endif
#endif