Mercurial > hg > graal-jvmci-8

comparison make/windows/makefiles/defs.make @ 1485:fb57d4cf76c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6931180: Migration to recent versions of MS Platform SDK 6951582: Build problems on win64 Summary: Changes to enable building JDK7 with Microsoft Visual Studio 2010 Reviewed-by: ohair, art, ccheung, dcubed
author prr
date Tue, 11 May 2010 14:35:43 -0700
parents b6272ef4a18f
children c18cbe5936b8
comparison
equal deleted inserted replaced
1403:3221d1887d30 1485:fb57d4cf76c2
53 MAKE_ARGS += BUILDARCH=ia64 53 MAKE_ARGS += BUILDARCH=ia64
54 MAKE_ARGS += Platform_arch=ia64 54 MAKE_ARGS += Platform_arch=ia64
55 MAKE_ARGS += Platform_arch_model=ia64 55 MAKE_ARGS += Platform_arch_model=ia64
56 endif 56 endif
57 57
58 # http://support.microsoft.com/kb/888731 : this can be either
59 # AMD64 for AMD, or EM64T for Intel chips.
58 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),) 60 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
61 ARCH_DATA_MODEL=64
62 PLATFORM=windows-amd64
63 VM_PLATFORM=windows_amd64
64 HS_ARCH=x86
65 MAKE_ARGS += LP64=1
66 MAKE_ARGS += ARCH=x86
67 MAKE_ARGS += BUILDARCH=amd64
68 MAKE_ARGS += Platform_arch=x86
69 MAKE_ARGS += Platform_arch_model=x86_64
70 endif
71
72 # NB later OS versions than 2003 may report "Intel64"
73 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) "EM64T\|Intel64"),)
59 ARCH_DATA_MODEL=64 74 ARCH_DATA_MODEL=64
60 PLATFORM=windows-amd64 75 PLATFORM=windows-amd64
61 VM_PLATFORM=windows_amd64 76 VM_PLATFORM=windows_amd64
62 HS_ARCH=x86 77 HS_ARCH=x86
63 MAKE_ARGS += LP64=1 78 MAKE_ARGS += LP64=1