Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/make/common/shared/Platform.gmk	Mon May 04 22:12:47 2009 -0700
     1.2 +++ b/make/common/shared/Platform.gmk	Fri May 08 16:42:11 2009 -0700
     1.3 @@ -288,11 +288,22 @@
     1.4    TEMP_DISK=C:/temp
     1.5    # GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
     1.6    # return "x86". Use the first word of $(PROCESSOR_IDENTIFIER) instead.
     1.7 +  PROC_ARCH:=$(word 1, $(PROCESSOR_IDENTIFIER))
     1.8 +  PROC_ARCH:=$(subst x86,X86,$(PROC_ARCH))
     1.9 +  PROC_ARCH:=$(subst x64,X64,$(PROC_ARCH))
    1.10 +  PROC_ARCH:=$(subst intel64,X64,$(PROC_ARCH))
    1.11 +  PROC_ARCH:=$(subst Intel64,X64,$(PROC_ARCH))
    1.12 +  PROC_ARCH:=$(subst INTEL64,X64,$(PROC_ARCH))
    1.13 +  PROC_ARCH:=$(subst em64t,X64,$(PROC_ARCH))
    1.14 +  PROC_ARCH:=$(subst EM64T,X64,$(PROC_ARCH))
    1.15 +  PROC_ARCH:=$(subst amd64,X64,$(PROC_ARCH))
    1.16 +  PROC_ARCH:=$(subst AMD64,X64,$(PROC_ARCH))
    1.17 +  PROC_ARCH:=$(subst ia64,IA64,$(PROC_ARCH))
    1.18    ifndef ARCH_DATA_MODEL
    1.19 -    ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64)
    1.20 +    ifeq ($(PROC_ARCH),IA64)
    1.21        ARCH_DATA_MODEL=64
    1.22      else
    1.23 -      ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),AMD64)
    1.24 +      ifeq ($(PROC_ARCH),X64)
    1.25          ARCH_DATA_MODEL=64
    1.26        else
    1.27          ARCH_DATA_MODEL=32
    1.28 @@ -313,10 +324,12 @@
    1.29      #      + set ARCH to ia64 or amd64, or
    1.30      REQUIRED_WINDOWS_NAME=Windows Server 2003
    1.31      REQUIRED_WINDOWS_VERSION=5 2 Service Pack 1
    1.32 -    ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)), AMD64)
    1.33 +    ifeq ($(PROC_ARCH),X64)
    1.34        ARCH=amd64
    1.35      else
    1.36 -      ARCH=ia64
    1.37 +      ifeq ($(PROC_ARCH),IA64)
    1.38 +        ARCH=ia64
    1.39 +      endif
    1.40      endif
    1.41      LIBARCH=$(ARCH)
    1.42      # Value of Java os.arch property