Mercurial > hg > truffle
diff make/solaris/makefiles/vm.make @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 12 Nov 2012 23:14:12 +0100 |
| parents | 4d6c13994690 37518f191ddb |
| children | 1baf7f1e3f23 |
line wrap: on
line diff
--- a/make/solaris/makefiles/vm.make Mon Nov 12 18:11:17 2012 +0100 +++ b/make/solaris/makefiles/vm.make Mon Nov 12 23:14:12 2012 +0100 @@ -259,7 +259,7 @@ } \ }' > $@ -mapfile_reorder : mapfile $(MAPFILE_DTRACE_OPT) $(REORDERFILE) +mapfile_extended : mapfile $(MAPFILE_DTRACE_OPT) rm -f $@ cat $^ > $@ @@ -272,7 +272,7 @@ LIBS_VM = $(LIBS) else LIBJVM.o = $(JVM_OBJ_FILES) - LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder + LIBJVM_MAPFILE$(LDNOMAP) = mapfile_extended LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE)) LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM)) ifndef USE_GCC @@ -296,7 +296,7 @@ ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) @echo Linking vm... $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK) - $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) + $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM) $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK) $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)