jdk/make/common/Defs-windows.gmk
author jmelvin
Mon, 16 Apr 2012 18:09:53 -0400
changeset 12538 211d6e82fe51
parent 12309 49cad5b7b263
child 12445 9df4dd548612
permissions -rw-r--r--
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6 Summary: On Mac OS X, align system property "os.arch" with Apple legacy JDKs. Also, improve os.name string matching by using .contains() method instead of .startsWith(). This fix spans multiple repositories. Reviewed-by: dcubed, phh, ohair, katleman
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     1
#
12293
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
     2
# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     4
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
90ce3da70b43 Initial load
duke
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5381
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5381
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
# accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    20
#
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5381
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5381
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5381
diff changeset
    23
# questions.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
90ce3da70b43 Initial load
duke
parents:
diff changeset
    26
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
    27
# Makefile to specify compiler flags for programs and libraries
90ce3da70b43 Initial load
duke
parents:
diff changeset
    28
# targeted to Windows builds.  Should not contain any rules.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    29
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
    30
# WARNING: This file is shared with other workspaces. 
90ce3da70b43 Initial load
duke
parents:
diff changeset
    31
#          So when it includes other files, it must use JDK_TOPDIR.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    32
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
    33
90ce3da70b43 Initial load
duke
parents:
diff changeset
    34
# Get shared JDK settings
90ce3da70b43 Initial load
duke
parents:
diff changeset
    35
include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
90ce3da70b43 Initial load
duke
parents:
diff changeset
    36
90ce3da70b43 Initial load
duke
parents:
diff changeset
    37
# CC compiler object code output directive flag value
90ce3da70b43 Initial load
duke
parents:
diff changeset
    38
CC_OBJECT_OUTPUT_FLAG = -Fo
90ce3da70b43 Initial load
duke
parents:
diff changeset
    39
90ce3da70b43 Initial load
duke
parents:
diff changeset
    40
# The suffix applied to the library name for FDLIBM
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
FDDLIBM_SUFFIX = lib
90ce3da70b43 Initial load
duke
parents:
diff changeset
    42
# The suffix applied to scripts (.bat for windows, nothing for unix)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    43
SCRIPT_SUFFIX = .bat
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
90ce3da70b43 Initial load
duke
parents:
diff changeset
    45
# LIB_LOCATION, which for windows identifies where .exe files go, may be
90ce3da70b43 Initial load
duke
parents:
diff changeset
    46
# set by each GNUmakefile. The default is BINDIR.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    47
ifndef LIB_LOCATION
90ce3da70b43 Initial load
duke
parents:
diff changeset
    48
  LIB_LOCATION = $(BINDIR)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    49
endif # LIB_LOCATION
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
90ce3da70b43 Initial load
duke
parents:
diff changeset
    51
ifndef PLATFORM_SRC
30
7ea1edf98bfe 6668781: Openjdk windows cygwin build failure: no rule to make linker_md.obj target
ohair
parents: 2
diff changeset
    52
  PLATFORM_SRC  = $(BUILDDIR)/../src/windows
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    53
endif # PLATFORM_SRC
90ce3da70b43 Initial load
duke
parents:
diff changeset
    54
12288
30d13a7dd03f 7153735: [macosx] Text with diacritics is pasted with broken encoding
kizune
parents: 11369
diff changeset
    55
# Location of the various .properties files specific to Windows platform
30d13a7dd03f 7153735: [macosx] Text with diacritics is pasted with broken encoding
kizune
parents: 11369
diff changeset
    56
ifndef PLATFORM_PROPERTIES
30d13a7dd03f 7153735: [macosx] Text with diacritics is pasted with broken encoding
kizune
parents: 11369
diff changeset
    57
  PLATFORM_PROPERTIES  = $(BUILDDIR)/../src/windows/lib
30d13a7dd03f 7153735: [macosx] Text with diacritics is pasted with broken encoding
kizune
parents: 11369
diff changeset
    58
endif # PLATFORM_SRC
30d13a7dd03f 7153735: [macosx] Text with diacritics is pasted with broken encoding
kizune
parents: 11369
diff changeset
    59
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    60
# Platform specific closed sources
90ce3da70b43 Initial load
duke
parents:
diff changeset
    61
ifndef OPENJDK
90ce3da70b43 Initial load
duke
parents:
diff changeset
    62
  ifndef CLOSED_PLATFORM_SRC
30
7ea1edf98bfe 6668781: Openjdk windows cygwin build failure: no rule to make linker_md.obj target
ohair
parents: 2
diff changeset
    63
    CLOSED_PLATFORM_SRC  = $(BUILDDIR)/../src/closed/windows
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    64
  endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
    65
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
    66
90ce3da70b43 Initial load
duke
parents:
diff changeset
    67
