--- a/hotspot/make/windows/create_obj_files.sh	Thu Nov 26 10:38:33 2015 +0000
+++ b/hotspot/make/windows/create_obj_files.sh	Wed Dec 02 11:40:18 2015 -1000
@@ -129,7 +129,7 @@
 
 # Special handling of arch model.
 case "${Platform_arch_model}" in
-	"x86_32") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} *x86_64*" ;;
+	"x86_32") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} *x86_64* ${JVMCI_SPECIFIC_FILES}" ;;
 	"x86_64") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} *x86_32*" ;;
 esac
 

--- a/hotspot/make/windows/makefiles/vm.make	Thu Nov 26 10:38:33 2015 +0000
+++ b/hotspot/make/windows/makefiles/vm.make	Wed Dec 02 11:40:18 2015 -1000
@@ -45,10 +45,16 @@
 
 !if "$(Variant)" == "compiler2"
 CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER2"
+!if "$(BUILDARCH)" == "i486"
+CXX_FLAGS=$(CXX_FLAGS) /D INCLUDE_JVMCI=0
+!endif
 !endif
 
 !if "$(Variant)" == "tiered"
 CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1" /D "COMPILER2"
+!if "$(BUILDARCH)" == "i486"
+CXX_FLAGS=$(CXX_FLAGS) /D INCLUDE_JVMCI=0
+!endif
 !endif
 
 !if "$(BUILDARCH)" == "i486"