Mercurial > hg > openjdk > hsx21
changeset 1556:c69846936352
Merge
author | trims |
---|---|
date | Thu, 17 Jun 2010 23:59:24 -0700 |
parents | f56e28f22410 (current diff) 695c43156a9a (diff) |
children | e848dd13e1b6 |
files | |
diffstat | 2 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jun 03 18:18:56 2010 -0700 +++ b/.hgtags Thu Jun 17 23:59:24 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
--- a/make/windows/makefiles/defs.make Thu Jun 03 18:18:56 2010 -0700 +++ b/make/windows/makefiles/defs.make Thu Jun 17 23:59:24 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