summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-20 04:09:37 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-20 04:09:37 +0000
commit9c49753182f2fc5e8d8e26c93c3e47ccfe85dba7 (patch)
treed08be914bd9f17bb123c4b85672c8735ad65aa6d
parent4574aeb70d99095b0791f5d23a5c34673829e948 (diff)
* include/ruby/defines.h (flush_register_windows): use software
trap on Debian Sparc 32-bit userspace. [Bug #5244] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33492 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/defines.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b096c0d38f..16e6bf939d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 20 13:09:35 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/defines.h (flush_register_windows): use software
+ trap on Debian Sparc 32-bit userspace. [Bug #5244]
+
Thu Oct 20 14:28:22 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* test/openssl/test_pkcs5.rb: add RFC 6070 tests for PBKDF2 with
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index c81efd56fd..875e870ed3 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -205,7 +205,7 @@ flush_register_windows(void)
#ifdef __GNUC__
volatile
#endif
-# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
+# if SIZEOF_VOIDP > 4 /* workaround for Debian Sparc quirk */
("flushw")
# else
("ta 0x03")