Mercurial > hg > truffle

comparison make/linux/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 723df37192d6 719f7007c8e8
children 957c266d8bc5
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
86 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" 86 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
87 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\"" 87 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
88 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" 88 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
89 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" 89 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
90 90
91 CPPFLAGS = \ 91 CXXFLAGS = \
92 ${SYSDEFS} \ 92 ${SYSDEFS} \
93 ${INCLUDES} \ 93 ${INCLUDES} \
94 ${BUILD_VERSION} \ 94 ${BUILD_VERSION} \
95 ${BUILD_TARGET} \ 95 ${BUILD_TARGET} \
96 ${BUILD_USER} \ 96 ${BUILD_USER} \
97 ${HS_LIB_ARCH} \ 97 ${HS_LIB_ARCH} \
98 ${JRE_VERSION} \
99 ${VM_DISTRO} 98 ${VM_DISTRO}
99
100 # This is VERY important! The version define must only be supplied to vm_version.o
101 # If not, ccache will not re-use the cache at all, since the version string might contain
102 # a time and date.
103 vm_version.o: CXXFLAGS += ${JRE_VERSION}
104
105 ifndef JAVASE_EMBEDDED
106 CFLAGS += -DINCLUDE_TRACE
107 endif
100 108
101 # CFLAGS_WARN holds compiler options to suppress/enable warnings. 109 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
102 CFLAGS += $(CFLAGS_WARN/BYFILE) 110 CFLAGS += $(CFLAGS_WARN/BYFILE)
103 111
104 # Do not use C++ exception handling 112 # Do not use C++ exception handling
140 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) 148 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
141 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm 149 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
142 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm 150 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
143 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm 151 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
144 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm 152 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
153
154 ifndef JAVASE_EMBEDDED
155 SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
156 find $(HS_ALT_SRC)/share/vm/jfr -type d; \
157 fi)
158 endif
145 159
146 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) 160 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
147 CORE_PATHS+=$(GENERATED)/jvmtifiles 161 CORE_PATHS+=$(GENERATED)/jvmtifiles
148 162
149 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) 163 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
268 ifeq ($(SHARK_BUILD), true) 282 ifeq ($(SHARK_BUILD), true)
269 LFLAGS_VM += $(LLVM_LDFLAGS) 283 LFLAGS_VM += $(LLVM_LDFLAGS)
270 LIBS_VM += $(LLVM_LIBS) 284 LIBS_VM += $(LLVM_LIBS)
271 endif 285 endif
272 286
273 LINK_VM = $(LINK_LIB.c) 287 LINK_VM = $(LINK_LIB.CC)
274 288
275 # rule for building precompiled header 289 # rule for building precompiled header
276 $(PRECOMPILED_HEADER): 290 $(PRECOMPILED_HEADER):
277 $(QUIETLY) echo Generating precompiled header $@ 291 $(QUIETLY) echo Generating precompiled header $@
278 $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR) 292 $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
279 $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE) 293 $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
280 294
281 # making the library: 295 # making the library:
282 296
283 ifneq ($(JVM_BASE_ADDR),) 297 ifneq ($(JVM_BASE_ADDR),)
284 # By default shared library is linked at base address == 0. Modify the 298 # By default shared library is linked at base address == 0. Modify the
304 # DSO. To workaround that, we run chcon to libjvm.so after it is built. See 318 # DSO. To workaround that, we run chcon to libjvm.so after it is built. See
305 # details in bug 6538311. 319 # details in bug 6538311.
306 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) 320 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
307 $(QUIETLY) { \ 321 $(QUIETLY) { \
308 echo Linking vm...; \ 322 echo Linking vm...; \
309 $(LINK_LIB.CC/PRE_HOOK) \ 323 $(LINK_LIB.CXX/PRE_HOOK) \
310 $(LINK_VM) $(LD_SCRIPT_FLAG) \ 324 $(LINK_VM) $(LD_SCRIPT_FLAG) \
311 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ 325 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \
312 $(LINK_LIB.CC/POST_HOOK) \ 326 $(LINK_LIB.CXX/POST_HOOK) \
313 rm -f $@.1; ln -s $@ $@.1; \ 327 rm -f $@.1; ln -s $@ $@.1; \
314 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ 328 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
315 if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \ 329 if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \
316 if [ -x /usr/sbin/selinuxenabled ] ; then \ 330 if [ -x /usr/sbin/selinuxenabled ] ; then \
317 /usr/sbin/selinuxenabled; \ 331 /usr/sbin/selinuxenabled; \