comparison make/linux/makefiles/vm.make @ 20345:f933a15469d4

8055006: Store original value of Min/MaxHeapFreeRatio Summary: Store the value set by the user and some makefile changes required to change the flags. Reviewed-by: sla, mchung, bchristi, jmasa, dholmes
author jwilhelm
date Mon, 28 Jul 2014 22:43:08 +0200
parents 01aa164323fa
children 7848fc12602b
comparison
equal deleted inserted replaced
20344:2fd0fd493045 20345:f933a15469d4
231 231
232 JVM_OBJ_FILES = $(Obj_Files) 232 JVM_OBJ_FILES = $(Obj_Files)
233 233
234 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES)) 234 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES))
235 235
236 mapfile : $(MAPFILE) vm.def 236 mapfile : $(MAPFILE) vm.def mapfile_ext
237 rm -f $@ 237 rm -f $@
238 awk '{ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") \ 238 awk '{ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") \
239 { system ("cat vm.def"); } \ 239 { system ("cat mapfile_ext"); system ("cat vm.def"); } \
240 else \ 240 else \
241 { print $$0 } \ 241 { print $$0 } \
242 }' > $@ < $(MAPFILE) 242 }' > $@ < $(MAPFILE)
243 243
244 mapfile_reorder : mapfile $(REORDERFILE) 244 mapfile_reorder : mapfile $(REORDERFILE)
245 rm -f $@ 245 rm -f $@
246 cat $^ > $@ 246 cat $^ > $@
247 247
248 vm.def: $(Res_Files) $(Obj_Files) 248 vm.def: $(Res_Files) $(Obj_Files)
249 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@ 249 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
250
251 mapfile_ext:
252 rm -f $@
253 touch $@
254 if [ -f $(HS_ALT_MAKE)/linux/makefiles/mapfile-ext ]; then \
255 cat $(HS_ALT_MAKE)/linux/makefiles/mapfile-ext > $@; \
256 fi
250 257
251 ifeq ($(JVM_VARIANT_ZEROSHARK), true) 258 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
252 STATIC_CXX = false 259 STATIC_CXX = false
253 else 260 else
254 ifeq ($(ZERO_LIBARCH), ppc64) 261 ifeq ($(ZERO_LIBARCH), ppc64)