From e80478c44b7e4bf32a509c480edb39bd39ede51b Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Wed, 19 Oct 2011 18:14:46 +0200
Subject: Rearrange defines for workarounds to embedded operating systems.

---
 src/buildvm_asm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/buildvm_asm.c')

diff --git a/src/buildvm_asm.c b/src/buildvm_asm.c
index 94e62ce7..6a860c9f 100644
--- a/src/buildvm_asm.c
+++ b/src/buildvm_asm.c
@@ -191,8 +191,7 @@ void emit_asm(BuildCtx *ctx)
   if (ctx->mode != BUILD_machasm)
     fprintf(ctx->fp, ".Lbegin:\n");
 
-#if LJ_TARGET_ARM && defined(__GNUC__) && !defined(__symbian__) && \
-    !LJ_TARGET_OSX
+#if LJ_TARGET_ARM && defined(__GNUC__) && !defined(LUAJIT_NO_UNWIND)
   /* This should really be moved into buildvm_arm.dasc. */
   fprintf(ctx->fp,
 	  ".fnstart\n"
@@ -228,8 +227,7 @@ void emit_asm(BuildCtx *ctx)
 #endif
   }
 
-#if LJ_TARGET_ARM && defined(__GNUC__) && !defined(__symbian__) && \
-    !LJ_TARGET_OSX
+#if LJ_TARGET_ARM && defined(__GNUC__) && !defined(LUAJIT_NO_UNWIND)
   fprintf(ctx->fp,
 	  ".globl lj_err_unwind_arm\n"
 	  ".personality lj_err_unwind_arm\n"
-- 
cgit v1.2.3-55-g6feb