Mercurial > hg > release > icedtea7-forest-2.3 > hotspot

changeset 3850:adf1821ed249

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow ARM32 JIT to be disabled
author chrisphi
date Fri, 14 Mar 2014 16:53:01 +0000
parents 99ed2a7d2f87
children fba9303068df
files make/linux/makefiles/zeroshark.make
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/linux/makefiles/zeroshark.make	Mon Mar 10 22:26:05 2014 +0000
+++ b/make/linux/makefiles/zeroshark.make	Fri Mar 14 16:53:01 2014 +0000
@@ -26,7 +26,8 @@
 # Setup common to Zero (non-Shark) and Shark versions of VM
 
 ifeq ($(ZERO_LIBARCH),arm)
-
+# check to see if we are building the assembler jit or just zero.
+ifeq ($(ARM32JIT),true)
 Obj_Files += asm_helper.o
 Obj_Files += cppInterpreter_arm.o
 Obj_Files += thumb2.o
@@ -54,6 +55,7 @@
 	$(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
 
 endif
+endif
 
 %.o: %.S
 	@echo Assembling $<