# for backwards compatability, the old "win32" is used here instead of 
90ce3da70b43 Initial load
duke
parents:
diff changeset
    68
# the more proper "windows"
90ce3da70b43 Initial load
duke
parents:
diff changeset
    69
PLATFORM_INCLUDE_NAME = win32
90ce3da70b43 Initial load
duke
parents:
diff changeset
    70
PLATFORM_INCLUDE      = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
# The following DLL's are considered MS runtime libraries and should
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
#     not to be REBASEd, see deploy/make/common/Release.gmk.
8018
79ce40b4ab5e 6950375: Remove msvcrt.dll from the Windows JRE bundles
ohair
parents: 7669
diff changeset
    74
#     msvcr*.dll: Microsoft runtimes
8827
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
    75
ifeq ($(COMPILER_VERSION), VS2010)
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
    76
  MSVCRNN_DLL = msvcr100.dll
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
    77
  MSVCPNN_DLL = msvcp100.dll
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
    78
  MS_RUNTIME_LIBRARIES = $(MSVCRNN_DLL)
2186
53da56fa3bf9 6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
ohair
parents: 2055
diff changeset
    79
endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    80
90ce3da70b43 Initial load
duke
parents:
diff changeset
    81
EXTRA_LFLAGS += /LIBPATH:$(DXSDK_LIB_PATH)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    82
12293
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
    83
# Full Debug Symbols has been enabled on Windows since JDK1.4.1.
12307
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    84
# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    85
# enabled with debug info files ZIP'ed to save space. For VARIANT !=
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    86
# OPT builds, FDS is always enabled, after all a debug build without
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    87
# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    88
# meaning when FDS is enabled.
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    89
#
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    90
# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    91
# disabled for a VARIANT == OPT build.
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    92
#
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    93
# Note: Use of a different variable name for the FDS override option
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    94
# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    95
# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    96
# in options via environment variables, use of distinct variables
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    97
# prevents strange behaviours. For example, in a VARIANT != OPT build,
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    98
# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
    99
# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   100
# variable name is used, then different values can be picked up by
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   101
# different parts of the build. Just to be clear, we only need two
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   102
# variable names because the incoming option value can be overridden
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   103
# in some situations, e.g., a VARIANT != OPT build.
12293
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   104
12307
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   105
ifeq ($(VARIANT), OPT)
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   106
  FULL_DEBUG_SYMBOLS ?= 1
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   107
  ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   108
