Mercurial > hg > graal-jvmci-8

comparison make/linux/makefiles/vm.make @ 4137:04b9a2566eec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents 44da449fc29c da0999c4b733
children 723df37192d6
comparison
equal deleted inserted replaced
3737:9dc19b7d89a3 4137:04b9a2566eec
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 ifneq ($(OBJCOPY),)
65 # always build with debug info when we can create .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),)
121 # JVM 127 # JVM
122 128
123 JVM = jvm 129 JVM = jvm
124 LIBJVM = lib$(JVM).so 130 LIBJVM = lib$(JVM).so
125 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so 131 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
132
133 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
134 LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo
126 135
127 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt 136 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
128 137
129 SOURCE_PATHS=\ 138 SOURCE_PATHS=\
130 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ 139 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
313 fi \ 322 fi \
314 fi \ 323 fi \
315 fi \ 324 fi \
316 fi \ 325 fi \
317 } 326 }
318 327 ifeq ($(CROSS_COMPILE_ARCH),)
319 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) 328 ifneq ($(OBJCOPY),)
329 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
330 $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
331 ifeq ($(STRIP_POLICY),all_strip)
332 $(QUIETLY) $(STRIP) $@
333 else
334 ifeq ($(STRIP_POLICY),min_strip)
335 $(QUIETLY) $(STRIP) -g $@
336 # implied else here is no stripping at all
337 endif
338 endif
339 $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
340 endif
341 endif
342
343 DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
344 DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)
345 DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO)
320 346
321 install_jvm: $(LIBJVM) 347 install_jvm: $(LIBJVM)
322 @echo "Copying $(LIBJVM) to $(DEST_JVM)" 348 @echo "Copying $(LIBJVM) to $(DEST_JVM)"
349 $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \
350 cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
323 $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done" 351 $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"
324 352
325 #---------------------------------------------------------------------- 353 #----------------------------------------------------------------------
326 # Other files 354 # Other files
327 355