diff --git a/ChangeLog b/ChangeLog
index b1d60c35bd..ce3cbdf7f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 31 10:49:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_exec.c: remove conditions for clang
+	  because clang version 3.0 (trunk 132165) doesn't need them.
+
 Mon May 30 22:19:33 2011  Tanaka Akira  <akr@fsij.org>
 
 	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring): don't
diff --git a/vm_exec.c b/vm_exec.c
index 82a42679a4..fdfaa29823 100644
--- a/vm_exec.c
+++ b/vm_exec.c
@@ -11,7 +11,7 @@
 
 #include <math.h>
 
-#if (VMDEBUG > 0) || defined(__clang)
+#if VMDEBUG > 0
 #define DECL_SC_REG(type, r, reg) register type reg_##r
 
 #elif __GNUC__ && __x86_64__
@@ -40,7 +40,7 @@ vm_exec_core(rb_thread_t *th, VALUE initial)
 
 #if OPT_STACK_CACHING
 #if 0
-#elif __GNUC__ && __x86_64 && !__clang__
+#elif __GNUC__ && __x86_64__
     DECL_SC_REG(VALUE, a, "12");
     DECL_SC_REG(VALUE, b, "13");
 #else
@@ -49,12 +49,12 @@ vm_exec_core(rb_thread_t *th, VALUE initial)
 #endif
 #endif
 
-#if __GNUC__ && __i386__ && !__clang__
+#if __GNUC__ && __i386__
     DECL_SC_REG(VALUE *, pc, "di");
     DECL_SC_REG(rb_control_frame_t *, cfp, "si");
 #define USE_MACHINE_REGS 1
 
-#elif __GNUC__ && __x86_64__ && !__clang__
+#elif __GNUC__ && __x86_64__
     DECL_SC_REG(VALUE *, pc, "14");
     DECL_SC_REG(rb_control_frame_t *, cfp, "15");
 #define USE_MACHINE_REGS 1