Mercurial > hg > graal-jvmci-8
comparison make/windows/makefiles/defs.make @ 1598:e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
Reviewed-by: ohair, valeriep
author | prr |
---|---|
date | Tue, 29 Jun 2010 16:33:41 -0700 |
parents | 70191885f707 |
children | 0a8e0d4345b3 |
comparison
equal
deleted
inserted
replaced
1596:6a236384a379 | 1598:e13a5c0ed5e2 |
---|---|
30 | 30 |
31 SLASH_JAVA ?= J: | 31 SLASH_JAVA ?= J: |
32 PATH_SEP = ; | 32 PATH_SEP = ; |
33 | 33 |
34 # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name | 34 # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name |
35 ifeq ($(ARCH_DATA_MODEL),32) | |
36 ARCH_DATA_MODEL=32 | |
37 PLATFORM=windows-i586 | |
38 VM_PLATFORM=windows_i486 | |
39 HS_ARCH=x86 | |
40 MAKE_ARGS += ARCH=x86 | |
41 MAKE_ARGS += BUILDARCH=i486 | |
42 MAKE_ARGS += Platform_arch=x86 | |
43 MAKE_ARGS += Platform_arch_model=x86_32 | |
44 endif | |
45 | |
35 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) x86),) | 46 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) x86),) |
36 ARCH_DATA_MODEL=32 | 47 ARCH_DATA_MODEL=32 |
37 PLATFORM=windows-i586 | 48 PLATFORM=windows-i586 |
38 VM_PLATFORM=windows_i486 | 49 VM_PLATFORM=windows_i486 |
39 HS_ARCH=x86 | 50 HS_ARCH=x86 |
41 MAKE_ARGS += BUILDARCH=i486 | 52 MAKE_ARGS += BUILDARCH=i486 |
42 MAKE_ARGS += Platform_arch=x86 | 53 MAKE_ARGS += Platform_arch=x86 |
43 MAKE_ARGS += Platform_arch_model=x86_32 | 54 MAKE_ARGS += Platform_arch_model=x86_32 |
44 endif | 55 endif |
45 | 56 |
46 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),) | 57 ifneq ($(ARCH_DATA_MODEL),32) |
47 ARCH_DATA_MODEL=64 | 58 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),) |
48 PLATFORM=windows-ia64 | 59 ARCH_DATA_MODEL=64 |
49 VM_PLATFORM=windows_ia64 | 60 PLATFORM=windows-ia64 |
50 HS_ARCH=ia64 | 61 VM_PLATFORM=windows_ia64 |
51 MAKE_ARGS += LP64=1 | 62 HS_ARCH=ia64 |
52 MAKE_ARGS += ARCH=ia64 | 63 MAKE_ARGS += LP64=1 |
53 MAKE_ARGS += BUILDARCH=ia64 | 64 MAKE_ARGS += ARCH=ia64 |
54 MAKE_ARGS += Platform_arch=ia64 | 65 MAKE_ARGS += BUILDARCH=ia64 |
55 MAKE_ARGS += Platform_arch_model=ia64 | 66 MAKE_ARGS += Platform_arch=ia64 |
56 endif | 67 MAKE_ARGS += Platform_arch_model=ia64 |
68 endif | |
57 | 69 |
58 # http://support.microsoft.com/kb/888731 : this can be either | 70 # http://support.microsoft.com/kb/888731 : this can be either |
59 # AMD64 for AMD, or EM64T for Intel chips. | 71 # AMD64 for AMD, or EM64T for Intel chips. |
60 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),) | 72 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),) |
61 ARCH_DATA_MODEL=64 | 73 ARCH_DATA_MODEL=64 |
62 PLATFORM=windows-amd64 | 74 PLATFORM=windows-amd64 |
63 VM_PLATFORM=windows_amd64 | 75 VM_PLATFORM=windows_amd64 |
64 HS_ARCH=x86 | 76 HS_ARCH=x86 |
65 MAKE_ARGS += LP64=1 | 77 MAKE_ARGS += LP64=1 |
66 MAKE_ARGS += ARCH=x86 | 78 MAKE_ARGS += ARCH=x86 |
67 MAKE_ARGS += BUILDARCH=amd64 | 79 MAKE_ARGS += BUILDARCH=amd64 |
68 MAKE_ARGS += Platform_arch=x86 | 80 MAKE_ARGS += Platform_arch=x86 |
69 MAKE_ARGS += Platform_arch_model=x86_64 | 81 MAKE_ARGS += Platform_arch_model=x86_64 |
70 endif | 82 endif |
71 | 83 |
72 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),) | 84 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),) |
73 ARCH_DATA_MODEL=64 | 85 ARCH_DATA_MODEL=64 |
74 PLATFORM=windows-amd64 | 86 PLATFORM=windows-amd64 |
75 VM_PLATFORM=windows_amd64 | 87 VM_PLATFORM=windows_amd64 |
76 HS_ARCH=x86 | 88 HS_ARCH=x86 |
77 MAKE_ARGS += LP64=1 | 89 MAKE_ARGS += LP64=1 |
78 MAKE_ARGS += ARCH=x86 | 90 MAKE_ARGS += ARCH=x86 |
79 MAKE_ARGS += BUILDARCH=amd64 | 91 MAKE_ARGS += BUILDARCH=amd64 |
80 MAKE_ARGS += Platform_arch=x86 | 92 MAKE_ARGS += Platform_arch=x86 |
81 MAKE_ARGS += Platform_arch_model=x86_64 | 93 MAKE_ARGS += Platform_arch_model=x86_64 |
82 endif | 94 endif |
83 | 95 |
84 # NB later OS versions than 2003 may report "Intel64" | 96 # NB later OS versions than 2003 may report "Intel64" |
85 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),) | 97 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),) |
86 ARCH_DATA_MODEL=64 | 98 ARCH_DATA_MODEL=64 |
87 PLATFORM=windows-amd64 | 99 PLATFORM=windows-amd64 |
88 VM_PLATFORM=windows_amd64 | 100 VM_PLATFORM=windows_amd64 |
89 HS_ARCH=x86 | 101 HS_ARCH=x86 |
90 MAKE_ARGS += LP64=1 | 102 MAKE_ARGS += LP64=1 |
91 MAKE_ARGS += ARCH=x86 | 103 MAKE_ARGS += ARCH=x86 |
92 MAKE_ARGS += BUILDARCH=amd64 | 104 MAKE_ARGS += BUILDARCH=amd64 |
93 MAKE_ARGS += Platform_arch=x86 | 105 MAKE_ARGS += Platform_arch=x86 |
94 MAKE_ARGS += Platform_arch_model=x86_64 | 106 MAKE_ARGS += Platform_arch_model=x86_64 |
107 endif | |
95 endif | 108 endif |
96 | 109 |
97 JDK_INCLUDE_SUBDIR=win32 | 110 JDK_INCLUDE_SUBDIR=win32 |
98 | 111 |
99 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined | 112 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined |