diff --git a/ChangeLog b/ChangeLog
index e0764dae7a..18c6107faf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 19 17:31:20 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval_intern.h (TH_EXEC_TAG): need not to FLUSH_REGISTER_WINDOWS.
+	  [ruby-core:15871], [ruby-dev:34088]
+
 Wed Mar 19 14:53:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* complex.c (nucomp_to_s, nucomp_inspect): get rid of making
diff --git a/eval_intern.h b/eval_intern.h
index 0c50331b3e..52d2969844 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -142,8 +142,7 @@ char *strrchr(const char *, const char);
 #define PUSH_TAG() TH_PUSH_TAG(GET_THREAD())
 #define POP_TAG()      TH_POP_TAG()
 
-#define TH_EXEC_TAG() \
-  (FLUSH_REGISTER_WINDOWS, ruby_setjmp(_th->tag->buf))
+#define TH_EXEC_TAG() ruby_setjmp(_th->tag->buf)
 
 #define EXEC_TAG() \
   TH_EXEC_TAG()