Mercurial > hg > release > icedtea6-1.13

view patches/pr3213-conditional_arm32jit.patch @ 3279:336dc5eedcea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR3213: Disable ARM32 JIT by default 2016-12-29 Andrew John Hughes <gnu.andrew@member.fsf.org> PR3213: Disable ARM32 JIT by default * Makefile.am: (ICEDTEA_PATCHES): Add patch. * patches/pr3213-conditional_arm32jit.patch: Backport conditionalisation of ARM32 JIT port from IcedTea 2.x. 2014-02-19 Andrew John Hughes <gnu.andrew@member.fsf.org> PR3213: Disable ARM32 JIT by default * INSTALL: Document ARM32 JIT and --enable-arm32-jit option. * Makefile.am: (ARM32JIT_STATUS): Set based on ENABLE_ARM32JIT. (ICEDTEA_ENV): Pass ARM32JIT to OpenJDK build, using value of ${ARM32JIT_STATUS}. * NEWS: Updated. * acinclude.m4: (IT_ENABLE_ARM32JIT): Allow the ARM32 JIT to be enabled. * configure.ac: Invoke IT_ENABLE_ARM32JIT macro.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Tue, 03 Jan 2017 05:55:47 +0000
parents
children
line wrap: on
line source

# HG changeset patch
# User chrisphi
# Date 1392756328 0
#      Tue Feb 18 20:45:28 2014 +0000
# Node ID 0a9100ca5a41c8430aa9a51ef2ca5dd4d6f38322
# Parent  c9da84d02a614d10d2118d7725b58b42b02fbbc3
ARM32 assembler update for hsx24. Use ARM32JIT to turn it on/off.

diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
@@ -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 @@
 	$(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
 
 endif
+endif
 
 %.o: %.S
 	@echo Assembling $<