summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-07 07:33:58 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-07 07:33:58 +0000
commit4bc92dfd9319e4a5c205895c864c90dc6854fdad (patch)
tree7d808862ffcf6a47fc6c5aafa73fd3aa2fcca84e
parentfa03457566d1af16b8cb3c6f8dc5e50d9a6828db (diff)
* include/ruby/defines.h (flush_register_windows): call "ta 0x03"
even on Linux/Sparc. [ruby-dev:31674] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@13391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--defines.h4
-rw-r--r--version.h2
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d4888c7e..2c2562812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 7 16:33:23 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * include/ruby/defines.h (flush_register_windows): call "ta 0x03"
+ even on Linux/Sparc. [ruby-dev:31674]
+
Fri Sep 7 16:09:39 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_type_progid, reg_enum_key,
diff --git a/defines.h b/defines.h
index f1a565acf..6b1fd6874 100644
--- a/defines.h
+++ b/defines.h
@@ -218,9 +218,7 @@ flush_register_windows(void)
#endif
# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
("flushw")
-# elif defined(linux) || defined(__linux__)
- ("ta 0x83")
-# else /* Solaris, OpenBSD, NetBSD, etc. */
+# else
("ta 0x03")
# endif /* trap always to flush register windows if we are on a Sparc system */
;
diff --git a/version.h b/version.h
index f70bfc0f4..20e0d480b 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-09-07"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20070907
-#define RUBY_PATCHLEVEL 95
+#define RUBY_PATCHLEVEL 96
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8