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

Merge with hs25-b15.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Jan 2013 01:34:24 +0100
parents 1baf7f1e3f23 892acf0431ef
children a7a93887b4c4
comparison
equal deleted inserted replaced
7381:6761a8f854a4 7482:989155e2d07a
155 #---------------------------------------------------------------------- 155 #----------------------------------------------------------------------
156 # JVM 156 # JVM
157 157
158 JVM = jvm 158 JVM = jvm
159 LIBJVM = lib$(JVM).so 159 LIBJVM = lib$(JVM).so
160 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
161 160
162 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo 161 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
163 LIBJVM_DIZ = lib$(JVM).diz 162 LIBJVM_DIZ = lib$(JVM).diz
164 LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo
165 LIBJVM_G_DIZ = lib$(JVM)$(G_SUFFIX).diz
166 163
167 SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt graal 164 SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt graal
168 165
169 SOURCE_PATHS=\ 166 SOURCE_PATHS=\
170 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ 167 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
295 @echo Linking vm... 292 @echo Linking vm...
296 $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK) 293 $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK)
297 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM) 294 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM)
298 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK) 295 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK)
299 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 296 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1
300 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
301 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
302 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 297 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
303 # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. 298 # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
304 # Clear the SHF_ALLOC flag (if set) from empty section headers. 299 # Clear the SHF_ALLOC flag (if set) from empty section headers.
305 # An empty section header has sh_addr == 0 and sh_size == 0. 300 # An empty section header has sh_addr == 0 and sh_size == 0.
306 # This problem has only been seen on Solaris X64, but we call this tool 301 # This problem has only been seen on Solaris X64, but we call this tool
317 ifeq ($(STRIP_POLICY),min_strip) 312 ifeq ($(STRIP_POLICY),min_strip)
318 $(QUIETLY) $(STRIP) -x $@ 313 $(QUIETLY) $(STRIP) -x $@
319 # implied else here is no stripping at all 314 # implied else here is no stripping at all
320 endif 315 endif
321 endif 316 endif
322 $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
323 ifeq ($(ZIP_DEBUGINFO_FILES),1) 317 ifeq ($(ZIP_DEBUGINFO_FILES),1)
324 $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO) 318 $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
325 $(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO) 319 $(RM) $(LIBJVM_DEBUGINFO)
326 [ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); }
327 endif 320 endif
328 endif 321 endif
329 endif # filter -sbfast -xsbfast 322 endif # filter -sbfast -xsbfast
330 323
331 324