From 16c364121b8fe725087dadad8c19f45a4eddc958 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 12 Feb 2012 00:30:50 +0000
Subject: [PATCH] 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
---
 ChangeLog | 8 ++++++++
 regint.h  | 1 -
 st.c      | 4 +++-
 version.h | 6 +++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 472f317345..1f1646432b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/regint.h b/regint.h
index 631b2f471a..cd3c2a1035 100644
--- a/regint.h
+++ b/regint.h
@@ -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
diff --git a/st.c b/st.c
index 56ee31e281..fda5784f98 100644
--- a/st.c
+++ b/st.c
@@ -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
diff --git a/version.h b/version.h
index e891ccad2a..2655f1d203 100644
--- a/version.h
+++ b/version.h
@@ -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"