ARM: Fix ABI and build issues for iOS. Now works on iOS 3.0+.

1 files changed, 18 insertions, 0 deletions

diff --git a/src/Makefile b/src/Makefile
index 43d926e8..4e426c30 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -283,6 +283,16 @@ ifeq (Darwin,$(TARGET_SYS))
     TARGET_XSHLDFLAGS+= -image_base 7fff04c4a000
   endif
 else
+ifeq (iOS,$(TARGET_SYS))
+  TARGET_STRIP+= -x
+  TARGET_AR+= 2>/dev/null
+  TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
+  HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_OSX
+  ifneq (,$(TARGET_DYNXLDOPTS))
+    TARGET_DYNXLDOPTS=
+    TARGET_XSHLDFLAGS+= -install_name $(PREFIX)/lib/$(TARGET_DYLIBNAME)
+  endif
+else
   TARGET_XLDFLAGS+= -Wl,-E
   ifeq (Linux,$(TARGET_SYS))
     TARGET_XLIBS+= -ldl
@@ -292,6 +302,7 @@ else
   endif
 endif
 endif
+endif
 
 ifneq (,$(CCDEBUG))
   TARGET_STRIP= @:
@@ -390,6 +401,9 @@ endif
 ifeq (Darwin,$(TARGET_SYS))
   LJVM_MODE= machasm
 endif
+ifeq (iOS,$(TARGET_SYS))
+  LJVM_MODE= machasm
+endif
 
 ifeq (static,$(BUILDMODE))
   TARGET_DYNCC= @:
@@ -409,6 +423,10 @@ ifeq (Darwin,$(TARGET_SYS))
   TARGET_DYNCC= @:
   LJVMCORE_DYNO= $(LJVMCORE_O)
 endif
+ifeq (iOS,$(TARGET_SYS))
+  TARGET_DYNCC= @:
+  LJVMCORE_DYNO= $(LJVMCORE_O)
+endif
 endif
 endif