Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/.hgignore	Fri Feb 24 18:22:48 2012 -0800
     1.2 +++ b/.hgignore	Tue Mar 06 20:25:43 2012 +0000
     1.3 @@ -2,3 +2,4 @@
     1.4  ^dist/
     1.5  /nbproject/private/
     1.6  ^.hgtip
     1.7 +.DS_Store

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/make/common/Defs-bsd.gmk	Tue Mar 06 20:25:43 2012 +0000
     2.3 @@ -0,0 +1,46 @@
     2.4 +#
     2.5 +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
     2.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 +#
     2.8 +# This code is free software; you can redistribute it and/or modify it
     2.9 +# under the terms of the GNU General Public License version 2 only, as
    2.10 +# published by the Free Software Foundation.  Oracle designates this
    2.11 +# particular file as subject to the "Classpath" exception as provided
    2.12 +# by Oracle in the LICENSE file that accompanied this code.
    2.13 +#
    2.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
    2.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.16 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.17 +# version 2 for more details (a copy is included in the LICENSE file that
    2.18 +# accompanied this code).
    2.19 +#
    2.20 +# You should have received a copy of the GNU General Public License version
    2.21 +# 2 along with this work; if not, write to the Free Software Foundation,
    2.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.23 +#
    2.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.25 +# or visit www.oracle.com if you need additional information or have any
    2.26 +# questions.
    2.27 +#
    2.28 +
    2.29 +#
    2.30 +# Makefile to specify compiler flags for programs and libraries
    2.31 +# targeted to BSD.  Should not contain any rules.
    2.32 +#
    2.33 +
    2.34 +# Warning: the following variables are overriden by Defs.gmk. Set
    2.35 +# values will be silently ignored:
    2.36 +#   CFLAGS        (set $(OTHER_CFLAGS) instead)
    2.37 +#   CPPFLAGS      (set $(OTHER_CPPFLAGS) instead)
    2.38 +#   CXXFLAGS      (set $(OTHER_CXXFLAGS) instead)
    2.39 +#   LDFLAGS       (set $(OTHER_LDFAGS) instead)
    2.40 +#   LDLIBS        (set $(EXTRA_LIBS) instead)
    2.41 +#   LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
    2.42 +
    2.43 +# Get shared JDK settings
    2.44 +include $(BUILDDIR)/common/shared/Defs.gmk
    2.45 +
    2.46 +ifndef PLATFORM_SRC
    2.47 +  PLATFORM_SRC = $(TOPDIR)/src/solaris
    2.48 +endif # PLATFORM_SRC
    2.49 +

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/make/common/shared/Defs-bsd.gmk	Tue Mar 06 20:25:43 2012 +0000
     3.3 @@ -0,0 +1,131 @@
     3.4 +#
     3.5 +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
     3.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.7 +#
     3.8 +# This code is free software; you can redistribute it and/or modify it
     3.9 +# under the terms of the GNU General Public License version 2 only, as
    3.10 +# published by the Free Software Foundation.  Oracle designates this
    3.11 +# particular file as subject to the "Classpath" exception as provided
    3.12 +# by Oracle in the LICENSE file that accompanied this code.
    3.13 +#
    3.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
    3.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.16 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    3.17 +# version 2 for more details (a copy is included in the LICENSE file that
    3.18 +# accompanied this code).
    3.19 +#
    3.20 +# You should have received a copy of the GNU General Public License version
    3.21 +# 2 along with this work; if not, write to the Free Software Foundation,
    3.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.23 +#
    3.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.25 +# or visit www.oracle.com if you need additional information or have any
    3.26 +# questions.
    3.27 +#
    3.28 +
    3.29 +#
    3.30 +# Definitions for Bsd.
    3.31 +#
    3.32 +
    3.33 +# Default for COMPILER_WARNINGS_FATAL on Bsd (C & C++ compiler warnings)
    3.34 +ifndef COMPILER_WARNINGS_FATAL
    3.35 +  COMPILER_WARNINGS_FATAL=false
    3.36 +endif
    3.37 +
    3.38 +# Bsd should use parallel compilation for best build times
    3.39 +ifndef COMPILE_APPROACH
    3.40 +  COMPILE_APPROACH = parallel
    3.41 +endif
    3.42 +
    3.43 +# Indication that we are doing an incremental build.
    3.44 +#    This may trigger the creation of make depend files.
    3.45 +ifndef INCREMENTAL_BUILD
    3.46 +  INCREMENTAL_BUILD = false
    3.47 +endif
    3.48 +
    3.49 +# FullPath just makes sure it never ends with a / and no duplicates
    3.50 +define FullPath
    3.51 +$(shell cd $1 2> $(DEV_NULL) && pwd)
    3.52 +endef
    3.53 +
    3.54 +# OptFullPath: Absolute path name of a dir that might not initially exist.
    3.55 +define OptFullPath
    3.56 +$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
    3.57 +endef
    3.58 +
    3.59 +# Location on system where jdk installs might be
    3.60 +USRJDKINSTANCES_PATH =$(PACKAGE_PATH)
    3.61 +
    3.62 +# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
    3.63 +#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
    3.64 +ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
    3.65 +  UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
    3.66 +else
    3.67 +  UNIXCOMMAND_PATH  = /bin/
    3.68 +endif
    3.69 +
    3.70 +# USRBIN_PATH: path to where the most common Unix commands are.
    3.71 +#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
    3.72 +ifneq "$(origin ALT_USRBIN_PATH)" "undefined"
    3.73 +  USRBIN_PATH :=$(call PrefixPath,$(ALT_USRBIN_PATH))
    3.74 +else
    3.75 +  USRBIN_PATH  = /usr/bin/
    3.76 +endif
    3.77 +
    3.78 +# UNIXCCS_PATH: path to where the Solaris ported UNIX commands can be found
    3.79 +#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
    3.80 +ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
    3.81 +  UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
    3.82 +else
    3.83 +  UNIXCCS_PATH = /usr/ccs/bin/
    3.84 +endif
    3.85 +
    3.86 +# SLASH_JAVA: location of all network accessable files
    3.87 +ifdef ALT_SLASH_JAVA
    3.88 +  SLASH_JAVA  :=$(ALT_SLASH_JAVA)
    3.89 +else
    3.90 +  SLASH_JAVA  := $(call DirExists,/java,/java,/NOT-SET)
    3.91 +endif
    3.92 +
    3.93 +# JDK_DEVTOOLS_DIR: common path for all the java devtools
    3.94 +ifdef ALT_JDK_DEVTOOLS_DIR
    3.95 +  JDK_DEVTOOLS_DIR  =$(ALT_JDK_DEVTOOLS_DIR)
    3.96 +else
    3.97 +  JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
    3.98 +endif
    3.99 +
   3.100 +# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
   3.101 +#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
   3.102 +ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
   3.103 +  DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
   3.104 +else
   3.105 +  DEVTOOLS_PATH =$(PACKAGE_PATH)/bin/
   3.106 +endif
   3.107 +
   3.108 +# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
   3.109 +# _BOOTDIR2: Second choice
   3.110 +ifndef ALT_BOOTDIR
   3.111 +  _BOOTDIR1  =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
   3.112 +  _BOOTDIR2  =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
   3.113 +endif
   3.114 +
   3.115 +# Import JDK images allow for partial builds, components not built are
   3.116 +#    imported (or copied from) these import areas when needed.
   3.117 +
   3.118 +# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
   3.119 +#   multiple platforms, e.g. windows-i586, solaris-sparc, bsd-586, etc.
   3.120 +ifdef ALT_BUILD_JDK_IMPORT_PATH
   3.121 +  BUILD_JDK_IMPORT_PATH  :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
   3.122 +else
   3.123 +  BUILD_JDK_IMPORT_PATH   = $(PROMOTED_BUILD_BINARIES)
   3.124 +endif
   3.125 +BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
   3.126 +
   3.127 +# JDK_IMPORT_PATH: location of JDK install tree (this version) to import
   3.128 +ifdef ALT_JDK_IMPORT_PATH
   3.129 +  JDK_IMPORT_PATH  :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
   3.130 +else
   3.131 +  JDK_IMPORT_PATH   = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
   3.132 +endif
   3.133 +JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
   3.134 +

     4.1 --- a/make/common/shared/Defs-utils.gmk	Fri Feb 24 18:22:48 2012 -0800
     4.2 +++ b/make/common/shared/Defs-utils.gmk	Tue Mar 06 20:25:43 2012 +0000
     4.3 @@ -31,7 +31,7 @@
     4.4  # These input UTILS_* variables can be defined at anytime, ideally once.
     4.5  #         Unix Commands: Normally /bin/, /usr/bin/. or C:/mksnt/mksnt/
     4.6  #            UTILS_COMMAND_PATH
     4.7 -#         /usr/bin/ 
     4.8 +#         /usr/bin/
     4.9  #            UTILS_USR_BIN_PATH
    4.10  #         /usr/ccs/bin/ (sccs, m4, lex, yacc, as, ar, strip, mcs)
    4.11  #            UTILS_CCS_BIN_PATH
    4.12 @@ -53,6 +53,13 @@
    4.13    UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
    4.14  endif
    4.15  
    4.16 +ifeq ($(PLATFORM),bsd)
    4.17 +  UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
    4.18 +  UTILS_USR_BIN_PATH=$(USRBIN_PATH)
    4.19 +  UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
    4.20 +  UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
    4.21 +endif
    4.22 +
    4.23  ifeq ($(PLATFORM),solaris)
    4.24    UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
    4.25    UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
    4.26 @@ -166,15 +173,15 @@
    4.27    # Also, some distribution (Ubuntu, Debian, others?) place the rpm command
    4.28    # itself in /usr/bin rather than it's traditional home in /bin.
    4.29    RPM=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpm) \
    4.30 -		  $(wildcard $(UTILS_USR_BIN_PATH)rpm))
    4.31 +                  $(wildcard $(UTILS_USR_BIN_PATH)rpm))
    4.32    RPMBUILD=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpmbuild) \
    4.33 -		       $(wildcard $(UTILS_USR_BIN_PATH)rpmbuild) \
    4.34 -		       $(wildcard $(UTILS_COMMAND_PATH)rpm) \
    4.35 -		       $(wildcard $(UTILS_USR_BIN_PATH)rpm))
    4.36 +                       $(wildcard $(UTILS_USR_BIN_PATH)rpmbuild) \
    4.37 +                       $(wildcard $(UTILS_COMMAND_PATH)rpm) \
    4.38 +                       $(wildcard $(UTILS_USR_BIN_PATH)rpm))
    4.39    # Most Linux distros have "sort" in /bin.  Ubuntu, Debian and perhaps
    4.40    # others have it in /usr/bin.
    4.41    SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
    4.42 -		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
    4.43 +                   $(wildcard $(UTILS_USR_BIN_PATH)sort))
    4.44    NAWK           = $(USRBIN_PATH)gawk
    4.45    # Intrinsic unix command, with backslash-escaped character interpretation
    4.46    ECHO           = /bin/echo -e
    4.47 @@ -198,3 +205,34 @@
    4.48    ECHO           = /usr/bin/echo
    4.49  endif
    4.50  
    4.51 +# BSD specific
    4.52 +ifeq ($(PLATFORM),bsd)
    4.53 +  BASENAME     = $(UTILS_USR_BIN_PATH)basename
    4.54 +  EGREP        = $(UTILS_USR_BIN_PATH)egrep
    4.55 +  EXPR         = $(UTILS_COMMAND_PATH)expr
    4.56 +  FMT          = $(UTILS_USR_BIN_PATH)fmt
    4.57 +  GREP         = $(UTILS_USR_BIN_PATH)grep
    4.58 +  GUNZIP       = $(UTILS_USR_BIN_PATH)gunzip
    4.59 +  ID           = $(UTILS_USR_BIN_PATH)id
    4.60 +  MSGFMT       = $(UTILS_DEVTOOL_PATH)msgfmt
    4.61 +  SED          = $(UTILS_USR_BIN_PATH)sed
    4.62 +  SORT         = $(UTILS_USR_BIN_PATH)sort
    4.63 +  TEST         = $(UTILS_COMMAND_PATH)test
    4.64 +  TOUCH        = $(UTILS_USR_BIN_PATH)touch
    4.65 +  TRUE         = $(UTILS_USR_BIN_PATH)true
    4.66 +  UNAME        = $(UTILS_USR_BIN_PATH)uname
    4.67 +  # BSD OS_VENDOR specific
    4.68 +  ifeq ($(OS_VENDOR), Apple)
    4.69 +    NAWK       = $(UTILS_USR_BIN_PATH)awk
    4.70 +    UNZIPSFX   = $(UTILS_USR_BIN_PATH)unzipsfx
    4.71 +    ZIPEXE     = $(UTILS_USR_BIN_PATH)zip
    4.72 +  else
    4.73 +    UNZIP      = $(UTILS_DEVTOOL_PATH)unzip
    4.74 +  endif
    4.75 +  ifeq ($(OS_VENDOR), OpenBSD)
    4.76 +    NAWK       = $(UTILS_USR_BIN_PATH)awk
    4.77 +  else
    4.78 +    CPIO       = $(UTILS_USR_BIN_PATH)cpio
    4.79 +    TAR        = $(UTILS_USR_BIN_PATH)tar
    4.80 +  endif
    4.81 +endif

     5.1 --- a/make/common/shared/Platform.gmk	Fri Feb 24 18:22:48 2012 -0800
     5.2 +++ b/make/common/shared/Platform.gmk	Tue Mar 06 20:25:43 2012 +0000
     5.3 @@ -62,8 +62,8 @@
     5.4  #     CLASSPATH_SEPARATOR         separator in classpath, ; or :
     5.5  #     BUNDLE_FILE_SUFFIX          suffix for bundles: .tar or .tar.gz
     5.6  #     ISA_DIR                     solaris only: /sparcv9 or /amd64
     5.7 -#     REQUIRED_WINDOWS_NAME       windows only: basic name of windows 
     5.8 -#     REQUIRED_WINDOWS_VERSION    windows only: specific version of windows 
     5.9 +#     REQUIRED_WINDOWS_NAME       windows only: basic name of windows
    5.10 +#     REQUIRED_WINDOWS_VERSION    windows only: specific version of windows
    5.11  #     USING_CYGWIN                windows only: true or false
    5.12  #     WINDOWS_NT_VERSION_STRING   windows only: long version name
    5.13  #     REQUIRED_OS_VERSION         required OS version, e.g. 5.10, 2.4
    5.14 @@ -135,7 +135,7 @@
    5.15    BUNDLE_FILE_SUFFIX=.tar
    5.16    # Required Solaris version
    5.17    REQUIRED_OS_VERSION = 5.10
    5.18 -  # Minimum disk space needed as determined by running 'du -sk' on 
    5.19 +  # Minimum disk space needed as determined by running 'du -sk' on
    5.20    #    a fully built workspace.
    5.21    ifeq ($(ARCH_FAMILY), sparc)
    5.22      REQUIRED_FREE_SPACE=1300000
    5.23 @@ -207,7 +207,7 @@
    5.24  
    5.25    # Suffix for file bundles used in previous release
    5.26    BUNDLE_FILE_SUFFIX=.tar.gz
    5.27 -  # Minimum disk space needed as determined by running 'du -sk' on 
    5.28 +  # Minimum disk space needed as determined by running 'du -sk' on
    5.29    #    a fully built workspace.
    5.30    REQUIRED_FREE_SPACE=1460000
    5.31    LINUX_VERSION_INFO = /etc/redhat-release
    5.32 @@ -231,6 +231,98 @@
    5.33    MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
    5.34  endif
    5.35  
    5.36 +ifeq ($(SYSTEM_UNAME), FreeBSD)
    5.37 +  PLATFORM = bsd
    5.38 +  OS_NAME = freebsd
    5.39 +  OS_VENDOR = FreeBSD
    5.40 +  REQUIRED_OS_VERSION = 6.0
    5.41 +endif
    5.42 +
    5.43 +ifeq ($(SYSTEM_UNAME), Darwin)
    5.44 +  PLATFORM = bsd
    5.45 +  OS_NAME = darwin
    5.46 +  OS_VENDOR = Apple
    5.47 +  REQUIRED_OS_VERSION = 8.0
    5.48 +endif
    5.49 +
    5.50 +ifeq ($(SYSTEM_UNAME), NetBSD)
    5.51 +  PLATFORM = bsd
    5.52 +  OS_NAME = netbsd
    5.53 +  OS_VENDOR = NetBSD
    5.54 +  REQUIRED_OS_VERSION = 3.0
    5.55 +endif
    5.56 +
    5.57 +ifeq ($(SYSTEM_UNAME), OpenBSD)
    5.58 +  PLATFORM = bsd
    5.59 +  OS_NAME = openbsd
    5.60 +  OS_VENDOR = OpenBSD
    5.61 +  REQUIRED_OS_VERSION = 4.9
    5.62 +endif
    5.63 +
    5.64 +# Platform settings specific to BSD
    5.65 +ifeq ($(PLATFORM), bsd)
    5.66 +  OS_VERSION := $(shell uname -r)
    5.67 +  # Arch and OS name/version
    5.68 +  mach := $(shell uname -m)
    5.69 +  archExpr = case "$(mach)" in \
    5.70 +                i[3-9]86) \
    5.71 +                    echo i586 \
    5.72 +                    ;; \
    5.73 +                sparc64) \
    5.74 +                    echo sparcv9 \
    5.75 +                    ;; \
    5.76 +                sparc*) \
    5.77 +                    echo sparc \
    5.78 +                    ;; \
    5.79 +                x86_64) \
    5.80 +                    echo amd64 \
    5.81 +                    ;; \
    5.82 +                "Power Macintosh") \
    5.83 +                    echo ppc \
    5.84 +                    ;; \
    5.85 +                *) \
    5.86 +                    echo $(mach) \
    5.87 +                    ;; \
    5.88 +      esac
    5.89 +  ARCH        := $(shell $(archExpr) )
    5.90 +  ARCH_FAMILY := $(ARCH)
    5.91 +
    5.92 +  # Darwin x86 builds are i386/amd64 universal.
    5.93 +  ifeq ($(SYSTEM_UNAME), Darwin)
    5.94 +    ifneq ($(ARCH), ppc)
    5.95 +      ARCH=universal
    5.96 +    endif
    5.97 +  endif
    5.98 +
    5.99 +  # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
   5.100 +  ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))
   5.101 +    ARCH_DATA_MODEL=32
   5.102 +  else
   5.103 +    ARCH_DATA_MODEL=64
   5.104 +  endif
   5.105 +
   5.106 +  ifeq ($(ARCH), i586)
   5.107 +    LIBARCH = i386
   5.108 +  else
   5.109 +    LIBARCH = $(ARCH)
   5.110 +  endif
   5.111 +
   5.112 +  # Value of Java os.arch property
   5.113 +  ARCHPROP  = $(LIBARCH)
   5.114 +
   5.115 +  # Suffix for file bundles used in previous release
   5.116 +  BUNDLE_FILE_SUFFIX=.tar.gz
   5.117 +  # Minimum disk space needed as determined by running 'du -sk' on
   5.118 +  #    a fully built workspace.
   5.119 +  REQUIRED_FREE_SPACE=1500000
   5.120 +  # How much RAM does this machine have:
   5.121 +  ifeq ($(OS_VENDOR), OpenBSD)
   5.122 +    MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' )
   5.123 +  else
   5.124 +    MB_OF_MEMORY=$(shell (sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' )
   5.125 +  endif
   5.126 +endif
   5.127 +
   5.128  # Windows with and without CYGWIN will be slightly different
   5.129  ifeq ($(SYSTEM_UNAME), Windows_NT)
   5.130    PLATFORM = windows
   5.131 @@ -327,7 +419,7 @@
   5.132    endif
   5.133    # Suffix for file bundles used in previous release
   5.134    BUNDLE_FILE_SUFFIX=.tar
   5.135 -  # Minimum disk space needed as determined by running 'du -sk' on 
   5.136 +  # Minimum disk space needed as determined by running 'du -sk' on
   5.137    #    a fully built workspace.
   5.138    REQUIRED_FREE_SPACE=500000
   5.139    # How much RAM does this machine have:
   5.140 @@ -335,8 +427,8 @@
   5.141      MB_OF_MEMORY := $(shell \
   5.142        if [ -f "C:/cygwin/bin/free.exe" ] ; then \
   5.143          ( C:/cygwin/bin/bash.exe -c "C:/cygwin/bin/free.exe -m" ) | \
   5.144 -	  grep Mem: | \
   5.145 -	  sed -e 's@\ \ *@ @g' | cut -d' ' -f2 ; \
   5.146 +          grep Mem: | \
   5.147 +          sed -e 's@\ \ *@ @g' | cut -d' ' -f2 ; \
   5.148        else \
   5.149          echo "512"; \
   5.150        fi)
   5.151 @@ -392,7 +484,7 @@
   5.152    # Where is unwanted output to be delivered?
   5.153    DEV_NULL = /dev/null
   5.154    export DEV_NULL
   5.155 -  # Character used between entries in classpath 
   5.156 +  # Character used between entries in classpath
   5.157    CLASSPATH_SEPARATOR = :
   5.158    # User name determination (set _USER)
   5.159    ifndef USER