1.1 --- a/make/linux/makefiles/vm.make Mon Mar 08 04:46:30 2010 -0800
1.2 +++ b/make/linux/makefiles/vm.make Tue Mar 09 11:02:39 2010 -0800
1.3 @@ -121,14 +121,21 @@
1.4
1.5 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES))
1.6
1.7 -mapfile : $(MAPFILE)
1.8 +mapfile : $(MAPFILE) vm.def
1.9 rm -f $@
1.10 - cat $^ > $@
1.11 + awk '{ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") \
1.12 + { system ("cat vm.def"); } \
1.13 + else \
1.14 + { print $$0 } \
1.15 + }' > $@ < $(MAPFILE)
1.16
1.17 mapfile_reorder : mapfile $(REORDERFILE)
1.18 rm -f $@
1.19 cat $^ > $@
1.20
1.21 +vm.def: $(Res_Files) $(Obj_Files)
1.22 + sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
1.23 +
1.24 ifeq ($(ZERO_LIBARCH), ppc64)
1.25 STATIC_CXX = false
1.26 else
