jdk8-mips64-public/corba: comparison make/common/shared/Platform.gmk

-:519daea48888
+:0f60cf26c5b5
 #     TEMP_DISK                   /tmp or C:/temp
 #     ARCH_DATA_MODEL             32 or 64
 #     ARCH                        sparc, sparcv9, i586, amd64, or ia64
 #     ARCH_FAMILY                 sparc or i586
 #     ARCHPROP                    sparc or x86
-#     ARCH_VM_SUBDIR              jre/bin, jre/lib/sparc, etc.
-#     LIBARCH                     sparc, sparcv9, i386, amd64, or ia64
 #     DEV_NULL                    destination of /dev/null, NUL or /dev/NULL
 #     CLASSPATH_SEPARATOR         separator in classpath, ; or :
-#     LIB_PREFIX                  dynamic or static library prefix, lib or empty
-#     LIB_SUFFIX                  static library file suffix, .lib or .a?
-#     LIBRARY_SUFFIX              dynamic library file suffix, .dll or .so
-#     OBJECT_SUFFIX               object file suffix, .o or .obj
-#     EXE_SUFFIX                  executable file suffix, .exe or empty
 #     BUNDLE_FILE_SUFFIX          suffix for bundles: .tar or .tar.gz
 #     ISA_DIR                     solaris only: /sparcv9 or /amd64
-#     LIBARCH32                   solaris only: sparc or i386
-#     LIBARCH64                   solaris only: sparcv9 or amd64
 #     REQUIRED_WINDOWS_NAME       windows only: basic name of windows
 #     REQUIRED_WINDOWS_VERSION    windows only: specific version of windows
 #     USING_CYGWIN                windows only: true or false
 #     WINDOWS_NT_VERSION_STRING   windows only: long version name
 #     REQUIRED_OS_VERSION         required OS version, e.g. 5.10, 2.4
 ISA_DIR = /$(ARCH)
 endif
 # Need to maintain the jre/lib/i386 location for 32-bit Intel
 ifeq ($(ARCH), i586)
 ARCH_FAMILY = $(ARCH)
-LIBARCH     = i386
 # Value of Java os.arch property
 ARCHPROP    = x86
 else
 ifeq ($(ARCH), amd64)
 ARCH_FAMILY = i586
 else
 ARCH_FAMILY = sparc
 endif
-LIBARCH  = $(ARCH)
 # Value of Java os.arch property
-ARCHPROP = $(LIBARCH)
+ARCHPROP = $(ARCH)
-endif
-# The two LIBARCH names
-ifeq ($(ARCH_FAMILY), sparc)
-LIBARCH32 = sparc
-LIBARCH64 = sparcv9
-else
-LIBARCH32 = i386
-LIBARCH64 = amd64
 endif
 # Suffix for file bundles used in previous release
 BUNDLE_FILE_SUFFIX=.tar
 # Required Solaris version
 REQUIRED_OS_VERSION = 5.10
 ARCH_DATA_MODEL=64
 endif
 endif
 endif
-# Need to maintain the jre/lib/i386 location for 32-bit Intel
 ifeq ($(ARCH), i586)
-LIBARCH = i386
+ARCHPROP = i386
 else
-LIBARCH = $(ARCH)
+ARCHPROP = $(ARCH)
 endif
-# Value of Java os.arch property
-ARCHPROP  = $(LIBARCH)
 # Suffix for file bundles used in previous release
 BUNDLE_FILE_SUFFIX=.tar.gz
 # Minimum disk space needed as determined by running 'du -sk' on
 #    a fully built workspace.
 ARCH_DATA_MODEL=32
 endif
 endif
 endif
 export ARCH_DATA_MODEL
-# LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel
 ARCH=i586
-LIBARCH=i386
 # Value of Java os.arch property
 ARCHPROP=x86
 REQUIRED_WINDOWS_NAME=Windows Professional 2000
 REQUIRED_WINDOWS_VERSION=5 0 Service Pack 4
 ifeq ($(ARCH_DATA_MODEL), 64)
 else
 ifeq ($(PROC_ARCH),IA64)
 ARCH=ia64
 endif
 endif
-LIBARCH=$(ARCH)
 # Value of Java os.arch property
-ARCHPROP=$(LIBARCH)
+ARCHPROP=$(ARCH)
 endif
 ARCH_FAMILY = $(ARCH)
 # Where is unwanted output to be delivered?
 ifeq ($(USING_CYGWIN),true)
 DEV_NULL = /dev/null
 DEV_NULL = NUL
 endif
 export DEV_NULL
 # Classpath separator
 CLASSPATH_SEPARATOR = ;
-# The suffix used for object file (.o for unix .obj for windows)
-OBJECT_SUFFIX = obj
-# The suffix applied to executables (.exe for windows, nothing for solaris)
-EXE_SUFFIX = .exe
-# The prefix applied to library files (lib for solaris, nothing for windows)
-LIB_PREFIX=
-LIBRARY_SUFFIX = dll
-LIB_SUFFIX     = lib
 # User name determination (set _USER)
 ifndef USER
 ifdef USERNAME
 _USER := $(USERNAME)
 else
 endif
 endif
 else
 _USER:=$(USER)
 endif
-# Location of client/server directories
-ARCH_VM_SUBDIR=jre/bin
 # Suffix for file bundles used in previous release
 BUNDLE_FILE_SUFFIX=.tar
 # Minimum disk space needed as determined by running 'du -sk' on
 #    a fully built workspace.
 REQUIRED_FREE_SPACE=500000
 # Where is unwanted output to be delivered?
 DEV_NULL = /dev/null
 export DEV_NULL
 # Character used between entries in classpath
 CLASSPATH_SEPARATOR = :
-# suffix used for object file (.o for unix .obj for windows)
-OBJECT_SUFFIX = o
-# The suffix applied to runtime libraries
-LIBRARY_SUFFIX = so
-# The suffix applied to link libraries
-LIB_SUFFIX = so
-# The suffix applied to executables (.exe for windows, nothing for solaris)
-EXE_SUFFIX =
-# The prefix applied to library files (lib for solaris, nothing for windows)
-LIB_PREFIX = lib
 # User name determination (set _USER)
 ifndef USER
 ifdef LOGNAME
 _USER := $(LOGNAME)
 else
 _USER := $(shell logname)
 endif
 else
 _USER:=$(USER)
 endif
-# Location of client/server directories
-ARCH_VM_SUBDIR=jre/lib/$(LIBARCH)
 endif
 # If blanks in the username, use the first 4 words and pack them together
 _USER1:=$(subst ', ,$(_USER))
 _USER2:=$(subst ", ,$(_USER1))

Mercurial > jdk8-mips64-public > corba / file comparison

comparison: make/common/shared/Platform.gmk

make/common/shared/Platform.gmk