Mercurial > hg > truffle

comparison make/bsd/makefiles/vm.make @ 4970:33df1aeaebbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents ee87cfe2f8f9 719f7007c8e8
children 957c266d8bc5
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
80 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" 80 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
81 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\"" 81 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
82 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" 82 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
83 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" 83 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
84 84
85 CPPFLAGS = \ 85 CXXFLAGS = \
86 ${SYSDEFS} \ 86 ${SYSDEFS} \
87 ${INCLUDES} \ 87 ${INCLUDES} \
88 ${BUILD_VERSION} \ 88 ${BUILD_VERSION} \
89 ${BUILD_TARGET} \ 89 ${BUILD_TARGET} \
90 ${BUILD_USER} \ 90 ${BUILD_USER} \
91 ${HS_LIB_ARCH} \ 91 ${HS_LIB_ARCH} \
92 ${JRE_VERSION} \
93 ${VM_DISTRO} 92 ${VM_DISTRO}
94 93
94 # This is VERY important! The version define must only be supplied to vm_version.o
95 # If not, ccache will not re-use the cache at all, since the version string might contain
96 # a time and date.
97 vm_version.o: CXXFLAGS += ${JRE_VERSION}
98
95 ifdef DEFAULT_LIBPATH 99 ifdef DEFAULT_LIBPATH
96 CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" 100 CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
101 endif
102
103 ifndef JAVASE_EMBEDDED
104 CFLAGS += -DINCLUDE_TRACE
97 endif 105 endif
98 106
99 # CFLAGS_WARN holds compiler options to suppress/enable warnings. 107 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
100 CFLAGS += $(CFLAGS_WARN/BYFILE) 108 CFLAGS += $(CFLAGS_WARN/BYFILE)
101 109
144 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) 152 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
145 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm 153 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
146 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm 154 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
147 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm 155 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
148 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm 156 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
157
158 ifndef JAVASE_EMBEDDED
159 SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
160 find $(HS_ALT_SRC)/share/vm/jfr -type d; \
161 fi)
162 endif
149 163
150 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) 164 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
151 CORE_PATHS+=$(GENERATED)/jvmtifiles 165 CORE_PATHS+=$(GENERATED)/jvmtifiles
152 166
153 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) 167 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
256 # get around library dependency and compatibility issues. Must use gcc not 270 # get around library dependency and compatibility issues. Must use gcc not
257 # g++ to link. 271 # g++ to link.
258 ifeq ($(STATIC_CXX), true) 272 ifeq ($(STATIC_CXX), true)
259 LFLAGS_VM += $(STATIC_LIBGCC) 273 LFLAGS_VM += $(STATIC_LIBGCC)
260 LIBS_VM += $(STATIC_STDCXX) 274 LIBS_VM += $(STATIC_STDCXX)
261 LINK_VM = $(LINK_LIB.c) 275 LINK_VM = $(LINK_LIB.CC)
262 else 276 else
263 LINK_VM = $(LINK_LIB.CC) 277 LINK_VM = $(LINK_LIB.CXX)
264 endif 278 endif
265 279
266 LIBS_VM += $(LIBS) 280 LIBS_VM += $(LIBS)
267 endif 281 endif
268 ifeq ($(ZERO_BUILD), true) 282 ifeq ($(ZERO_BUILD), true)
276 290
277 # rule for building precompiled header 291 # rule for building precompiled header
278 $(PRECOMPILED_HEADER): 292 $(PRECOMPILED_HEADER):
279 $(QUIETLY) echo Generating precompiled header $@ 293 $(QUIETLY) echo Generating precompiled header $@
280 $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR) 294 $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
281 $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE) 295 $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
282 296
283 # making the library: 297 # making the library:
284 298
285 ifneq ($(JVM_BASE_ADDR),) 299 ifneq ($(JVM_BASE_ADDR),)
286 # By default shared library is linked at base address == 0. Modify the 300 # By default shared library is linked at base address == 0. Modify the
301 endif 315 endif
302 316
303 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) 317 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
304 $(QUIETLY) { \ 318 $(QUIETLY) { \
305 echo Linking vm...; \ 319 echo Linking vm...; \
306 $(LINK_LIB.CC/PRE_HOOK) \ 320 $(LINK_LIB.CXX/PRE_HOOK) \
307 $(LINK_VM) $(LD_SCRIPT_FLAG) \ 321 $(LINK_VM) $(LD_SCRIPT_FLAG) \
308 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ 322 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \
309 $(LINK_LIB.CC/POST_HOOK) \ 323 $(LINK_LIB.CXX/POST_HOOK) \
310 rm -f $@.1; ln -s $@ $@.1; \ 324 rm -f $@.1; ln -s $@ $@.1; \
311 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ 325 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
312 } 326 }
313 327
314 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) 328 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
333 347
334 ifeq ($(OS_VENDOR), Darwin) 348 ifeq ($(OS_VENDOR), Darwin)
335 $(LIBJVM).dSYM: $(LIBJVM) 349 $(LIBJVM).dSYM: $(LIBJVM)
336 dsymutil $(LIBJVM) 350 dsymutil $(LIBJVM)
337 351
338 # no launcher or libjvm_db for macosx 352 # no libjvm_db for macosx
339 build: $(LIBJVM) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(LIBJVM).dSYM 353 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(LIBJVM).dSYM
340 echo "Doing vm.make build:" 354 echo "Doing vm.make build:"
341 else 355 else
342 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) 356 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)
343 endif 357 endif
344 358