diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-12 00:30:50 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-12 00:30:50 +0000 |
commit | 16c364121b8fe725087dadad8c19f45a4eddc958 (patch) | |
tree | ab87f34d7680ad8910cb011ab7441cf4a31bbf8c | |
parent | f3ee8b01c935be9691e0ded2fabc9cdef06d16b4 (diff) |
merge revision(s) 32544: [Backport #6005]
* regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): Power PC does not
allow unaligned word access.
* st.c (UNALIGNED_WORD_ACCESS): x86_64 allows unaligned word
access as well as i386.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | regint.h | 1 | ||||
-rw-r--r-- | st.c | 4 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Sun Feb 12 09:29:28 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): Power PC does not + allow unaligned word access. + + * st.c (UNALIGNED_WORD_ACCESS): x86_64 allows unaligned word + access as well as i386. + Sat Feb 11 08:06:12 2012 Tanaka Akira <akr@fsij.org> * test/openssl/test_ssl.rb (test_multibyte_read_write): start server @@ -48,7 +48,6 @@ #endif #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ - (defined(__ppc__) && defined(__APPLE__)) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD86) || \ defined(__mc68020__) #define PLATFORM_UNALIGNED_WORD_ACCESS @@ -1002,7 +1002,9 @@ strhash(st_data_t arg) #else #ifndef UNALIGNED_WORD_ACCESS -# if defined __i386__ || defined _M_IX86 +# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD86) || \ + defined(__mc68020__) # define UNALIGNED_WORD_ACCESS 1 # endif #endif @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 95 +#define RUBY_PATCHLEVEL 96 -#define RUBY_RELEASE_DATE "2012-02-11" +#define RUBY_RELEASE_DATE "2012-02-12" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" |