Mercurial > hg > graal-jvmci-8

comparison make/bsd/makefiles/vm.make @ 13086:096c224171c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 20 Nov 2013 00:10:38 +0100
parents 6a9f50777e6d f509b8f4699b
children ec0f6ecc0b7a
comparison
equal deleted inserted replaced
12782:92b7ec34ddfa 13086:096c224171c4
58 # set INCLUDES for C preprocessor. 58 # set INCLUDES for C preprocessor.
59 Src_Dirs_I += $(GENERATED) 59 Src_Dirs_I += $(GENERATED)
60 # The order is important for the precompiled headers to work. 60 # The order is important for the precompiled headers to work.
61 INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%) 61 INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
62 62
63 ifeq (${VERSION}, debug) 63 # SYMFLAG is used by {jsig,saproc}.make
64 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
65 # always build with debug info when we can create .dSYM/.debuginfo files
64 SYMFLAG = -g 66 SYMFLAG = -g
65 else 67 else
66 SYMFLAG = 68 ifeq (${VERSION}, debug)
69 SYMFLAG = -g
70 else
71 SYMFLAG =
72 endif
67 endif 73 endif
68 74
69 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined 75 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
70 # in $(GAMMADIR)/make/defs.make 76 # in $(GAMMADIR)/make/defs.make
71 ifeq ($(HOTSPOT_BUILD_VERSION),) 77 ifeq ($(HOTSPOT_BUILD_VERSION),)
149 LIBJVM = lib$(JVM).dylib 155 LIBJVM = lib$(JVM).dylib
150 CFLAGS += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE 156 CFLAGS += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE
151 ifeq (${VERSION}, $(filter ${VERSION}, debug fastdebug)) 157 ifeq (${VERSION}, $(filter ${VERSION}, debug fastdebug))
152 CFLAGS += -DALLOW_OPERATOR_NEW_USAGE 158 CFLAGS += -DALLOW_OPERATOR_NEW_USAGE
153 endif 159 endif
160
161 LIBJVM_DEBUGINFO = lib$(JVM).dylib.dSYM
162 LIBJVM_DIZ = lib$(JVM).diz
154 else 163 else
155 LIBJVM = lib$(JVM).so 164 LIBJVM = lib$(JVM).so
165
166 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
167 LIBJVM_DIZ = lib$(JVM).diz
156 endif 168 endif
157 169
158 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt graal 170 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt graal
159 171
160 SOURCE_PATHS=\ 172 SOURCE_PATHS=\
340 $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \ 352 $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \
341 $(LINK_LIB.CXX/POST_HOOK) \ 353 $(LINK_LIB.CXX/POST_HOOK) \
342 rm -f $@.1; ln -s $@ $@.1; \ 354 rm -f $@.1; ln -s $@ $@.1; \
343 } 355 }
344 356
345 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) 357 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
358 ifeq ($(OS_VENDOR), Darwin)
359 $(DSYMUTIL) $@
360 ifeq ($(ZIP_DEBUGINFO_FILES),1)
361 $(ZIPEXE) -q -r -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
362 $(RM) -r $(LIBJVM_DEBUGINFO)
363 endif
364 else
365 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
366 $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
367 ifeq ($(STRIP_POLICY),all_strip)
368 $(QUIETLY) $(STRIP) $@
369 else
370 ifeq ($(STRIP_POLICY),min_strip)
371 $(QUIETLY) $(STRIP) -g $@
372 # implied else here is no stripping at all
373 endif
374 endif
375 ifeq ($(ZIP_DEBUGINFO_FILES),1)
376 $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
377 $(RM) $(LIBJVM_DEBUGINFO)
378 endif
379 endif
380 endif
381
382 DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
383 DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)
384 DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO)
385 DEST_JVM_DIZ = $(DEST_SUBDIR)/$(LIBJVM_DIZ)
346 386
347 install_jvm: $(LIBJVM) 387 install_jvm: $(LIBJVM)
348 @echo "Copying $(LIBJVM) to $(DEST_JVM)" 388 @echo "Copying $(LIBJVM) to $(DEST_JVM)"
389 ifeq ($(OS_VENDOR), Darwin)
390 $(QUIETLY) test -d $(LIBJVM_DEBUGINFO) && \
391 cp -f -r $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
392 else
393 $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \
394 cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
395 endif
396 $(QUIETLY) test -f $(LIBJVM_DIZ) && \
397 cp -f $(LIBJVM_DIZ) $(DEST_JVM_DIZ)
349 $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done" 398 $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"
350 399
351 #---------------------------------------------------------------------- 400 #----------------------------------------------------------------------
352 # Other files 401 # Other files
353 402
358 include $(MAKEFILES_DIR)/saproc.make 407 include $(MAKEFILES_DIR)/saproc.make
359 408
360 #---------------------------------------------------------------------- 409 #----------------------------------------------------------------------
361 410
362 ifeq ($(OS_VENDOR), Darwin) 411 ifeq ($(OS_VENDOR), Darwin)
363 $(LIBJVM).dSYM: $(LIBJVM)
364 dsymutil $(LIBJVM)
365
366 # no libjvm_db for macosx 412 # no libjvm_db for macosx
367 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(LIBJVM).dSYM 413 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck
368 echo "Doing vm.make build:" 414 echo "Doing vm.make build:"
369 else 415 else
370 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) 416 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)
371 endif 417 endif
372 418