Mercurial > hg > truffle

comparison make/linux/makefiles/vm.make @ 7482:989155e2d07a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hs25-b15.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Jan 2013 01:34:24 +0100
parents 57ccc2bb5868 892acf0431ef
children 5fc51c1ecdeb
comparison
equal deleted inserted replaced
7381:6761a8f854a4 7482:989155e2d07a
136 #---------------------------------------------------------------------- 136 #----------------------------------------------------------------------
137 # JVM 137 # JVM
138 138
139 JVM = jvm 139 JVM = jvm
140 LIBJVM = lib$(JVM).so 140 LIBJVM = lib$(JVM).so
141 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
142 141
143 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo 142 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
144 LIBJVM_DIZ = lib$(JVM).diz 143 LIBJVM_DIZ = lib$(JVM).diz
145 LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo
146 LIBJVM_G_DIZ = lib$(JVM)$(G_SUFFIX).diz
147 144
148 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt graal 145 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt graal
149 146
150 SOURCE_PATHS=\ 147 SOURCE_PATHS=\
151 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ 148 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
332 $(LINK_LIB.CXX/PRE_HOOK) \ 329 $(LINK_LIB.CXX/PRE_HOOK) \
333 $(LINK_VM) $(LD_SCRIPT_FLAG) \ 330 $(LINK_VM) $(LD_SCRIPT_FLAG) \
334 $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \ 331 $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \
335 $(LINK_LIB.CXX/POST_HOOK) \ 332 $(LINK_LIB.CXX/POST_HOOK) \
336 rm -f $@.1; ln -s $@ $@.1; \ 333 rm -f $@.1; ln -s $@ $@.1; \
337 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
338 if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \ 334 if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \
339 if [ -x /usr/sbin/selinuxenabled ] ; then \ 335 if [ -x /usr/sbin/selinuxenabled ] ; then \
340 /usr/sbin/selinuxenabled; \ 336 /usr/sbin/selinuxenabled; \
341 if [ $$? = 0 ] ; then \ 337 if [ $$? = 0 ] ; then \
342 /usr/bin/chcon -t textrel_shlib_t $@; \ 338 /usr/bin/chcon -t textrel_shlib_t $@; \
357 ifeq ($(STRIP_POLICY),min_strip) 353 ifeq ($(STRIP_POLICY),min_strip)
358 $(QUIETLY) $(STRIP) -g $@ 354 $(QUIETLY) $(STRIP) -g $@
359 # implied else here is no stripping at all 355 # implied else here is no stripping at all
360 endif 356 endif
361 endif 357 endif
362 $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
363 ifeq ($(ZIP_DEBUGINFO_FILES),1) 358 ifeq ($(ZIP_DEBUGINFO_FILES),1)
364 $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO) 359 $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
365 $(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO) 360 $(RM) $(LIBJVM_DEBUGINFO)
366 [ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); }
367 endif 361 endif
368 endif 362 endif
369 363
370 DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR) 364 DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
371 DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM) 365 DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)