else
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   109
  # debug variants always get Full Debug Symbols (if available)
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   110
  ENABLE_FULL_DEBUG_SYMBOLS = 1
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   111
endif
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   112
_JUNK_ := $(shell \
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   113
  echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
12293
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   114
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   115
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
12307
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   116
  # HACK: disable ZIP_DEBUGINFO_FILES by default until install repo
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   117
  # changes are promoted
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   118
  ZIP_DEBUGINFO_FILES ?= 0
12293
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   119
else
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   120
  ZIP_DEBUGINFO_FILES=0
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   121
endif
12307
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   122
_JUNK_ := $(shell echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
12293
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   123
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   124
# C Compiler flag definitions
90ce3da70b43 Initial load
duke
parents:
diff changeset
   125
90ce3da70b43 Initial load
duke
parents:
diff changeset
   126
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
   127
# Default optimization
90ce3da70b43 Initial load
duke
parents:
diff changeset
   128
#
917
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   129
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   130
ifndef OPTIMIZATION_LEVEL
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   131
  ifeq ($(PRODUCT), java)
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   132
    OPTIMIZATION_LEVEL = HIGHER
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   133
  else
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   134
    OPTIMIZATION_LEVEL = LOWER
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   135
  endif
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   136
endif
2398
b0e6622ee72e 6604458: linux_x64-fastdebug-c2 fails on hyperbolic trig tests
ohair
parents: 2186
diff changeset
   137
ifndef FASTDEBUG_OPTIMIZATION_LEVEL
b0e6622ee72e 6604458: linux_x64-fastdebug-c2 fails on hyperbolic trig tests
ohair
parents: 2186
diff changeset
   138
  FASTDEBUG_OPTIMIZATION_LEVEL = LOWER
b0e6622ee72e 6604458: linux_x64-fastdebug-c2 fails on hyperbolic trig tests
ohair
parents: 2186
diff changeset
   139
endif
917
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   140
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   141
ifeq ($(CC_VERSION),msvc)
8827
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   142
  # Visual Studio compiler option definitions:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   143
  #   -O1      Favors reduced size over speed (-Og     -Os -Oy -Ob2 -Gs -GF -Gy)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   144
  #   -O2      Favors speed over reduced size (-Og -Oi -Ot -Oy -Ob2 -Gs -GF -Gy)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   145
  #   -Ob2     More aggressive inlining
90ce3da70b43 Initial load
duke
parents:
diff changeset
   146
  #   -Og      Global optimizations
90ce3da70b43 Initial load
duke
parents:
diff changeset
   147
  #   -Oi      Replace some functions with intrinsic or special forms
8827
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   148
  #   -fp:precise (should be the default)
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   149
  #            Improve floating point calculations (disables some optimizations)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   150
  #   -Os      Favor small code
90ce3da70b43 Initial load
duke
parents:
diff changeset
   151
  #   -Ot      Favor faster code
90ce3da70b43 Initial load
duke
parents:
diff changeset
   152
  #   -Oy      Frame pointer omission
8827
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   153
  #   -G6      Used to be -GB?
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   154
  #   -GF      Pool strings in read-only memory
90ce3da70b43 Initial load
duke
parents:
diff changeset
   155
  #   -Gf      Pool strings in read-write memory (the default)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   156
  #   -Gs      Controls stack probess
8827
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   157
  #   -GS      Adds buffer overflow checks on stacks (the default)
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   158
  #   -EHsc    Enables exception handling 
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   159
  #   -Gy      Function level linking only
90ce3da70b43 Initial load
duke
parents:
diff changeset
   160
  #
917
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   161
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   162
  CC_OPT/NONE    = -Od
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   163
  CC_OPT/LOWER   = -O2
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   164
  CC_OPT/HIGHER  = -O3
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   165
  CC_OPT/HIGHEST = -O3
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   166
  
5381
d6d64a42ff51 6931180: Migration to recent versions of MS Platform SDK
prr
parents: 3229
diff changeset
   167
  ifeq ($(COMPILER_VERSION), VS2010)
d6d64a42ff51 6931180: Migration to recent versions of MS Platform SDK
prr
parents: 3229
diff changeset
   168
    # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
d6d64a42ff51 6931180: Migration to recent versions of MS Platform SDK
prr
parents: 3229
diff changeset
   169
    AUTOMATIC_PCH_OPTION =
d6d64a42ff51 6931180: Migration to recent versions of MS Platform SDK
prr
parents: 3229
diff changeset
   170
    GX_OPTION = -EHsc
d6d64a42ff51 6931180: Migration to recent versions of MS Platform SDK
prr
parents: 3229
diff changeset
   171
    GZ_OPTION = -RTC1
1776
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   172
    ifeq ($(ARCH_DATA_MODEL), 32)
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   173
      CC_OPT/HIGHEST = -O2
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   174
      CC_OPT/HIGHER  = -O1
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   175
      CC_OPT/LOWER   = -O1
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   176
    else
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   177
      CC_OPT/HIGHEST = -O2
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   178
      CC_OPT/HIGHER  = -O1
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   179
      CC_OPT/LOWER   = -O1
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   180
    endif
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   181
  endif
917
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   182
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   183
else # CC_VERSION
90ce3da70b43 Initial load
duke
parents:
diff changeset
   184
  # GCC not supported, but left for historical reference...
917
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   185
  CC_OPT/NONE     =
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   186
  CC_OPT/LOWER    = -O2
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   187
  CC_OPT/HIGHER   = -O2
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   188
  CC_OPT/HIGHEST  = -O3
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   189
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   190
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   191
917
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   192
CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   193
90ce3da70b43 Initial load
duke
parents:
diff changeset
   194
# Select the runtime support library carefully, need to be consistent
90ce3da70b43 Initial load
duke
parents:
diff changeset
   195
#
8827
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   196
# Visual Studio Runtime compiler option definitions:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   197
#   -MD        Use dynamic multi-threaded runtime library
90ce3da70b43 Initial load
duke
parents:
diff changeset
   198
#   -MDd       Use debug version (don't use, doesn't mix with -MD DLL's)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   199
#   -MT        Use static multi-threaded runtime library (-ML is going away)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   200
#   -MTd       Use static debug version (better than -MDd, no runtime issues)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   201
#   -D_DEBUG   Change use of malloc/free/etc to use special debug ones (-MTd)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   202
#
1776
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   203
#      NOTE: We also will use /D _STATIC_CPPLIB  so we don't need msvcpnn.dll
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   204
#
8827
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   205
# If MS_RUNTIME_STATIC is requested we may have a problem, it is no longer
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   206
#     supported by VS2010
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   207
ifneq ($(MS_RUNTIME_STATIC),true)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   208
  MS_RUNTIME_OPTION=-MD
90ce3da70b43 Initial load
duke
parents:
diff changeset
   209
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   210
# The _DEBUG macro option (changes things like malloc to use debug version)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   211
MS_RUNTIME_DEBUG_OPTION=
90ce3da70b43 Initial load
duke
parents:
diff changeset
   212
MS_RC_DEBUG_OPTION=
90ce3da70b43 Initial load
duke
parents:
diff changeset
   213
# Externally set environment variable can force any build to use the debug vers
90ce3da70b43 Initial load
duke
parents:
diff changeset
   214
ifeq ($(MFC_DEBUG), true)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   215
  ifeq ($(MS_RUNTIME_STATIC),true)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   216
    MS_RUNTIME_OPTION=-MTd
90ce3da70b43 Initial load
duke
parents:
diff changeset
   217
  else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   218
    # This MS debugging flag forces a dependence on the debug
8018
79ce40b4ab5e 6950375: Remove msvcrt.dll from the Windows JRE bundles
ohair
parents: 7669
diff changeset
   219
    #     version of the runtime library (MSVCR*D.DLL), as does -MDd.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   220
    #     We cannot re-distribute this debug runtime.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   221
    MS_RUNTIME_OPTION=-MDd
90ce3da70b43 Initial load
duke
parents:
diff changeset
   222
  endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   223
  MS_RUNTIME_DEBUG_OPTION= -D_DEBUG
90ce3da70b43 Initial load
duke
parents:
diff changeset
   224
  MS_RC_DEBUG_OPTION= -d _DEBUG
90ce3da70b43 Initial load
duke
parents:
diff changeset
   225
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   226
90ce3da70b43 Initial load
duke
parents:
diff changeset
   227
# Always add _STATIC_CPPLIB definition
90ce3da70b43 Initial load
duke
parents:
diff changeset
   228
STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB
7669
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   229
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   230
# Silence the warning about using _STATIC_CPPLIB
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   231
ifneq ($(SHOW_ALL_WARNINGS),true)
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   232
  # Needed with VS2010 to turn off the deprecated warning.
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   233
  STATIC_CPPLIB_OPTION += /D _DISABLE_DEPRECATE_STATIC_CPPLIB
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   234
endif
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   235
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   236
MS_RUNTIME_OPTION += $(STATIC_CPPLIB_OPTION)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   237
90ce3da70b43 Initial load
duke
parents:
diff changeset
   238
ifeq ($(CC_VERSION),msvc)
8827
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   239
  # Visual Studio compiler option definitions:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   240
  #   -Zi      Cause *.pdb file to be created, full debug information
90ce3da70b43 Initial load
duke
parents:
diff changeset
   241
  #   -Z7      Full debug inside the .obj, no .pdb
90ce3da70b43 Initial load
duke
parents:
diff changeset
   242
  #   -Zd      Basic debug, no local variables? In the .obj
90ce3da70b43 Initial load
duke
parents:
diff changeset
   243
  #   -Zl      Don't add runtime library name to obj file?
90ce3da70b43 Initial load
duke
parents:
diff changeset
   244
  #   -Od      Turns off optimization and speeds compilation
90ce3da70b43 Initial load
duke
parents:
diff changeset
   245
  #   -YX -Fp/.../foobar.pch   Use precompiled headers (try someday?)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   246
  #   -nologo  Don't print out startup message
7669
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   247
  #   /D _STATIC_CPPLIB
1776
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   248
  #            Use static link for the C++ runtime (so msvcpnn.dll not needed)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   249
  #   
12293
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   250
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   251
    CFLAGS_COMMON  += -Zi
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   252
  endif
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   253
  CFLAGS_COMMON  += -nologo
917
75261da60fff 6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
ohair
parents: 715
diff changeset
   254
  CFLAGS_OPT      = $(CC_OPT)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   255
  CFLAGS_DBG      = -Od $(MS_RUNTIME_DEBUG_OPTION)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   256
5381
d6d64a42ff51 6931180: Migration to recent versions of MS Platform SDK
prr
parents: 3229
diff changeset
   257
  CFLAGS_VS2010 += -Zc:wchar_t-
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   258
90ce3da70b43 Initial load
duke
parents:
diff changeset
   259
  # All builds get the same runtime setting
90ce3da70b43 Initial load
duke
parents:
diff changeset
   260
  CFLAGS_COMMON += $(MS_RUNTIME_OPTION) $(CFLAGS_$(COMPILER_VERSION))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   261
12307
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   262
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   263
    LDEBUG = /debug
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   264
  endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   265
  
90ce3da70b43 Initial load
duke
parents:
diff changeset
   266
  ifeq ($(VTUNE_SUPPORT), true)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   267
    OTHER_CFLAGS = -Z7 -Ox 
90ce3da70b43 Initial load
duke
parents:
diff changeset
   268
    LDEBUG += /pdb:NONE
90ce3da70b43 Initial load
duke
parents:
diff changeset
   269
  endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   270
  
8269
f32efe2fd5f5 7010594: Add /SAFESEH to links on windows to verify safe exceptions
ohair
parents: 8022
diff changeset
   271
  # VS2010, always need safe exception handlers, not needed on 64bit
f32efe2fd5f5 7010594: Add /SAFESEH to links on windows to verify safe exceptions
ohair
parents: 8022
diff changeset
   272
  ifeq ($(ARCH_DATA_MODEL), 32)
8827
f0f30d988312 7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008
ohair
parents: 8269
diff changeset
   273
    LFLAGS_VS2010 +=  -SAFESEH
8269
f32efe2fd5f5 7010594: Add /SAFESEH to links on windows to verify safe exceptions
ohair
parents: 8022
diff changeset
   274
  endif
1776
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   275
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   276
  # LFLAGS are the flags given to $(LINK) and used to build the actual DLL file
90ce3da70b43 Initial load
duke
parents:
diff changeset
   277
  BASELFLAGS = -nologo /opt:REF /incremental:no
1776
33e9405ab91b 6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents: 919
diff changeset
   278
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   279
  LFLAGS = $(BASELFLAGS) $(LDEBUG) $(EXTRA_LFLAGS) $(LFLAGS_$(COMPILER_VERSION))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   280
  LDDFLAGS += $(LFLAGS_$(COMPILER_VERSION))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   281
  
90ce3da70b43 Initial load
duke
parents:
diff changeset
   282
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   283
90ce3da70b43 Initial load
duke
parents:
diff changeset
   284
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
   285
# Preprocessor macro definitions
90ce3da70b43 Initial load
duke
parents:
diff changeset
   286
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
   287
CPPFLAGS_COMMON = -DWIN32 -DIAL -D_LITTLE_ENDIAN
90ce3da70b43 Initial load
duke
parents:
diff changeset
   288
ifeq ($(ARCH), amd64)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   289
  CPPFLAGS_COMMON += -D_AMD64_ -Damd64
90ce3da70b43 Initial load
duke
parents:
diff changeset
   290
else
849
be386e469547 6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
ohair
parents: 847
diff changeset
   291
  CPPFLAGS_COMMON += -D_X86_ -Dx86 
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   292
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   293
CPPFLAGS_COMMON += -DWIN32_LEAN_AND_MEAN
90ce3da70b43 Initial load
duke
parents:
diff changeset
   294
90ce3da70b43 Initial load
duke
parents:
diff changeset
   295
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
   296
# Output options (use specific filenames to avoid parallel compile errors)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   297
#
12307
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   298
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   299
  CFLAGS_COMMON += -Fd$(OBJDIR)/$(basename $(@F)).pdb -Fm$(OBJDIR)/$(basename $(@F)).map
b34445ac110f 7157296: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect OPT builds
dcubed
parents: 12293
diff changeset
   300
endif
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   301
90ce3da70b43 Initial load
duke
parents:
diff changeset
   302
#
849
be386e469547 6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
ohair
parents: 847
diff changeset
   303
# Use -wdNNNN to disable warning NNNN.
be386e469547 6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
ohair
parents: 847
diff changeset
   304
#   C4800 is a warning about bool performance casts (can't make go away)
be386e469547 6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
ohair
parents: 847
diff changeset
   305
#
be386e469547 6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
ohair
parents: 847
diff changeset
   306
COMPILER_WARNINGS_TO_IGNORE = 4800
be386e469547 6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
ohair
parents: 847
diff changeset
   307
CFLAGS_COMMON += $(COMPILER_WARNINGS_TO_IGNORE:%=-wd%)
be386e469547 6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
ohair
parents: 847
diff changeset
   308
be386e469547 6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
ohair
parents: 847
diff changeset
   309
#
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   310
# Treat compiler warnings as errors, if requested
90ce3da70b43 Initial load
duke
parents:
diff changeset
   311
#
849
be386e469547 6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
ohair
parents: 847
diff changeset
   312
CFLAGS_COMMON += -W$(COMPILER_WARNING_LEVEL)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   313
ifeq ($(COMPILER_WARNINGS_FATAL),true)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   314
  CFLAGS_COMMON += -WX
90ce3da70b43 Initial load
duke
parents:
diff changeset
   315
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   316
7669
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   317
# Turn off some warnings by default, enable them all if asked.
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   318
ifneq ($(SHOW_ALL_WARNINGS),true)
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   319
  # The -D _CRT_SECURE_NO_DEPRECATE turns off security/deprecated warnings on
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   320
  #    the standard C library functions like strcpy.
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   321
  CFLAGS_COMMON += -D _CRT_SECURE_NO_DEPRECATE
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   322
  # The -D _CRT_NONSTDC_NO_DEPRECATE turns off deprecation warnings about using
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   323
  #    non-standard C POSIX functions.
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   324
  CFLAGS_COMMON += -D _CRT_NONSTDC_NO_DEPRECATE
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   325
endif
3ebe17bda998 6991482: Add global jdk makefile options to silence some VS2010 warnings
ohair
parents: 7668
diff changeset
   326
3222
432b8f34c3b0 6858127: Missing -DNDEBUG on Linux and Windows native code compiles
ohair
parents: 2398
diff changeset
   327
CPPFLAGS_OPT    = -DNDEBUG
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   328
CPPFLAGS_DBG    = -DDEBUG -DLOGGING
90ce3da70b43 Initial load
duke
parents:
diff changeset
   329
90ce3da70b43 Initial load
duke
parents:
diff changeset
   330
CXXFLAGS_COMMON = $(CFLAGS_COMMON)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   331
CXXFLAGS_OPT    = $(CFLAGS_OPT)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   332
CXXFLAGS_DBG    = $(CFLAGS_DBG)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   333
90ce3da70b43 Initial load
duke
parents:
diff changeset
   334
ifneq ($(LIBRARY),fdlibm)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   335
  EXTRA_LIBS += advapi32.lib
90ce3da70b43 Initial load
duke
parents:
diff changeset
   336
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   337
90ce3da70b43 Initial load
duke
parents:
diff changeset
   338
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
   339
# Path and option to link against the VM, if you have to. 
90ce3da70b43 Initial load
duke
parents:
diff changeset
   340
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
   341
JVMLIB = $(LIBDIR)/jvm.lib
90ce3da70b43 Initial load
duke
parents:
diff changeset
   342
JAVALIB = $(LIBDIR)/java.lib
90ce3da70b43 Initial load
duke
parents:
diff changeset
   343
90ce3da70b43 Initial load
duke
parents:
diff changeset
   344
ifeq ($(CC_VERSION), msvc)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   345
  CC_DEPEND        = -FD
90ce3da70b43 Initial load
duke
parents:
diff changeset
   346
  CC_DEPEND_FILTER = 
90ce3da70b43 Initial load
duke
parents:
diff changeset
   347
else # CC_VERSION
90ce3da70b43 Initial load
duke
parents:
diff changeset
   348
# not supported, but left for historical reference...
90ce3da70b43 Initial load
duke
parents:
diff changeset
   349
  CC_DEPEND        = -MM
90ce3da70b43 Initial load
duke
parents:
diff changeset
   350
  CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)&!g'
90ce3da70b43 Initial load
duke
parents:
diff changeset
   351
endif # CC_VERSION
90ce3da70b43 Initial load
duke
parents:
diff changeset
   352
90ce3da70b43 Initial load
duke
parents:
diff changeset
   353
LIBRARY_SUFFIX = dll
90ce3da70b43 Initial load
duke
parents:
diff changeset
   354
LIB_SUFFIX     = lib
90ce3da70b43 Initial load
duke
parents:
diff changeset
   355
90ce3da70b43 Initial load
duke
parents:
diff changeset
   356
# Settings for the JDI - Serviceability Agent binding.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   357
HOTSPOT_SALIB_PATH   = $(HOTSPOT_IMPORT_PATH)/jre/bin
90ce3da70b43 Initial load
duke
parents:
diff changeset
   358
SALIB_NAME = $(LIB_PREFIX)sawindbg.$(LIBRARY_SUFFIX)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   359
SAMAP_NAME = $(LIB_PREFIX)sawindbg.map
90ce3da70b43 Initial load
duke
parents:
diff changeset
   360
SAPDB_NAME = $(LIB_PREFIX)sawindbg.pdb
12293
6c4b13381b81 7136506: FDS: rework jdk repo Full Debug Symbols support
dcubed
parents: 11369
diff changeset
   361
SA_DIZ_NAME = $(LIB_PREFIX)sawindbg.diz
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   362
90ce3da70b43 Initial load
duke
parents:
diff changeset
   363
ifeq ($(ARCH), ia64)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   364
  # SA will never be supported here.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   365
  INCLUDE_SA = false
90ce3da70b43 Initial load
duke
parents:
diff changeset
   366
else
2055
e3166b387ec5 6755621: Include SA binaries into Windows JDK
poonam
parents: 1776
diff changeset
   367
  INCLUDE_SA = true
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   368
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   369
90ce3da70b43 Initial load
duke
parents:
diff changeset
   370
# Settings for the VERSIONINFO tap on windows. 
30
7ea1edf98bfe 6668781: Openjdk windows cygwin build failure: no rule to make linker_md.obj target
ohair
parents: 2
diff changeset
   371
VERSIONINFO_RESOURCE = $(BUILDDIR)/../src/windows/resource/version.rc
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   372
90ce3da70b43 Initial load
duke
parents:
diff changeset
   373
ifneq ($(JDK_BUILD_NUMBER),)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   374
 COOKED_BUILD_NUMBER = $(shell $(ECHO) $(JDK_BUILD_NUMBER) | $(SED) -e 's/^b//' -e 's/^0//')
90ce3da70b43 Initial load
duke
parents:
diff changeset
   375
else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   376
 COOKED_BUILD_NUMBER = 0
90ce3da70b43 Initial load
duke
parents:
diff changeset
   377
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   378
90ce3da70b43 Initial load
duke
parents:
diff changeset
   379
# If the update version contains non-numeric characters, we need
90ce3da70b43 Initial load
duke
parents:
diff changeset
   380
# to massage it into a numeric format. 
90ce3da70b43 Initial load
duke
parents:
diff changeset
   381
# We use the following formula:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   382
# JDK_UPDATE_VER = JDK_UPDATE_VERSION * 10 + EXCEPTION_VERSION
90ce3da70b43 Initial load
duke
parents:
diff changeset
   383
#
90ce3da70b43 Initial load
duke
parents:
diff changeset
   384
# Here are some examples:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   385
#     1.5.0    b01  ->  5,0,0,1
90ce3da70b43 Initial load
duke
parents:
diff changeset
   386
#     1.5.0_10 b01  ->  5,0,100,1
90ce3da70b43 Initial load
duke
parents:
diff changeset
   387
#     1.4.2 b01     ->  4,2,0,1
90ce3da70b43 Initial load
duke
parents:
diff changeset
   388
#     1.4.2_02 b01  ->  4,2,20,1
90ce3da70b43 Initial load
duke
parents:
diff changeset
   389
#     1.4.2_02a b01 ->  4,2,21,1
90ce3da70b43 Initial load
duke
parents:
diff changeset
   390
#     1.4.2_02b b01 ->  4,2,22,1
90ce3da70b43 Initial load
duke
parents:
diff changeset
   391
ifdef JDK_UPDATE_VERSION
90ce3da70b43 Initial load
duke
parents:
diff changeset
   392
  VTMP := $(shell $(ECHO) $(JDK_UPDATE_VERSION) | $(TR) "abcde" "12345")
90ce3da70b43 Initial load
duke
parents:
diff changeset
   393
  CAB_CHAR1 := $(shell $(ECHO) $(VTMP) | $(NAWK) '{print substr($$1, 1, 1);}')
90ce3da70b43 Initial load
duke
parents:
diff changeset
   394
  CAB_CHAR2 := $(shell $(ECHO) $(VTMP) | $(NAWK) '{print substr($$1, 2, 1);}')
90ce3da70b43 Initial load
duke
parents:
diff changeset
   395
  CAB_CHAR3 := $(shell $(ECHO) $(VTMP) | $(NAWK) '{print substr($$1, 3, 1);}')
90ce3da70b43 Initial load
duke
parents:
diff changeset
   396
  JDK_UPDATE_META_TAG := U$(MARKETING_NUMBER)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   397
  ifeq ($(CAB_CHAR3),)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   398
    CAB_CHAR3 := 0
90ce3da70b43 Initial load
duke
parents:
diff changeset
   399
  endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   400
  ifeq ($(CAB_CHAR1), 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   401
    JDK_UPDATE_VER := $(CAB_CHAR2)$(CAB_CHAR3)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   402
  else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   403
    JDK_UPDATE_VER := $(CAB_CHAR1)$(CAB_CHAR2)$(CAB_CHAR3)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   404
  endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   405
else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   406
  JDK_UPDATE_VER := 0
90ce3da70b43 Initial load
duke
parents:
diff changeset
   407
endif
90ce3da70b43 Initial load
duke
parents:
diff changeset
   408
90ce3da70b43 Initial load
duke
parents:
diff changeset
   409
RC_FLAGS = /l 0x409 /r
90ce3da70b43 Initial load
duke
parents:
diff changeset
   410
90ce3da70b43 Initial load
duke
parents:
diff changeset
   411
ifeq ($(VARIANT), OPT)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   412
  RC_FLAGS += -d NDEBUG 
90ce3da70b43 Initial load
duke
parents:
diff changeset
   413
else
90ce3da70b43 Initial load
duke
parents:
diff changeset
   414
  RC_FLAGS += $(MS_RC_DEBUG_OPTION)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   415
endif 
90ce3da70b43 Initial load
duke
parents:
diff changeset
   416
847
530bfef1ed6f 6548261: Use of SE in make/common/Defs-windows.gmk
ohair
parents: 715
diff changeset
   417
# Values for the RC variables defined in RC_FLAGS
530bfef1ed6f 6548261: Use of SE in make/common/Defs-windows.gmk
ohair
parents: 715
diff changeset
   418
JDK_RC_BUILD_ID = $(FULL_VERSION)
530bfef1ed6f 6548261: Use of SE in make/common/Defs-windows.gmk
ohair
parents: 715
diff changeset
   419
JDK_RC_COMPANY = $(COMPANY_NAME)
530bfef1ed6f 6548261: Use of SE in make/common/Defs-windows.gmk
ohair
parents: 715
diff changeset
   420
JDK_RC_COMPONENT = $(PRODUCT_NAME) $(JDK_RC_PLATFORM_NAME) binary
530bfef1ed6f 6548261: Use of SE in make/common/Defs-windows.gmk
ohair
parents: 715
diff changeset
   421
JDK_RC_VER = \
530bfef1ed6f 6548261: Use of SE in make/common/Defs-windows.gmk
ohair
parents: 715
diff changeset
   422
    $(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
530bfef1ed6f 6548261: Use of SE in make/common/Defs-windows.gmk
ohair
parents: 715
diff changeset
   423
JDK_RC_COPYRIGHT = Copyright \xA9 $(COPYRIGHT_YEAR)
530bfef1ed6f 6548261: Use of SE in make/common/Defs-windows.gmk
ohair
parents: 715
diff changeset
   424
JDK_RC_NAME = \
530bfef1ed6f 6548261: Use of SE in make/common/Defs-windows.gmk
ohair
parents: 715
diff changeset
   425
    $(PRODUCT_NAME) $(JDK_RC_PLATFORM_NAME) $(JDK_MINOR_VERSION) $(JDK_UPDATE_META_TAG)
530bfef1ed6f 6548261: Use of SE in make/common/Defs-windows.gmk
ohair
parents: 715
diff changeset
   426
JDK_RC_FVER = \
530bfef1ed6f 6548261: Use of SE in make/common/Defs-windows.gmk
ohair
parents: 715
diff changeset
   427
    $(JDK_MINOR_VERSION),$(JDK_MICRO_VERSION),$(JDK_UPDATE_VER),$(COOKED_BUILD_NUMBER)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   428
3111
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   429
# JDK name required here
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   430
RC_FLAGS += -d "JDK_BUILD_ID=$(JDK_RC_BUILD_ID)" \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   431
            -d "JDK_COMPANY=$(JDK_RC_COMPANY)" \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   432
            -d "JDK_COMPONENT=$(JDK_RC_COMPONENT)" \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   433
            -d "JDK_VER=$(JDK_RC_VER)" \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   434
            -d "JDK_COPYRIGHT=$(JDK_RC_COPYRIGHT)" \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   435
            -d "JDK_NAME=$(JDK_RC_NAME)" \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   436
            -d "JDK_FVER=$(JDK_RC_FVER)"
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   437
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   438
# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   439
ifeq ($(ARCH_DATA_MODEL), 32)
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   440
  ifneq ($(KERNEL), off)
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   441
    # This is a hack to use until  7-Zip (and UPX) bundles can be put
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   442
    # under /java/devtools.
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   443
    ifndef DEPLOY_TOPDIR
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   444
      DEPLOY_TOPDIR=$(JDK_TOPDIR)/../deploy
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   445
    endif
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   446
    # Uncomment this block to cause build failure if above assumption false
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   447
    #DCHK = $(shell if [ ! -d $(DEPLOY_TOPDIR) ] ; then \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   448
    #  $(ECHO) deploy_not_a_peer_of_j2se ; \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   449
    #fi )
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   450
    #ifeq ($(DCHK), deploy_not_a_peer_of_j2se)
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   451
    #  If a build failure points to control coming here it means
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   452
    #  it means deploy is not in the same directory
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   453
    #  as j2se. Java Kernel can't tolerate that for the time being.
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   454
    #endif
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   455
    EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   456
      $(ECHO) true ; \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   457
    else \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   458
      $(ECHO) false ; \
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   459
    fi )
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   460
    ifeq ($(EC_TMP), true)
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   461
      EXTRA_COMP_INSTALL_PATH = lib\\\\deploy\\\\lzma.dll
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   462
      # Crazy but true: deploy/make/plugin/jinstall/Makefile.jkernel does
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   463
      # not include deploy/make/common/Defs-windows.gmk, either directly
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   464
      # or indirectly. But it does include this file, so redundantly declare
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   465
      # these variables that are in deploy/make/common/Defs-windows.gmk for
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   466
      # the sake of the Java Kernel part of the deploy build. Whew!
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   467
      EXTRA_COMP_LIB_NAME = lzma.dll
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   468
      EXTRA_COMP_PATH = $(OUTPUTDIR)/tmp/deploy/lzma/win32/obj
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   469
      EXTRA_COMP_CMD_PATH = $(EXTRA_COMP_PATH)/lzma.exe
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   470
      EXTRA_COMP_LIB_PATH = $(EXTRA_COMP_PATH)/$(EXTRA_COMP_LIB_NAME)
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   471
    endif
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   472
  endif
fefdeafb7ab9 6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents: 2398
diff changeset
   473
endif