diff --git a/ChangeLog b/ChangeLog
index 47767f5da2..49330e9462 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Oct 27 15:53:10 2009  Tanaka Akira  <akr@fsij.org>
+
+	* gc.h (SET_MACHINE_STACK_END): use __i386.
+	  Some compiler may not define __i386__.
+	  Solaris 64-bit Developer's Guide:
+	  http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view
+
 Tue Oct 27 15:44:48 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (getbinaryfile, list): call to_s to convert
diff --git a/gc.h b/gc.h
index 0bb70c5954..d835b9b6d2 100644
--- a/gc.h
+++ b/gc.h
@@ -4,7 +4,7 @@
 
 #if defined(__x86_64__) && defined(__GNUC__)
 #define SET_MACHINE_STACK_END(p) __asm__("movq\t%%rsp, %0" : "=r" (*p))
-#elif defined(__i386__) && defined(__GNUC__)
+#elif defined(__i386) && defined(__GNUC__)
 #define SET_MACHINE_STACK_END(p) __asm__("movl\t%%esp, %0" : "=r" (*p))
 #else
 NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));