From 6163a90d6d09e53e8a22079e95af5ecc8b97e9cc Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Tue, 8 Dec 2009 21:28:49 +0100
Subject: [PATCH] Remove asm auto-detection due to cross-compilation issues.

---
 src/Makefile  |  5 ++++-
 src/buildvm.c | 10 ----------
 src/buildvm.h |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index c0deb774..a4a8152b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -231,7 +231,7 @@ HOST_T= $(BUILDVM_T)
 LJVM_S= lj_vm.s
 LJVM_O= lj_vm.o
 LJVM_BOUT= $(LJVM_S)
-LJVM_MODE= asm
+LJVM_MODE= elfasm
 
 LJLIB_O= lib_base.o lib_math.o lib_bit.o lib_string.o lib_table.o \
 	 lib_io.o lib_os.o lib_package.o lib_debug.o lib_jit.o
@@ -293,6 +293,9 @@ ifeq (Windows,$(TARGET_SYS))
     TARGET_XCFLAGS+= -DLUA_BUILD_AS_DLL
   endif
 endif
+ifeq (Darwin,$(TARGET_SYS))
+  LJVM_MODE= machasm
+endif
 
 ifeq (static,$(BUILDMODE))
   TARGET_DYNCC= @:
diff --git a/src/buildvm.c b/src/buildvm.c
index 4aba39d4..94e2d9a2 100644
--- a/src/buildvm.c
+++ b/src/buildvm.c
@@ -398,16 +398,6 @@ int main(int argc, char **argv)
   }
 
   switch (ctx->mode) {
-  case BUILD_asm:
-#if defined(__ELF__)
-    ctx->mode = BUILD_elfasm;
-#elif defined(__MACH__)
-    ctx->mode = BUILD_machasm;
-#else
-    fprintf(stderr,"Error: auto-guessing the system assembler failed\n");
-    return 1;
-#endif
-    /* fallthrough */
   case BUILD_elfasm:
   case BUILD_coffasm:
   case BUILD_machasm:
diff --git a/src/buildvm.h b/src/buildvm.h
index 53c820ad..4bf4e56d 100644
--- a/src/buildvm.h
+++ b/src/buildvm.h
@@ -49,7 +49,7 @@ struct dasm_State;
 #endif
 
 #define BUILDDEF(_) \
-  _(asm) _(elfasm) _(coffasm) _(machasm) BUILDDEFX(_) _(raw) \
+  _(elfasm) _(coffasm) _(machasm) BUILDDEFX(_) _(raw) \
   _(ffdef) _(libdef) _(recdef) _(vmdef) \
   _(folddef)