# HG changeset patch
# User mikejwre
# Date 1276728537 25200
# Node ID 8a045b3f5c13eaad92ff4baf15ca671845fcad1a
# Parent  b0e7cd8627484d80aac498d56f1138fdb001fac5# Parent  70191885f707ca473cf3d2fff5946333bcaa3a36
Merge

diff -r b0e7cd862748 -r 8a045b3f5c13 make/windows/makefiles/defs.make
--- a/make/windows/makefiles/defs.make	Thu Jun 10 13:58:59 2010 -0700
+++ b/make/windows/makefiles/defs.make	Wed Jun 16 15:48:57 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