Merge pull request #91 from lnussel/master

a VM for ARMv7l (Thank you, Ludwig -zjs)
This commit is contained in:
Zachary J. Slater authored and GitHub committed 2017-01-24 19:27:13 -10:00
commit 6e4e6e8925
2 files changed
+1220

No files matched your search

+10
View File
@@ -350,6 +350,9 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")
OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
HAVE_VM_COMPILED=true
endif
ifeq ($(ARCH),armv7l)
HAVE_VM_COMPILED=true
endif
ifeq ($(ARCH),alpha)
# According to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=410555
# -ffast-math will cause the client to die with SIGFPE on Alpha
@@ -1277,6 +1280,7 @@ targets: makedirs
@echo " VERSION: $(VERSION)"
@echo " COMPILE_PLATFORM: $(COMPILE_PLATFORM)"
@echo " COMPILE_ARCH: $(COMPILE_ARCH)"
@echo " HAVE_VM_COMPILED: $(HAVE_VM_COMPILED)"
@echo " CC: $(CC)"
ifeq ($(PLATFORM),mingw32)
@echo " WINDRES: $(WINDRES)"
@@ -2047,6 +2051,9 @@ ifeq ($(HAVE_VM_COMPILED),true)
ifeq ($(ARCH),sparc)
Q3OBJ += $(B)/client/vm_sparc.o
endif
ifeq ($(ARCH),armv7l)
Q3OBJ += $(B)/client/vm_armv7l.o
endif
endif
ifdef MINGW
@@ -2215,6 +2222,9 @@ ifeq ($(HAVE_VM_COMPILED),true)
ifeq ($(ARCH),sparc)
Q3DOBJ += $(B)/ded/vm_sparc.o
endif
ifeq ($(ARCH),armv7l)
Q3DOBJ += $(B)/client/vm_armv7l.o
endif
endif
ifdef MINGW
File diff suppressed because it is too large. Load diff