< prev index next >

make/solaris/makefiles/vm.make

Print this page

        

*** 46,56 **** # set VPATH so make knows where to look for source files # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm # The adfiles directory contains ad_<arch>.[ch]pp. # The jvmtifiles directory contains jvmti*.[ch]pp ! Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/tracefiles VPATH += $(Src_Dirs_V:%=%:) # set INCLUDES for C preprocessor Src_Dirs_I += $(GENERATED) INCLUDES += $(Src_Dirs_I:%=-I%) --- 46,56 ---- # set VPATH so make knows where to look for source files # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm # The adfiles directory contains ad_<arch>.[ch]pp. # The jvmtifiles directory contains jvmti*.[ch]pp ! Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/jfrfiles VPATH += $(Src_Dirs_V:%=%:) # set INCLUDES for C preprocessor Src_Dirs_I += $(GENERATED) INCLUDES += $(Src_Dirs_I:%=-I%)
*** 142,151 **** --- 142,153 ---- LIBS += -lsocket -lsched -ldl $(LIBM) -lthread -lc -ldemangle endif # sparcWorks LIBS += -lkstat + LIBS += -lrt + # By default, link the *.o into the library, not the executable. LINK_INTO$(LINK_INTO) = LIBJVM JDK_LIBDIR = $(JAVA_HOME)/jre/lib/$(LIBARCH)
*** 159,187 **** JVM = jvm LIBJVM = lib$(JVM).so LIBJVM_DEBUGINFO = lib$(JVM).debuginfo LIBJVM_DIZ = lib$(JVM).diz ! SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt SOURCE_PATHS=\ $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ ! \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) ! CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/tracefiles ! ! ifneq ($(INCLUDE_TRACE), false) ! CORE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \ ! find $(HS_ALT_SRC)/share/vm/jfr -type d; \ ! fi) ! endif COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) COMPILER1_PATHS += $(HS_COMMON_SRC)/share/vm/c1 COMPILER2_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/opto) --- 161,185 ---- JVM = jvm LIBJVM = lib$(JVM).so LIBJVM_DEBUGINFO = lib$(JVM).debuginfo LIBJVM_DIZ = lib$(JVM).diz ! ifeq ($(ENABLE_JFR),false) ! EXCLUDE_JFR_PATHS:= -o -name jfr -prune ! endif SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt SOURCE_PATHS=\ $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ ! \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) $(EXCLUDE_JFR_PATHS) \)) SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) ! CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/jfrfiles COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1) COMPILER1_PATHS += $(HS_COMMON_SRC)/share/vm/c1 COMPILER2_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/opto)
< prev index next >