Mercurial > jdk8-mips64-public > corba / file comparison
comparison: make/common/shared/Platform.gmk
make/common/shared/Platform.gmk
- changeset 76
- 7b47536c234e
- parent 1
- 55540e827aef
- child 98
- a12ea7c7b497
equal
deleted
inserted
replaced
| 58:3eb8f1047a74 | 76:7b47536c234e |
|---|---|
| 286 # architecture. | 286 # architecture. |
| 287 # Temporary disk area | 287 # Temporary disk area |
| 288 TEMP_DISK=C:/temp | 288 TEMP_DISK=C:/temp |
| 289 # GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always | 289 # GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always |
| 290 # return "x86". Use the first word of $(PROCESSOR_IDENTIFIER) instead. | 290 # return "x86". Use the first word of $(PROCESSOR_IDENTIFIER) instead. |
| 291 PROC_ARCH:=$(word 1, $(PROCESSOR_IDENTIFIER)) | |
| 292 PROC_ARCH:=$(subst x86,X86,$(PROC_ARCH)) | |
| 293 PROC_ARCH:=$(subst x64,X64,$(PROC_ARCH)) | |
| 294 PROC_ARCH:=$(subst intel64,X64,$(PROC_ARCH)) | |
| 295 PROC_ARCH:=$(subst Intel64,X64,$(PROC_ARCH)) | |
| 296 PROC_ARCH:=$(subst INTEL64,X64,$(PROC_ARCH)) | |
| 297 PROC_ARCH:=$(subst em64t,X64,$(PROC_ARCH)) | |
| 298 PROC_ARCH:=$(subst EM64T,X64,$(PROC_ARCH)) | |
| 299 PROC_ARCH:=$(subst amd64,X64,$(PROC_ARCH)) | |
| 300 PROC_ARCH:=$(subst AMD64,X64,$(PROC_ARCH)) | |
| 301 PROC_ARCH:=$(subst ia64,IA64,$(PROC_ARCH)) | |
| 291 ifndef ARCH_DATA_MODEL | 302 ifndef ARCH_DATA_MODEL |
| 292 ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64) | 303 ifeq ($(PROC_ARCH),IA64) |
| 293 ARCH_DATA_MODEL=64 | 304 ARCH_DATA_MODEL=64 |
| 294 else | 305 else |
| 295 ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),AMD64) | 306 ifeq ($(PROC_ARCH),X64) |
| 296 ARCH_DATA_MODEL=64 | 307 ARCH_DATA_MODEL=64 |
| 297 else | 308 else |
| 298 ARCH_DATA_MODEL=32 | 309 ARCH_DATA_MODEL=32 |
| 299 endif | 310 endif |
| 300 endif | 311 endif |
| 311 # If the user wants to perform a cross compile build then they must | 322 # If the user wants to perform a cross compile build then they must |
| 312 # - set ARCH_DATA_MODEL=64 and either | 323 # - set ARCH_DATA_MODEL=64 and either |
| 313 # + set ARCH to ia64 or amd64, or | 324 # + set ARCH to ia64 or amd64, or |
| 314 REQUIRED_WINDOWS_NAME=Windows Server 2003 | 325 REQUIRED_WINDOWS_NAME=Windows Server 2003 |
| 315 REQUIRED_WINDOWS_VERSION=5 2 Service Pack 1 | 326 REQUIRED_WINDOWS_VERSION=5 2 Service Pack 1 |
| 316 ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)), AMD64) | 327 ifeq ($(PROC_ARCH),X64) |
| 317 ARCH=amd64 | 328 ARCH=amd64 |
| 318 else | 329 else |
| 319 ARCH=ia64 | 330 ifeq ($(PROC_ARCH),IA64) |
| 331 ARCH=ia64 | |
| 332 endif | |
| 320 endif | 333 endif |
| 321 LIBARCH=$(ARCH) | 334 LIBARCH=$(ARCH) |
| 322 # Value of Java os.arch property | 335 # Value of Java os.arch property |
| 323 ARCHPROP=$(LIBARCH) | 336 ARCHPROP=$(LIBARCH) |
| 324 endif | 337 endif |
