Changeset 278 for trunk/openjdk/hotspot/make/windows/makefiles
- Timestamp:
- Mar 26, 2011, 8:39:20 PM (14 years ago)
- Location:
- trunk/openjdk
- Files:
-
- 16 edited
-
. (modified) (2 props)
-
hotspot/make/windows/makefiles/adlc.make (modified) (2 diffs)
-
hotspot/make/windows/makefiles/compile.make (modified) (5 diffs)
-
hotspot/make/windows/makefiles/debug.make (modified) (2 diffs)
-
hotspot/make/windows/makefiles/defs.make (modified) (4 diffs)
-
hotspot/make/windows/makefiles/fastdebug.make (modified) (2 diffs)
-
hotspot/make/windows/makefiles/generated.make (modified) (2 diffs)
-
hotspot/make/windows/makefiles/jvmti.make (modified) (2 diffs)
-
hotspot/make/windows/makefiles/makedeps.make (modified) (2 diffs)
-
hotspot/make/windows/makefiles/product.make (modified) (2 diffs)
-
hotspot/make/windows/makefiles/rules.make (modified) (2 diffs)
-
hotspot/make/windows/makefiles/sa.make (modified) (2 diffs)
-
hotspot/make/windows/makefiles/sanity.make (modified) (3 diffs)
-
hotspot/make/windows/makefiles/shared.make (modified) (2 diffs)
-
hotspot/make/windows/makefiles/top.make (modified) (2 diffs)
-
hotspot/make/windows/makefiles/vm.make (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/openjdk
- Property svn:ignore
-
old new 1 1 build 2 build-product-release
-
-
Property svn:mergeinfo
set to
/branches/vendor/oracle/openjdk6/b22 merged eligible /branches/vendor/oracle/openjdk6/current merged eligible
- Property svn:ignore
-
trunk/openjdk/hotspot/make/windows/makefiles/adlc.make
r2 r278 1 1 # 2 # Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # -
trunk/openjdk/hotspot/make/windows/makefiles/compile.make
r2 r278 1 1 # 2 # Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # … … 93 93 # 1400 is for VS2005 94 94 # 1500 is for VS2008 95 # 1600 is for VS2010 95 96 # Do not confuse this MSC_VER with the predefined macro _MSC_VER that the 96 97 # compiler provides, when MSC_VER==1399, _MSC_VER will be 1400. … … 122 123 COMPILER_NAME=VS2008 123 124 !endif 125 !if "$(MSC_VER)" == "1600" 126 COMPILER_NAME=VS2010 127 !endif 124 128 !endif 125 129 … … 174 178 175 179 !if "$(COMPILER_NAME)" == "VS2008" 180 PRODUCT_OPT_OPTION = /O2 /Oy- 181 FASTDEBUG_OPT_OPTION = /O2 /Oy- 182 DEBUG_OPT_OPTION = /Od 183 GX_OPTION = /EHsc 184 LINK_FLAGS = /manifest $(LINK_FLAGS) 185 # Manifest Tool - used in VS2005 and later to adjust manifests stored 186 # as resources inside build artifacts. 187 MT=mt.exe 188 !endif 189 190 !if "$(COMPILER_NAME)" == "VS2010" 176 191 PRODUCT_OPT_OPTION = /O2 /Oy- 177 192 FASTDEBUG_OPT_OPTION = /O2 /Oy- -
trunk/openjdk/hotspot/make/windows/makefiles/debug.make
r2 r278 1 1 # 2 # Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # -
trunk/openjdk/hotspot/make/windows/makefiles/defs.make
r2 r278 1 1 # 2 # Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # … … 33 33 34 34 # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name 35 ifeq ($(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 44 endif 45 35 46 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) x86),) 36 47 ARCH_DATA_MODEL=32 … … 44 55 endif 45 56 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 57 ifneq ($(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 84 ifneq ($(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 68 108 endif 69 109 -
trunk/openjdk/hotspot/make/windows/makefiles/fastdebug.make
r2 r278 1 1 # 2 # Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # -
trunk/openjdk/hotspot/make/windows/makefiles/generated.make
r2 r278 1 1 # 2 # Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # -
trunk/openjdk/hotspot/make/windows/makefiles/jvmti.make
r2 r278 1 1 # 2 # Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # -
trunk/openjdk/hotspot/make/windows/makefiles/makedeps.make
r2 r278 1 1 # 2 # Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # -
trunk/openjdk/hotspot/make/windows/makefiles/product.make
r2 r278 1 1 # 2 # Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # -
trunk/openjdk/hotspot/make/windows/makefiles/rules.make
r2 r278 1 1 # 2 # Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # -
trunk/openjdk/hotspot/make/windows/makefiles/sa.make
r2 r278 1 1 # 2 # Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # -
trunk/openjdk/hotspot/make/windows/makefiles/sanity.make
r2 r278 1 1 # 2 # Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # … … 28 28 29 29 checkCL: 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" \ 31 31 echo *** WARNING *** unrecognized cl.exe version $(MSC_VER) ($(RAW_MSC_VER)). Use FORCE_MSC_VER to override automatic detection. 32 32 33 33 checkLink: 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" \ 35 35 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 1 1 # 2 # Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # -
trunk/openjdk/hotspot/make/windows/makefiles/top.make
r2 r278 1 1 # 2 # Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 # -
trunk/openjdk/hotspot/make/windows/makefiles/vm.make
r2 r278 1 1 # 2 # Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.2 # Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 18 # 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 or21 # have anyquestions.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. 22 22 # 23 23 #
Note:
See TracChangeset
for help on using the changeset viewer.
