1.1 --- a/make/windows/makefiles/defs.make Tue May 04 12:25:39 2010 -0700
1.2 +++ b/make/windows/makefiles/defs.make Tue May 11 14:35:43 2010 -0700
1.3 @@ -55,6 +55,8 @@
1.4 MAKE_ARGS += Platform_arch_model=ia64
1.5 endif
1.6
1.7 +# http://support.microsoft.com/kb/888731 : this can be either
1.8 +# AMD64 for AMD, or EM64T for Intel chips.
1.9 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
1.10 ARCH_DATA_MODEL=64
1.11 PLATFORM=windows-amd64
1.12 @@ -67,6 +69,19 @@
1.13 MAKE_ARGS += Platform_arch_model=x86_64
1.14 endif
1.15
1.16 +# NB later OS versions than 2003 may report "Intel64"
1.17 +ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) "EM64T\|Intel64"),)
1.18 + ARCH_DATA_MODEL=64
1.19 + PLATFORM=windows-amd64
1.20 + VM_PLATFORM=windows_amd64
1.21 + HS_ARCH=x86
1.22 + MAKE_ARGS += LP64=1
1.23 + MAKE_ARGS += ARCH=x86
1.24 + MAKE_ARGS += BUILDARCH=amd64
1.25 + MAKE_ARGS += Platform_arch=x86
1.26 + MAKE_ARGS += Platform_arch_model=x86_64
1.27 +endif
1.28 +
1.29 JDK_INCLUDE_SUBDIR=win32
1.30
1.31 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
