1.1 --- a/make/linux/makefiles/vm.make Fri Jun 07 09:33:01 2013 -0700
1.2 +++ b/make/linux/makefiles/vm.make Mon Jun 10 11:30:51 2013 +0200
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -19,7 +19,7 @@
1.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.12 # or visit www.oracle.com if you need additional information or have any
1.13 # questions.
1.14 -#
1.15 +#
1.16 #
1.17
1.18 # Rules to build JVM and related libraries, included from vm.make in the build
1.19 @@ -52,7 +52,7 @@
1.20 # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
1.21 # The adfiles directory contains ad_<arch>.[ch]pp.
1.22 # The jvmtifiles directory contains jvmti*.[ch]pp
1.23 -Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles
1.24 +Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
1.25 VPATH += $(Src_Dirs_V:%=%:)
1.26
1.27 # set INCLUDES for C preprocessor.
1.28 @@ -72,7 +72,7 @@
1.29 endif
1.30 endif
1.31
1.32 -# HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
1.33 +# HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
1.34 # in $(GAMMADIR)/make/defs.make
1.35 ifeq ($(HOTSPOT_BUILD_VERSION),)
1.36 BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HOTSPOT_RELEASE_VERSION)\""
1.37 @@ -99,7 +99,7 @@
1.38
1.39 # This is VERY important! The version define must only be supplied to vm_version.o
1.40 # If not, ccache will not re-use the cache at all, since the version string might contain
1.41 -# a time and date.
1.42 +# a time and date.
1.43 CXXFLAGS/vm_version.o += ${JRE_VERSION}
1.44
1.45 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
1.46 @@ -108,12 +108,6 @@
1.47 CXXFLAGS += $(CXXFLAGS/BYFILE)
1.48
1.49
1.50 -ifndef JAVASE_EMBEDDED
1.51 -ifneq (${ARCH},arm)
1.52 -CFLAGS += -DINCLUDE_TRACE
1.53 -endif
1.54 -endif
1.55 -
1.56 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
1.57 CFLAGS += $(CFLAGS_WARN/BYFILE)
1.58
1.59 @@ -158,16 +152,14 @@
1.60 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
1.61 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
1.62
1.63 -ifndef JAVASE_EMBEDDED
1.64 -ifneq (${ARCH},arm)
1.65 -SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
1.66 +CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
1.67 +CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
1.68 +
1.69 +ifneq ($(INCLUDE_TRACE), false)
1.70 +CORE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
1.71 find $(HS_ALT_SRC)/share/vm/jfr -type d; \
1.72 fi)
1.73 endif
1.74 -endif
1.75 -
1.76 -CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
1.77 -CORE_PATHS+=$(GENERATED)/jvmtifiles
1.78
1.79 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
1.80 COMPILER1_PATHS += $(HS_COMMON_SRC)/share/vm/c1
1.81 @@ -316,7 +308,7 @@
1.82 # With more recent Redhat releases (or the cutting edge version Fedora), if
1.83 # SELinux is configured to be enabled, the runtime linker will fail to apply
1.84 # the text relocation to libjvm.so considering that it is built as a non-PIC
1.85 -# DSO. To workaround that, we run chcon to libjvm.so after it is built. See
1.86 +# DSO. To workaround that, we run chcon to libjvm.so after it is built. See
1.87 # details in bug 6538311.
1.88 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
1.89 $(QUIETLY) { \
