make/solaris/makefiles/vm.make

@@ -239,17 +239,23 @@
 
 JVM_OBJ_FILES = $(Obj_Files) $(DTRACE_OBJS)
 
 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES))
 
-mapfile : $(MAPFILE) $(MAPFILE_DTRACE_OPT) vm.def mapfile_ext
+MAPFILE_SHARE  := $(GAMMADIR)/make/share/makefiles/mapfile-vers
+
+MAPFILE_EXT_SRC := $(HS_ALT_MAKE)/share/makefiles/mapfile-ext
+ifneq ("$(wildcard $(MAPFILE_EXT_SRC))","")
+MAPFILE_EXT     := $(MAPFILE_EXT_SRC)
+endif
+
+mapfile : $(MAPFILE) $(MAPFILE_SHARE) vm.def $(MAPFILE_EXT)
         rm -f $@
         cat $(MAPFILE) $(MAPFILE_DTRACE_OPT) \
             | $(NAWK) '{                                         \
                       if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") {  \
-                          system ("cat mapfile_ext");            \
-                          system ("cat vm.def");                 \
+                          system ("cat ${MAPFILE_SHARE} $(MAPFILE_EXT) vm.def"); \
                       } else {                                   \
                           print $$0;                             \
                       }                                          \
                   }' > $@
 

@@ -258,16 +264,10 @@
         cat $^ > $@
 
 vm.def: $(Obj_Files)
         sh $(GAMMADIR)/make/solaris/makefiles/build_vm_def.sh *.o > $@
 
-mapfile_ext:
-        rm -f $@
-        touch $@
-        if [ -f $(HS_ALT_MAKE)/solaris/makefiles/mapfile-ext ]; then \
-          cat $(HS_ALT_MAKE)/solaris/makefiles/mapfile-ext > $@; \
-        fi
 
 ifeq ($(LINK_INTO),AOUT)
   LIBJVM.o                 =
   LIBJVM_MAPFILE           =
   LIBS_VM                  = $(LIBS)