1.1 --- a/make/linux/makefiles/vm.make Wed Jun 04 10:01:28 2014 +0200
1.2 +++ b/make/linux/makefiles/vm.make Mon Jul 28 22:43:08 2014 +0200
1.3 @@ -233,10 +233,10 @@
1.4
1.5 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES))
1.6
1.7 -mapfile : $(MAPFILE) vm.def
1.8 +mapfile : $(MAPFILE) vm.def mapfile_ext
1.9 rm -f $@
1.10 awk '{ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") \
1.11 - { system ("cat vm.def"); } \
1.12 + { system ("cat mapfile_ext"); system ("cat vm.def"); } \
1.13 else \
1.14 { print $$0 } \
1.15 }' > $@ < $(MAPFILE)
1.16 @@ -248,6 +248,13 @@
1.17 vm.def: $(Res_Files) $(Obj_Files)
1.18 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
1.19
1.20 +mapfile_ext:
1.21 + rm -f $@
1.22 + touch $@
1.23 + if [ -f $(HS_ALT_MAKE)/linux/makefiles/mapfile-ext ]; then \
1.24 + cat $(HS_ALT_MAKE)/linux/makefiles/mapfile-ext > $@; \
1.25 + fi
1.26 +
1.27 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
1.28 STATIC_CXX = false
1.29 else
