2 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b60aca8fb7..5b448df4e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Jan 15 20:20:20 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): The value of
+	  UNALIGNED_WORD_ACCESS should be used to determine whether
+	  unaligned word access is allowed or not. After this commit,
+	  ./configure CPPFLAGS="-DUNALIGNED_WORD_ACCESS=0" disables
+	  unaligned word access even on platforms that support the feature.
+
 Fri Jan 15 16:12:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (string1): reset heredoc indent fore each string leteral
diff --git a/regint.h b/regint.h
index 9fda5509a9..80d3523126 100644
--- a/regint.h
+++ b/regint.h
@@ -48,10 +48,18 @@
 #endif
 #endif
 
+#ifndef UNALIGNED_WORD_ACCESS
 #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
     defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
     defined(__powerpc64__) || \
     defined(__mc68020__)
+#define UNALIGNED_WORD_ACCESS 1
+#else
+#define UNALIGNED_WORD_ACCESS 0
+#endif
+#endif
+
+#if UNALIGNED_WORD_ACCESS
 #define PLATFORM_UNALIGNED_WORD_ACCESS
 #endif