6964882: 32 bit JDK does not build on 64 bit Windows platforms

Reviewed-by: ohair, valeriep

make/windows/makefiles/defs.make

@@ -32,6 +32,17 @@ SLASH_JAVA ?= J:
 PATH_SEP = ;
 
 # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
+ifeq ($(ARCH_DATA_MODEL),32)
+  ARCH_DATA_MODEL=32
+  PLATFORM=windows-i586
+  VM_PLATFORM=windows_i486
+  HS_ARCH=x86
+  MAKE_ARGS += ARCH=x86
+  MAKE_ARGS += BUILDARCH=i486
+  MAKE_ARGS += Platform_arch=x86
+  MAKE_ARGS += Platform_arch_model=x86_32
+endif
+
 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) x86),)
   ARCH_DATA_MODEL=32
   PLATFORM=windows-i586
@@ -43,7 +54,8 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) x86),)
   MAKE_ARGS += Platform_arch_model=x86_32
 endif
 
-ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),)
+ifneq ($(ARCH_DATA_MODEL),32)
+  ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),)
     ARCH_DATA_MODEL=64
     PLATFORM=windows-ia64
     VM_PLATFORM=windows_ia64
@@ -53,11 +65,11 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),)
     MAKE_ARGS += BUILDARCH=ia64
     MAKE_ARGS += Platform_arch=ia64
     MAKE_ARGS += Platform_arch_model=ia64
-endif
+  endif
 
 # http://support.microsoft.com/kb/888731 : this can be either
 # AMD64 for AMD, or EM64T for Intel chips.
-ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
+  ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
     ARCH_DATA_MODEL=64
     PLATFORM=windows-amd64
     VM_PLATFORM=windows_amd64
@@ -67,7 +79,7 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
     MAKE_ARGS += BUILDARCH=amd64
     MAKE_ARGS += Platform_arch=x86
     MAKE_ARGS += Platform_arch_model=x86_64
-endif
+  endif
 
 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),)
     ARCH_DATA_MODEL=64
@@ -79,10 +91,10 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),)
     MAKE_ARGS += BUILDARCH=amd64
     MAKE_ARGS += Platform_arch=x86
     MAKE_ARGS += Platform_arch_model=x86_64
-endif
+  endif
 
 # NB later OS versions than 2003 may report "Intel64"
-ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
+  ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
     ARCH_DATA_MODEL=64
     PLATFORM=windows-amd64
     VM_PLATFORM=windows_amd64
@@ -92,6 +104,7 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
     MAKE_ARGS += BUILDARCH=amd64
     MAKE_ARGS += Platform_arch=x86
     MAKE_ARGS += Platform_arch_model=x86_64
+  endif
 endif
 
 JDK_INCLUDE_SUBDIR=win32