# HG changeset patch
# User trims
# Date 1276844962 25200
# Node ID e848dd13e1b6bf51ed70e6a30c7b18f8e02acdf4
# Parent  c6984693635278851458ebf69b71bbb1d1e76722# Parent  b9bc732be7c06a8677746ce5841719ef9a8fb9a3
Merge

diff -r b9bc732be7c0 -r e848dd13e1b6 .hgtags
--- a/.hgtags	Thu Jun 10 08:27:35 2010 -0700
+++ b/.hgtags	Fri Jun 18 00:09:22 2010 -0700
@@ -98,3 +98,7 @@
 d38f45079fe98792a7381dbb4b64f5b589ec8c58 jdk7-b94
 8bfe9058ca4661779ac1d0572329f3943e68362e hs19-b01
 91d861ba858daca645993a1ab6ba2fa06a8f4a5b jdk7-b95
+573e8ea5fd68e8e51eb6308d283ac3b3889d15e0 jdk7-b96
+573e8ea5fd68e8e51eb6308d283ac3b3889d15e0 hs19-b02
+5f42499e57adc16380780f40541e1a66cd601891 jdk7-b97
+8a045b3f5c13eaad92ff4baf15ca671845fcad1a jdk7-b98
diff -r b9bc732be7c0 -r e848dd13e1b6 make/hotspot_version
--- a/make/hotspot_version	Thu Jun 10 08:27:35 2010 -0700
+++ b/make/hotspot_version	Fri Jun 18 00:09:22 2010 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=19
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=02
+HS_BUILD_NUMBER=03
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
diff -r b9bc732be7c0 -r e848dd13e1b6 make/windows/makefiles/defs.make
--- a/make/windows/makefiles/defs.make	Thu Jun 10 08:27:35 2010 -0700
+++ b/make/windows/makefiles/defs.make	Fri Jun 18 00:09:22 2010 -0700
@@ -69,8 +69,20 @@
   MAKE_ARGS += Platform_arch_model=x86_64
 endif
 
+ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),)
+  ARCH_DATA_MODEL=64
+  PLATFORM=windows-amd64
+  VM_PLATFORM=windows_amd64
+  HS_ARCH=x86
+  MAKE_ARGS += LP64=1
+  MAKE_ARGS += ARCH=x86
+  MAKE_ARGS += BUILDARCH=amd64
+  MAKE_ARGS += Platform_arch=x86
+  MAKE_ARGS += Platform_arch_model=x86_64
+endif
+
 # NB later OS versions than 2003 may report "Intel64"
-ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) "EM64T\|Intel64"),)
+ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
   ARCH_DATA_MODEL=64
   PLATFORM=windows-amd64
   VM_PLATFORM=windows_amd64