# HG changeset patch
# User jiangli
# Date 1374790322 14400
# Node ID 9aa3ef01f68ffa71897b53ebdb4fd0f51c86ee4c
# Parent  ba4ec0aa2ffd70f82a5d7eedae8de570cb8bc313# Parent  2d21ce77c2a6b24c401d50658c3cfdfa99ffc949
Merge

diff -r ba4ec0aa2ffd -r 9aa3ef01f68f hotspot/make/linux/makefiles/vm.make
--- a/hotspot/make/linux/makefiles/vm.make	Wed Jul 24 13:54:03 2013 -0700
+++ b/hotspot/make/linux/makefiles/vm.make	Thu Jul 25 18:12:02 2013 -0400
@@ -212,6 +212,12 @@
 Src_Files_EXCLUDE += \*x86_32\*
 endif
 
+# Alternate vm.make
+# This has to be included here to allow changes to the source
+# directories and excluded files before they are expanded
+# by the definition of Src_Files.
+-include $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/vm.make
+
 # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE.
 define findsrc
 	$(notdir $(shell find $(1)/. ! -name . -prune \
@@ -381,4 +387,4 @@
 
 install: install_jvm install_jsig install_saproc
 
-.PHONY: default build install install_jvm $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make
+.PHONY: default build install install_jvm $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/$(BUILDARCH).make $(HS_ALT_MAKE)/$(Platform_os_family)/makefiles/vm.make