Mercurial > hg > truffle

comparison make/solaris/makefiles/vm.make @ 7066:7d815d842ee0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 23 Nov 2012 11:50:27 +0100
parents e522a00b91aa
children 1baf7f1e3f23
comparison
equal deleted inserted replaced
7065:cfacf5d5bade 7066:7d815d842ee0
257 } else { \ 257 } else { \
258 print $$0; \ 258 print $$0; \
259 } \ 259 } \
260 }' > $@ 260 }' > $@
261 261
262 mapfile_reorder : mapfile $(MAPFILE_DTRACE_OPT) $(REORDERFILE) 262 mapfile_extended : mapfile $(MAPFILE_DTRACE_OPT)
263 rm -f $@ 263 rm -f $@
264 cat $^ > $@ 264 cat $^ > $@
265 265
266 vm.def: $(Obj_Files) 266 vm.def: $(Obj_Files)
267 sh $(GAMMADIR)/make/solaris/makefiles/build_vm_def.sh *.o > $@ 267 sh $(GAMMADIR)/make/solaris/makefiles/build_vm_def.sh *.o > $@
270 LIBJVM.o = 270 LIBJVM.o =
271 LIBJVM_MAPFILE = 271 LIBJVM_MAPFILE =
272 LIBS_VM = $(LIBS) 272 LIBS_VM = $(LIBS)
273 else 273 else
274 LIBJVM.o = $(JVM_OBJ_FILES) 274 LIBJVM.o = $(JVM_OBJ_FILES)
275 LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder 275 LIBJVM_MAPFILE$(LDNOMAP) = mapfile_extended
276 LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE)) 276 LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
277 LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM)) 277 LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM))
278 ifndef USE_GCC 278 ifndef USE_GCC
279 LIBS_VM = $(LIBS) 279 LIBS_VM = $(LIBS)
280 else 280 else
294 # making the library: 294 # making the library:
295 $(LIBJVM): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(LIBJVM.o) $(LIBJVM_MAPFILE) 295 $(LIBJVM): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(LIBJVM.o) $(LIBJVM_MAPFILE)
296 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) 296 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
297 @echo Linking vm... 297 @echo Linking vm...
298 $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK) 298 $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK)
299 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) 299 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM)
300 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK) 300 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK)
301 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 301 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1
302 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) 302 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
303 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 303 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
304 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 304 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)