summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2015-01-03 15:28:33 +0100
committerMike Pall <mike>2015-01-03 15:28:33 +0100
commitf307d0adafc7e35d2dc1c461d50f6572c5e6bca8 (patch)
tree0ce471fc05dad49f3e5d60338034ff8a4a9904f8 /src/Makefile
parentcb481ddc8f9d92913ba07d998f4274bbf9711077 (diff)
downloadluajit-f307d0adafc7e35d2dc1c461d50f6572c5e6bca8.tar.gz
luajit-f307d0adafc7e35d2dc1c461d50f6572c5e6bca8.tar.bz2
luajit-f307d0adafc7e35d2dc1c461d50f6572c5e6bca8.zip
ARM64: Add build infrastructure and initial port of interpreter.
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 491aa75d..88dc8166 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -48,6 +48,7 @@ CCOPT= -O2 -fomit-frame-pointer
48CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse 48CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
49CCOPT_x64= 49CCOPT_x64=
50CCOPT_arm= 50CCOPT_arm=
51CCOPT_arm64=
51CCOPT_ppc= 52CCOPT_ppc=
52CCOPT_ppcspe= 53CCOPT_ppcspe=
53CCOPT_mips= 54CCOPT_mips=
@@ -217,6 +218,9 @@ else
217ifneq (,$(findstring LJ_TARGET_ARM ,$(TARGET_TESTARCH))) 218ifneq (,$(findstring LJ_TARGET_ARM ,$(TARGET_TESTARCH)))
218 TARGET_LJARCH= arm 219 TARGET_LJARCH= arm
219else 220else
221ifneq (,$(findstring LJ_TARGET_ARM64 ,$(TARGET_TESTARCH)))
222 TARGET_LJARCH= arm64
223else
220ifneq (,$(findstring LJ_TARGET_PPC ,$(TARGET_TESTARCH))) 224ifneq (,$(findstring LJ_TARGET_PPC ,$(TARGET_TESTARCH)))
221 TARGET_LJARCH= ppc 225 TARGET_LJARCH= ppc
222else 226else
@@ -236,6 +240,7 @@ endif
236endif 240endif
237endif 241endif
238endif 242endif
243endif
239 244
240ifneq (,$(findstring LJ_TARGET_PS3 1,$(TARGET_TESTARCH))) 245ifneq (,$(findstring LJ_TARGET_PS3 1,$(TARGET_TESTARCH)))
241 TARGET_SYS= PS3 246 TARGET_SYS= PS3
@@ -402,7 +407,9 @@ ifeq (Windows,$(TARGET_SYS))
402 DASM_AFLAGS+= -D WIN 407 DASM_AFLAGS+= -D WIN
403endif 408endif
404ifeq (x64,$(TARGET_LJARCH)) 409ifeq (x64,$(TARGET_LJARCH))
405 DASM_ARCH= x86 410 ifeq (,$(findstring LJ_FR2 1,$(TARGET_TESTARCH)))
411 DASM_ARCH= x86
412 endif
406else 413else
407ifeq (arm,$(TARGET_LJARCH)) 414ifeq (arm,$(TARGET_LJARCH))
408 ifeq (iOS,$(TARGET_SYS)) 415 ifeq (iOS,$(TARGET_SYS))