jdk8-mips64-public/corba: changeset 89:79d8fd9e74b9

     1.1 --- a/.hgtags	Thu Jun 11 15:16:20 2009 -0400
     1.2 +++ b/.hgtags	Mon Jun 15 13:07:30 2009 -0400
     1.3 @@ -34,3 +34,4 @@
     1.4  972c6157fae57850694675da82fd58a17930db0a jdk7-b57
     1.5  2e3b8edab3ef55406494d3dd562e06882e6fc15e jdk7-b58
     1.6  7e6b2b55c00cc523b468272353ada3979adbbf16 jdk7-b59
     1.7 +f1e1cccbd13aa96d2d8bd872782ff764010bc22c jdk7-b60

     2.1 --- a/make/README	Thu Jun 11 15:16:20 2009 -0400
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,14 +0,0 @@
     2.4 -README:
     2.5 -  This file should be located at the top of the corba Mercurial repository.
     2.6 -
     2.7 -  See http://openjdk.java.net/ for more information about the OpenJDK.
     2.8 -
     2.9 -  See ../README-builds.html for complete details on build machine requirements.
    2.10 -
    2.11 -Simple Build Instructions:
    2.12 -
    2.13 -    cd make && gnumake
    2.14 -     
    2.15 -  The files that will be imported into the jdk build will be in the "dist"
    2.16 -  directory.
    2.17 -

     3.1 --- a/make/common/shared/Compiler-gcc.gmk	Thu Jun 11 15:16:20 2009 -0400
     3.2 +++ b/make/common/shared/Compiler-gcc.gmk	Mon Jun 15 13:07:30 2009 -0400
     3.3 @@ -73,23 +73,18 @@
     3.4    ifneq ("$(findstring sparc,$(ARCH))", "")
     3.5      # sparc or sparcv9
     3.6      REQUIRED_CC_VER = 4.0
     3.7 -    REQUIRED_GCC_VER = 4.0.*
     3.8    else
     3.9    ifeq ($(ARCH_DATA_MODEL), 32)
    3.10      # i586
    3.11      REQUIRED_CC_VER = 3.2
    3.12 -    REQUIRED_GCC_VER = 3.2.1*
    3.13 -    REQUIRED_GCC_VER_INT = 3.2.1-7a
    3.14    else
    3.15    ifeq ($(ARCH), amd64)
    3.16      # amd64
    3.17      REQUIRED_CC_VER = 3.2
    3.18 -    REQUIRED_GCC_VER = 3.2.*
    3.19    endif
    3.20    ifeq ($(ARCH), ia64)
    3.21      # ia64
    3.22      REQUIRED_CC_VER = 3.2
    3.23 -    REQUIRED_GCC_VER = 2.9[56789].*
    3.24    endif
    3.25    endif
    3.26    endif
    3.27 @@ -109,13 +104,6 @@
    3.28  
    3.29    # Option used to create a shared library
    3.30    SHARED_LIBRARY_FLAG = -G
    3.31 -  # But gcc is still needed no matter what on 32bit
    3.32 -  ifeq ($(ARCH_DATA_MODEL), 32)
    3.33 -    REQUIRED_GCC_VER = 2.95
    3.34 -    GCC =$(GCC_COMPILER_PATH)gcc
    3.35 -    _GCC_VER :=$(shell $(GCC) -dumpversion 2>&1 )
    3.36 -    GCC_VER  :=$(call GetVersion,"$(_GCC_VER)")
    3.37 -  endif
    3.38  
    3.39  endif
    3.40

     4.1 --- a/make/common/shared/Compiler-sun.gmk	Thu Jun 11 15:16:20 2009 -0400
     4.2 +++ b/make/common/shared/Compiler-sun.gmk	Mon Jun 15 13:07:30 2009 -0400
     4.3 @@ -39,13 +39,6 @@
     4.4    LINT           = $(COMPILER_PATH)lint
     4.5    # Option used to create a shared library
     4.6    SHARED_LIBRARY_FLAG = -G
     4.7 -  # But gcc is still needed no matter what on 32bit
     4.8 -  ifeq ($(ARCH_DATA_MODEL), 32)
     4.9 -    REQUIRED_GCC_VER = 2.95
    4.10 -    GCC =$(GCC_COMPILER_PATH)gcc
    4.11 -    _GCC_VER :=$(shell $(GCC) -dumpversion 2>&1 )
    4.12 -    GCC_VER  :=$(call GetVersion,"$(_GCC_VER)")
    4.13 -  endif
    4.14  endif
    4.15  
    4.16  # Sun Studio Compiler settings specific to Linux

     5.1 --- a/make/common/shared/Platform.gmk	Thu Jun 11 15:16:20 2009 -0400
     5.2 +++ b/make/common/shared/Platform.gmk	Mon Jun 15 13:07:30 2009 -0400
     5.3 @@ -288,11 +288,22 @@
     5.4    TEMP_DISK=C:/temp
     5.5    # GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
     5.6    # return "x86". Use the first word of $(PROCESSOR_IDENTIFIER) instead.
     5.7 +  PROC_ARCH:=$(word 1, $(PROCESSOR_IDENTIFIER))
     5.8 +  PROC_ARCH:=$(subst x86,X86,$(PROC_ARCH))
     5.9 +  PROC_ARCH:=$(subst x64,X64,$(PROC_ARCH))
    5.10 +  PROC_ARCH:=$(subst intel64,X64,$(PROC_ARCH))
    5.11 +  PROC_ARCH:=$(subst Intel64,X64,$(PROC_ARCH))
    5.12 +  PROC_ARCH:=$(subst INTEL64,X64,$(PROC_ARCH))
    5.13 +  PROC_ARCH:=$(subst em64t,X64,$(PROC_ARCH))
    5.14 +  PROC_ARCH:=$(subst EM64T,X64,$(PROC_ARCH))
    5.15 +  PROC_ARCH:=$(subst amd64,X64,$(PROC_ARCH))
    5.16 +  PROC_ARCH:=$(subst AMD64,X64,$(PROC_ARCH))
    5.17 +  PROC_ARCH:=$(subst ia64,IA64,$(PROC_ARCH))
    5.18    ifndef ARCH_DATA_MODEL
    5.19 -    ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64)
    5.20 +    ifeq ($(PROC_ARCH),IA64)
    5.21        ARCH_DATA_MODEL=64
    5.22      else
    5.23 -      ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),AMD64)
    5.24 +      ifeq ($(PROC_ARCH),X64)
    5.25          ARCH_DATA_MODEL=64
    5.26        else
    5.27          ARCH_DATA_MODEL=32
    5.28 @@ -313,10 +324,12 @@
    5.29      #      + set ARCH to ia64 or amd64, or
    5.30      REQUIRED_WINDOWS_NAME=Windows Server 2003
    5.31      REQUIRED_WINDOWS_VERSION=5 2 Service Pack 1
    5.32 -    ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)), AMD64)
    5.33 +    ifeq ($(PROC_ARCH),X64)
    5.34        ARCH=amd64
    5.35      else
    5.36 -      ARCH=ia64
    5.37 +      ifeq ($(PROC_ARCH),IA64)
    5.38 +        ARCH=ia64
    5.39 +      endif
    5.40      endif
    5.41      LIBARCH=$(ARCH)
    5.42      # Value of Java os.arch property

Mercurial > jdk8-mips64-public > corba / changeset

changeset

Merge