Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
29 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk

  • trunk/openjdk/hotspot/make/windows/README

    r2 r278  
    1 Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
     1Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
    22DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33 
     
    1616Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1717 
    18 Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    19 CA 95054 USA or visit www.sun.com if you need additional information or
    20 have any questions.
     18Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     19or visit www.oracle.com if you need additional information or have any
     20questions.
    2121
    2222________________________________________________________________________________
  • trunk/openjdk/hotspot/make/windows/build.bat

    r2 r278  
    11@echo off
    22REM
    3 REM Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
     3REM Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    44REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55REM
     
    1818REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919REM
    20 REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 REM CA 95054 USA or visit www.sun.com if you need additional information or
    22 REM have any questions.
     20REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21REM or visit www.oracle.com if you need additional information or have any
     22REM questions.
    2323REM 
    2424REM
     
    2828REM Since we don't have uname and we could be cross-compiling,
    2929REM Use the compiler to determine which ARCH we are building
     30REM
     31REM Note: Running this batch file from the Windows command shell requires
     32REM that "grep" be accessible on the PATH. An MKS install does this.
    3033REM
    3134cl 2>&1 | grep "IA-64" >NUL
     
    5861if "%1" == "debug"     goto test1
    5962if "%1" == "fastdebug" goto test1
     63if "%1" == "tree"      goto test1
    6064goto usage
    6165
    6266:test1
    6367if "%2" == "core"      goto test2
    64 if "%2" == "kernel"   goto test2
     68if "%2" == "kernel"    goto test2
    6569if "%2" == "compiler1" goto test2
    6670if "%2" == "compiler2" goto test2
     
    7175
    7276:test2
     77if "%1" == "tree"      goto build_tree
    7378REM check_j2se_version
    7479REM jvmti.make requires J2SE 1.4.x or newer.
     
    9499goto end
    95100
     101:build_tree
     102nmake -f %3/make/windows/build.make Variant=%2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION="%5" %1
     103goto end
     104
    96105:usage
    97106echo Usage: build flavor version workspace bootstrap_dir [build_id] [windbg_home]
     
    101110echo version is "core", "kernel", "compiler1", "compiler2", or "tiered",
    102111echo workspace is source directory without trailing slash,
    103 echo bootstrap_dir is a full path to echo a JDK in which bin/java
    104 echo   and bin/javac are present and working, and echo build_id is an
     112echo bootstrap_dir is a full path to a JDK in which bin/java
     113echo   and bin/javac are present and working, and build_id is an
    105114echo   optional build identifier displayed by java -version
     115exit /b 1
    106116
    107117:end
     118exit /b %errorlevel%
  • trunk/openjdk/hotspot/make/windows/build.make

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
     
    2727# environment variables (Variant, WorkSpace, BootStrapDir, BuildUser, HOTSPOT_BUILD_VERSION)
    2828# are passed in as command line arguments.
     29
     30# Note: Running nmake or build.bat from the Windows command shell requires
     31# that "sh" be accessible on the PATH. An MKS install does this.
    2932
    3033# SA components are built if BUILD_WIN_SA=1 is specified.
     
    233236        cd $(variantDir)
    234237        nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=product DEVELOP=1 ARCH=$(ARCH)
     238
     239# target to create just the directory structure
     240tree: checks $(variantDir) $(variantDir)\local.make sanity
     241        mkdir $(variantDir)\product
     242        mkdir $(variantDir)\debug
     243        mkdir $(variantDir)\fastdebug
    235244
    236245sanity:
  • trunk/openjdk/hotspot/make/windows/build_vm_def.sh

    r2 r278  
    11#
    2 # Copyright 2000-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
     
    5959
    6060if [ "x$LINK_VER" != "x800" -a  "x$LINK_VER" != "x900" ]; then
    61 $DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
     61$DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
    6262else
    6363# Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def
    6464$DUMPBIN /OUT:vm3.def /symbols *.obj
    65 "$CAT" vm3.def | "$GREP" "??_7.*@@6B@" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
     65"$CAT" vm3.def | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
    6666"$RM" -f vm3.def
    6767fi
  • trunk/openjdk/hotspot/make/windows/create.bat

    r2 r278  
    11@echo off
    22REM
    3 REM Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
     3REM Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
    44REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55REM
     
    1818REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919REM
    20 REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 REM CA 95054 USA or visit www.sun.com if you need additional information or
    22 REM have any questions.
     20REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21REM or visit www.oracle.com if you need additional information or have any
     22REM questions.
    2323REM 
    2424REM
     
    3636REM Since we don't have uname and we could be cross-compiling,
    3737REM Use the compiler to determine which ARCH we are building
     38REM
     39REM Note: Running this batch file from the Windows command shell requires
     40REM that "grep" be accessible on the PATH. An MKS install does this.
    3841REM
    3942cl 2>&1 | grep "IA-64" >NUL
  • trunk/openjdk/hotspot/make/windows/cross_build.bat

    r2 r278  
    11@echo off
    22REM
    3 REM Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     3REM Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    44REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55REM
     
    1818REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919REM
    20 REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 REM CA 95054 USA or visit www.sun.com if you need additional information or
    22 REM have any questions.
     20REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21REM or visit www.oracle.com if you need additional information or have any
     22REM questions.
    2323REM 
    2424REM
  • trunk/openjdk/hotspot/make/windows/get_msc_ver.sh

    r2 r278  
    11#
    2 # Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
     24
     25set -e
    2426
    2527# This shell script echoes "MSC_VER=<munged version of cl>"
     
    3941
    4042if [ "x$HotSpotMksHome" != "x" ]; then
    41  MKS_HOME="$HotSpotMksHome"
     43  TOOL_DIR="$HotSpotMksHome"
    4244else
    43  SH=`which sh`
    44  MKS_HOME=`dirname "$SH"`
     45  # HotSpotMksHome is not set so use the directory that contains "sh".
     46  # This works with both MKS and Cygwin.
     47  SH=`which sh`
     48  TOOL_DIR=`dirname "$SH"`
    4549fi
    4650
    47 HEAD="$MKS_HOME/head"
    48 ECHO="$MKS_HOME/echo"
    49 EXPR="$MKS_HOME/expr"
    50 CUT="$MKS_HOME/cut"
    51 SED="$MKS_HOME/sed"
     51DIRNAME="$TOOL_DIR/dirname"
     52HEAD="$TOOL_DIR/head"
     53ECHO="$TOOL_DIR/echo"
     54EXPR="$TOOL_DIR/expr"
     55CUT="$TOOL_DIR/cut"
     56SED="$TOOL_DIR/sed"
    5257
    5358if [ "x$FORCE_MSC_VER" != "x" ]; then
     
    7176  echo "LINK_VER=$FORCE_LINK_VER"
    7277else
    73   LINK_VER_RAW=`link 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'`
     78  # use the "link" command that is co-located with the "cl" command
     79  cl_cmd=`which cl`
     80  if [ "x$cl_cmd" != "x" ]; then
     81    link_cmd=`$DIRNAME "$cl_cmd"`/link
     82  else
     83    # which can't find "cl" so just use which ever "link" we find
     84    link_cmd="link"
     85  fi
     86  LINK_VER_RAW=`"$link_cmd" 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'`
    7487  LINK_VER_MAJOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f1`
    7588  LINK_VER_MINOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f2`
  • trunk/openjdk/hotspot/make/windows/makefiles/adlc.make

    r2 r278  
    11#
    2 # Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/makefiles/compile.make

    r2 r278  
    11#
    2 # Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
     
    9393#      1400 is for VS2005
    9494#      1500 is for VS2008
     95#      1600 is for VS2010
    9596#    Do not confuse this MSC_VER with the predefined macro _MSC_VER that the
    9697#    compiler provides, when MSC_VER==1399, _MSC_VER will be 1400.
     
    122123COMPILER_NAME=VS2008
    123124!endif
     125!if "$(MSC_VER)" == "1600"
     126COMPILER_NAME=VS2010
     127!endif
    124128!endif
    125129
     
    174178
    175179!if "$(COMPILER_NAME)" == "VS2008"
     180PRODUCT_OPT_OPTION   = /O2 /Oy-
     181FASTDEBUG_OPT_OPTION = /O2 /Oy-
     182DEBUG_OPT_OPTION     = /Od
     183GX_OPTION = /EHsc
     184LINK_FLAGS = /manifest $(LINK_FLAGS)
     185# Manifest Tool - used in VS2005 and later to adjust manifests stored
     186# as resources inside build artifacts.
     187MT=mt.exe
     188!endif
     189
     190!if "$(COMPILER_NAME)" == "VS2010"
    176191PRODUCT_OPT_OPTION   = /O2 /Oy-
    177192FASTDEBUG_OPT_OPTION = /O2 /Oy-
  • trunk/openjdk/hotspot/make/windows/makefiles/debug.make

    r2 r278  
    11#
    2 # Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/makefiles/defs.make

    r2 r278  
    11#
    2 # Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
     
    3333
    3434# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
     35ifeq ($(ARCH_DATA_MODEL),32)
     36  ARCH_DATA_MODEL=32
     37  PLATFORM=windows-i586
     38  VM_PLATFORM=windows_i486
     39  HS_ARCH=x86
     40  MAKE_ARGS += ARCH=x86
     41  MAKE_ARGS += BUILDARCH=i486
     42  MAKE_ARGS += Platform_arch=x86
     43  MAKE_ARGS += Platform_arch_model=x86_32
     44endif
     45
    3546ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) x86),)
    3647  ARCH_DATA_MODEL=32
     
    4455endif
    4556
    46 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),)
    47   ARCH_DATA_MODEL=64
    48   PLATFORM=windows-ia64
    49   VM_PLATFORM=windows_ia64
    50   HS_ARCH=ia64
    51   MAKE_ARGS += LP64=1
    52   MAKE_ARGS += ARCH=ia64
    53   MAKE_ARGS += BUILDARCH=ia64
    54   MAKE_ARGS += Platform_arch=ia64
    55   MAKE_ARGS += Platform_arch_model=ia64
    56 endif
    57 
    58 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
    59   ARCH_DATA_MODEL=64
    60   PLATFORM=windows-amd64
    61   VM_PLATFORM=windows_amd64
    62   HS_ARCH=x86
    63   MAKE_ARGS += LP64=1
    64   MAKE_ARGS += ARCH=x86
    65   MAKE_ARGS += BUILDARCH=amd64
    66   MAKE_ARGS += Platform_arch=x86
    67   MAKE_ARGS += Platform_arch_model=x86_64
     57ifneq ($(ARCH_DATA_MODEL),32)
     58  ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),)
     59    ARCH_DATA_MODEL=64
     60    PLATFORM=windows-ia64
     61    VM_PLATFORM=windows_ia64
     62    HS_ARCH=ia64
     63    MAKE_ARGS += LP64=1
     64    MAKE_ARGS += ARCH=ia64
     65    MAKE_ARGS += BUILDARCH=ia64
     66    MAKE_ARGS += Platform_arch=ia64
     67    MAKE_ARGS += Platform_arch_model=ia64
     68  endif
     69
     70# http://support.microsoft.com/kb/888731 : this can be either
     71# AMD64 for AMD, or EM64T for Intel chips.
     72  ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
     73    ARCH_DATA_MODEL=64
     74    PLATFORM=windows-amd64
     75    VM_PLATFORM=windows_amd64
     76    HS_ARCH=x86
     77    MAKE_ARGS += LP64=1
     78    MAKE_ARGS += ARCH=x86
     79    MAKE_ARGS += BUILDARCH=amd64
     80    MAKE_ARGS += Platform_arch=x86
     81    MAKE_ARGS += Platform_arch_model=x86_64
     82  endif
     83
     84ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),)
     85    ARCH_DATA_MODEL=64
     86    PLATFORM=windows-amd64
     87    VM_PLATFORM=windows_amd64
     88    HS_ARCH=x86
     89    MAKE_ARGS += LP64=1
     90    MAKE_ARGS += ARCH=x86
     91    MAKE_ARGS += BUILDARCH=amd64
     92    MAKE_ARGS += Platform_arch=x86
     93    MAKE_ARGS += Platform_arch_model=x86_64
     94  endif
     95
     96# NB later OS versions than 2003 may report "Intel64"
     97  ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
     98    ARCH_DATA_MODEL=64
     99    PLATFORM=windows-amd64
     100    VM_PLATFORM=windows_amd64
     101    HS_ARCH=x86
     102    MAKE_ARGS += LP64=1
     103    MAKE_ARGS += ARCH=x86
     104    MAKE_ARGS += BUILDARCH=amd64
     105    MAKE_ARGS += Platform_arch=x86
     106    MAKE_ARGS += Platform_arch_model=x86_64
     107  endif
    68108endif
    69109
  • trunk/openjdk/hotspot/make/windows/makefiles/fastdebug.make

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/makefiles/generated.make

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/makefiles/jvmti.make

    r2 r278  
    11#
    2 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/makefiles/makedeps.make

    r2 r278  
    11#
    2 # Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/makefiles/product.make

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/makefiles/rules.make

    r2 r278  
    11#
    2 # Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/makefiles/sa.make

    r2 r278  
    11#
    2 # Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/makefiles/sanity.make

    r2 r278  
    11#
    2 # Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
     
    2828
    2929checkCL:
    30         @ if "$(MSC_VER)" NEQ "1310" if "$(MSC_VER)" NEQ "1399" if "$(MSC_VER)" NEQ "1400" if "$(MSC_VER)" NEQ "1500" \
     30        @ if "$(MSC_VER)" NEQ "1310" if "$(MSC_VER)" NEQ "1399" if "$(MSC_VER)" NEQ "1400" if "$(MSC_VER)" NEQ "1500" if "$(MSC_VER)" NEQ "1600" \
    3131        echo *** WARNING *** unrecognized cl.exe version $(MSC_VER) ($(RAW_MSC_VER)).  Use FORCE_MSC_VER to override automatic detection.
    3232
    3333checkLink:
    34         @ if "$(LINK_VER)" NEQ "710" if "$(LINK_VER)" NEQ "800" if "$(LINK_VER)" NEQ "900" \
     34        @ if "$(LINK_VER)" NEQ "710" if "$(LINK_VER)" NEQ "800" if "$(LINK_VER)" NEQ "900" if "$(LINK_VER)" NEQ "1000" \
    3535        echo *** WARNING *** unrecognized link.exe version $(LINK_VER) ($(RAW_LINK_VER)).  Use FORCE_LINK_VER to override automatic detection.
  • trunk/openjdk/hotspot/make/windows/makefiles/shared.make

    r2 r278  
    11#
    2 # Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/makefiles/top.make

    r2 r278  
    11#
    2 # Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/makefiles/vm.make

    r2 r278  
    11#
    2 # Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/projectfiles/common/Makefile

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/projectfiles/compiler1/Makefile

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/projectfiles/compiler2/Makefile

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/projectfiles/core/Makefile

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/projectfiles/kernel/Makefile

    r2 r278  
    11#
    2 # Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#   
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#   
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
  • trunk/openjdk/hotspot/make/windows/projectfiles/tiered/Makefile

    r2 r278  
    11#
    2 # Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222
    2323#
Note: See TracChangeset for help on using the changeset viewer.