Mercurial > hg > truffle

comparison make/solaris/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 719f7007c8e8
children 2d503de963b3 d652a62d6e03
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
74 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" 74 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
75 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\"" 75 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
76 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" 76 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
77 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\"" 77 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
78 78
79 CPPFLAGS = \ 79 CXXFLAGS = \
80 ${SYSDEFS} \ 80 ${SYSDEFS} \
81 ${INCLUDES} \ 81 ${INCLUDES} \
82 ${BUILD_VERSION} \ 82 ${BUILD_VERSION} \
83 ${BUILD_TARGET} \ 83 ${BUILD_TARGET} \
84 ${BUILD_USER} \ 84 ${BUILD_USER} \
85 ${HS_LIB_ARCH} \ 85 ${HS_LIB_ARCH} \
86 ${JRE_VERSION} \
87 ${VM_DISTRO} 86 ${VM_DISTRO}
87
88 # This is VERY important! The version define must only be supplied to vm_version.o
89 # If not, ccache will not re-use the cache at all, since the version string might contain
90 # a time and date.
91 vm_version.o: CXXFLAGS += ${JRE_VERSION}
88 92
89 # CFLAGS_WARN holds compiler options to suppress/enable warnings. 93 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
90 CFLAGS += $(CFLAGS_WARN) 94 CFLAGS += $(CFLAGS_WARN)
91 95
92 # Do not use C++ exception handling 96 # Do not use C++ exception handling
93 CFLAGS += $(CFLAGS/NOEX) 97 CFLAGS += $(CFLAGS/NOEX)
94 98
95 # Extra flags from gnumake's invocation or environment 99 # Extra flags from gnumake's invocation or environment
96 CFLAGS += $(EXTRA_CFLAGS) 100 CFLAGS += $(EXTRA_CFLAGS) -DINCLUDE_TRACE
97 101
98 # Math Library (libm.so), do not use -lm. 102 # Math Library (libm.so), do not use -lm.
99 # There might be two versions of libm.so on the build system: 103 # There might be two versions of libm.so on the build system:
100 # libm.so.1 and libm.so.2, and we want libm.so.1. 104 # libm.so.1 and libm.so.2, and we want libm.so.1.
101 # Depending on the Solaris release being used to build with, 105 # Depending on the Solaris release being used to build with,
157 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) 161 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
158 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm 162 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
159 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm 163 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
160 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm 164 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
161 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm 165 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
166
167 SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
168 find $(HS_ALT_SRC)/share/vm/jfr -type d; \
169 fi)
162 170
163 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) 171 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
164 CORE_PATHS+=$(GENERATED)/jvmtifiles 172 CORE_PATHS+=$(GENERATED)/jvmtifiles
165 173
166 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) 174 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
259 LIBS_VM += $(STATIC_STDCXX) $(LIBS) 267 LIBS_VM += $(STATIC_STDCXX) $(LIBS)
260 endif 268 endif
261 endif 269 endif
262 270
263 ifdef USE_GCC 271 ifdef USE_GCC
264 LINK_VM = $(LINK_LIB.c)
265 else
266 LINK_VM = $(LINK_LIB.CC) 272 LINK_VM = $(LINK_LIB.CC)
273 else
274 LINK_VM = $(LINK_LIB.CXX)
267 endif 275 endif
268 # making the library: 276 # making the library:
269 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) 277 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE)
270 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) 278 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
271 @echo Linking vm... 279 @echo Linking vm...
272 $(QUIETLY) $(LINK_LIB.CC/PRE_HOOK) 280 $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK)
273 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) 281 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM)
274 $(QUIETLY) $(LINK_LIB.CC/POST_HOOK) 282 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK)
275 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 283 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1
276 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) 284 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
277 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 285 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
278 ifneq ($(OBJCOPY),) 286 ifneq ($(OBJCOPY),)
279 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) 287 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)