From 5ebe4990baa2a0fcbd8c22cf813a18082a7eb961 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Tue, 9 Oct 2012 21:42:42 +0200
Subject: [PATCH] Add LJ_TARGET_UNALIGNED.

---
 src/lj_arch.h     | 6 ++++++
 src/lj_opt_fold.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lj_arch.h b/src/lj_arch.h
index 4df3e8d2..6811e1b3 100644
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -131,6 +131,7 @@
 #define LJ_TARGET_EHRETREG	0
 #define LJ_TARGET_MASKSHIFT	1
 #define LJ_TARGET_MASKROT	1
+#define LJ_TARGET_UNALIGNED	1
 #define LJ_ARCH_NUMMODE		LJ_NUMMODE_SINGLE_DUAL
 
 #elif LUAJIT_TARGET == LUAJIT_ARCH_X64
@@ -145,6 +146,7 @@
 #define LJ_TARGET_JUMPRANGE	31	/* +-2^31 = +-2GB */
 #define LJ_TARGET_MASKSHIFT	1
 #define LJ_TARGET_MASKROT	1
+#define LJ_TARGET_UNALIGNED	1
 #define LJ_ARCH_NUMMODE		LJ_NUMMODE_SINGLE_DUAL
 
 #elif LUAJIT_TARGET == LUAJIT_ARCH_ARM
@@ -388,6 +390,10 @@
 #define LJ_64			1
 #endif
 
+#ifndef LJ_TARGET_UNALIGNED
+#define LJ_TARGET_UNALIGNED	0
+#endif
+
 /* Various workarounds for embedded operating systems. */
 #if defined(__ANDROID__) || defined(__symbian__)
 #define LUAJIT_NO_LOG2
diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c
index 23199c43..b8c67d78 100644
--- a/src/lj_opt_fold.c
+++ b/src/lj_opt_fold.c
@@ -1800,7 +1800,7 @@ LJFOLDF(merge_eqne_snew_kgc)
   int32_t len = (int32_t)kstr->len;
   lua_assert(irt_isstr(fins->t));
 
-#if LJ_TARGET_X86ORX64
+#if LJ_TARGET_UNALIGNED
 #define FOLD_SNEW_MAX_LEN	4  /* Handle string lengths 0, 1, 2, 3, 4. */
 #define FOLD_SNEW_TYPE8		IRT_I8	/* Creates shorter immediates. */
 #else