archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 32544: [Backport #6005]

Browse source 
* 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
This commit is contained in:
naruse 2012-02-12 00:30:50 +00:00
parent f3ee8b01c9
commit 16c364121b
4 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> Sat Feb 11 08:06:12 2012 Tanaka Akira <akr@fsij.org>
* test/openssl/test_ssl.rb (test_multibyte_read_write): start server * test/openssl/test_ssl.rb (test_multibyte_read_write): start server

1
regint.h
View file

@ -48,7 +48,6 @@
#endif #endif
#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
(defined(__ppc__) && defined(__APPLE__)) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD86) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD86) || \
defined(__mc68020__) defined(__mc68020__)
#define PLATFORM_UNALIGNED_WORD_ACCESS #define PLATFORM_UNALIGNED_WORD_ACCESS

4
st.c
View file

@ -1002,7 +1002,9 @@ strhash(st_data_t arg)
#else #else
#ifndef UNALIGNED_WORD_ACCESS #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 # define UNALIGNED_WORD_ACCESS 1
# endif # endif
#endif #endif

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3" #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_YEAR 2012
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 11 #define RUBY_RELEASE_DAY 12
#include "ruby/version.h" #include "ruby/version.h"