Tue, 27 May 2014 08:44:23 -0700
8038422: CDS test failed: assert((size % os::vm_allocation_granularity()) == 0) failed when limiting SharedMiscDataSize
Summary: In debug version, the assert is against os::vm_allocation_granularity(), but in initialization, we use os::vm_page_size() to align the allocation size. In windows, _vm_page_size and _vm_allocation_granularity may not be same. In debug version, the assert is against os::vm_allocation_granularity(), but in initialization, we use os::vm_page_size() to align the allocation size. In windows, _vm_page_size and _vm_allocation_granularity may not be same.
Reviewed-by: dholmes, iklam, jiangli, coleenp
Contributed-by: yumin.qi@oracle.com
never@3156 | 1 | # |
drchase@4942 | 2 | # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. |
never@3156 | 3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
never@3156 | 4 | # |
never@3156 | 5 | # This code is free software; you can redistribute it and/or modify it |
never@3156 | 6 | # under the terms of the GNU General Public License version 2 only, as |
never@3156 | 7 | # published by the Free Software Foundation. |
never@3156 | 8 | # |
never@3156 | 9 | # This code is distributed in the hope that it will be useful, but WITHOUT |
never@3156 | 10 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
never@3156 | 11 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
never@3156 | 12 | # version 2 for more details (a copy is included in the LICENSE file that |
never@3156 | 13 | # accompanied this code). |
never@3156 | 14 | # |
never@3156 | 15 | # You should have received a copy of the GNU General Public License version |
never@3156 | 16 | # 2 along with this work; if not, write to the Free Software Foundation, |
never@3156 | 17 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
never@3156 | 18 | # |
never@3156 | 19 | # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
never@3156 | 20 | # or visit www.oracle.com if you need additional information or have any |
never@3156 | 21 | # questions. |
drchase@4942 | 22 | # |
never@3156 | 23 | # |
never@3156 | 24 | |
never@3156 | 25 | # The common definitions for hotspot bsd builds. |
never@3156 | 26 | # Include the top level defs.make under make directory instead of this one. |
never@3156 | 27 | # This file is included into make/defs.make. |
never@3156 | 28 | |
never@3156 | 29 | SLASH_JAVA ?= /java |
never@3156 | 30 | |
never@3156 | 31 | # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name |
never@3156 | 32 | ARCH:=$(shell uname -m) |
never@3156 | 33 | PATH_SEP = : |
never@3156 | 34 | ifeq ($(LP64), 1) |
never@3156 | 35 | ARCH_DATA_MODEL ?= 64 |
never@3156 | 36 | else |
never@3156 | 37 | ARCH_DATA_MODEL ?= 32 |
never@3156 | 38 | endif |
never@3156 | 39 | |
never@3156 | 40 | # zero |
erikj@3649 | 41 | ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) |
never@3156 | 42 | ifeq ($(ARCH_DATA_MODEL), 64) |
never@3156 | 43 | MAKE_ARGS += LP64=1 |
never@3156 | 44 | endif |
never@3156 | 45 | PLATFORM = bsd-zero |
never@3156 | 46 | VM_PLATFORM = bsd_$(subst i386,i486,$(ZERO_LIBARCH)) |
never@3156 | 47 | HS_ARCH = zero |
never@3156 | 48 | ARCH = zero |
never@3156 | 49 | endif |
never@3156 | 50 | |
never@3156 | 51 | # ia64 |
never@3156 | 52 | ifeq ($(ARCH), ia64) |
never@3156 | 53 | ARCH_DATA_MODEL = 64 |
never@3156 | 54 | MAKE_ARGS += LP64=1 |
never@3156 | 55 | PLATFORM = bsd-ia64 |
never@3156 | 56 | VM_PLATFORM = bsd_ia64 |
never@3156 | 57 | HS_ARCH = ia64 |
never@3156 | 58 | endif |
never@3156 | 59 | |
never@3156 | 60 | # sparc |
never@3156 | 61 | ifeq ($(ARCH), sparc64) |
never@3156 | 62 | ifeq ($(ARCH_DATA_MODEL), 64) |
never@3156 | 63 | ARCH_DATA_MODEL = 64 |
never@3156 | 64 | MAKE_ARGS += LP64=1 |
never@3156 | 65 | PLATFORM = bsd-sparcv9 |
never@3156 | 66 | VM_PLATFORM = bsd_sparcv9 |
never@3156 | 67 | else |
never@3156 | 68 | ARCH_DATA_MODEL = 32 |
never@3156 | 69 | PLATFORM = bsd-sparc |
never@3156 | 70 | VM_PLATFORM = bsd_sparc |
never@3156 | 71 | endif |
never@3156 | 72 | HS_ARCH = sparc |
never@3156 | 73 | endif |
never@3156 | 74 | |
never@3156 | 75 | # amd64 |
never@3156 | 76 | ifneq (,$(findstring $(ARCH), amd64 x86_64)) |
never@3156 | 77 | ifeq ($(ARCH_DATA_MODEL), 64) |
never@3156 | 78 | ARCH_DATA_MODEL = 64 |
never@3156 | 79 | MAKE_ARGS += LP64=1 |
never@3156 | 80 | PLATFORM = bsd-amd64 |
never@3156 | 81 | VM_PLATFORM = bsd_amd64 |
never@3156 | 82 | HS_ARCH = x86 |
never@3156 | 83 | else |
never@3156 | 84 | ARCH_DATA_MODEL = 32 |
never@3156 | 85 | PLATFORM = bsd-i586 |
never@3156 | 86 | VM_PLATFORM = bsd_i486 |
never@3156 | 87 | HS_ARCH = x86 |
never@3156 | 88 | # We have to reset ARCH to i386 since SRCARCH relies on it |
drchase@4942 | 89 | ARCH = i386 |
never@3156 | 90 | endif |
never@3156 | 91 | endif |
never@3156 | 92 | |
never@3156 | 93 | # i386 |
never@3156 | 94 | ifeq ($(ARCH), i386) |
never@3156 | 95 | ifeq ($(ARCH_DATA_MODEL), 64) |
never@3156 | 96 | ARCH_DATA_MODEL = 64 |
never@3156 | 97 | MAKE_ARGS += LP64=1 |
never@3156 | 98 | PLATFORM = bsd-amd64 |
never@3156 | 99 | VM_PLATFORM = bsd_amd64 |
never@3156 | 100 | HS_ARCH = x86 |
never@3156 | 101 | # We have to reset ARCH to amd64 since SRCARCH relies on it |
never@3156 | 102 | ARCH = amd64 |
never@3156 | 103 | else |
never@3156 | 104 | ARCH_DATA_MODEL = 32 |
never@3156 | 105 | PLATFORM = bsd-i586 |
never@3156 | 106 | VM_PLATFORM = bsd_i486 |
never@3156 | 107 | HS_ARCH = x86 |
never@3156 | 108 | endif |
never@3156 | 109 | endif |
never@3156 | 110 | |
never@3156 | 111 | # ARM |
never@3156 | 112 | ifeq ($(ARCH), arm) |
never@3156 | 113 | ARCH_DATA_MODEL = 32 |
never@3156 | 114 | PLATFORM = bsd-arm |
never@3156 | 115 | VM_PLATFORM = bsd_arm |
never@3156 | 116 | HS_ARCH = arm |
never@3156 | 117 | endif |
never@3156 | 118 | |
never@3156 | 119 | # PPC |
never@3156 | 120 | ifeq ($(ARCH), ppc) |
never@3156 | 121 | ARCH_DATA_MODEL = 32 |
never@3156 | 122 | PLATFORM = bsd-ppc |
never@3156 | 123 | VM_PLATFORM = bsd_ppc |
never@3156 | 124 | HS_ARCH = ppc |
never@3156 | 125 | endif |
never@3156 | 126 | |
erikj@3649 | 127 | # On 32 bit bsd we build server and client, on 64 bit just server. |
erikj@3649 | 128 | ifeq ($(JVM_VARIANTS),) |
erikj@3649 | 129 | ifeq ($(ARCH_DATA_MODEL), 32) |
erikj@3649 | 130 | JVM_VARIANTS:=client,server |
erikj@3649 | 131 | JVM_VARIANT_CLIENT:=true |
erikj@3649 | 132 | JVM_VARIANT_SERVER:=true |
erikj@3649 | 133 | else |
erikj@3649 | 134 | JVM_VARIANTS:=server |
erikj@3649 | 135 | JVM_VARIANT_SERVER:=true |
erikj@3649 | 136 | endif |
erikj@3649 | 137 | endif |
erikj@3649 | 138 | |
dcubed@5898 | 139 | OS_VENDOR:=$(shell uname -s) |
dcubed@5898 | 140 | |
dcubed@5898 | 141 | # determine if HotSpot is being built in JDK6 or earlier version |
dcubed@5898 | 142 | JDK6_OR_EARLIER=0 |
dcubed@5898 | 143 | ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1" |
dcubed@5898 | 144 | # if the longer variable names (newer build style) are set, then check those |
dcubed@5898 | 145 | ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1" |
dcubed@5898 | 146 | JDK6_OR_EARLIER=1 |
dcubed@5898 | 147 | endif |
dcubed@5898 | 148 | else |
dcubed@5898 | 149 | # the longer variables aren't set so check the shorter variable names |
dcubed@5898 | 150 | ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1" |
dcubed@5898 | 151 | JDK6_OR_EARLIER=1 |
dcubed@5898 | 152 | endif |
dcubed@5898 | 153 | endif |
dcubed@5898 | 154 | |
dcubed@5898 | 155 | ifeq ($(JDK6_OR_EARLIER),0) |
dcubed@5898 | 156 | # Full Debug Symbols is supported on JDK7 or newer. |
dcubed@5898 | 157 | # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product |
dcubed@5898 | 158 | # builds is enabled with debug info files ZIP'ed to save space. For |
dcubed@5898 | 159 | # BUILD_FLAVOR != product builds, FDS is always enabled, after all a |
dcubed@5898 | 160 | # debug build without debug info isn't very useful. |
dcubed@5898 | 161 | # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled. |
dcubed@5898 | 162 | # |
dcubed@5898 | 163 | # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be |
dcubed@5898 | 164 | # disabled for a BUILD_FLAVOR == product build. |
dcubed@5898 | 165 | # |
dcubed@5898 | 166 | # Note: Use of a different variable name for the FDS override option |
dcubed@5898 | 167 | # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS |
dcubed@5898 | 168 | # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass |
dcubed@5898 | 169 | # in options via environment variables, use of distinct variables |
dcubed@5898 | 170 | # prevents strange behaviours. For example, in a BUILD_FLAVOR != |
dcubed@5898 | 171 | # product build, the FULL_DEBUG_SYMBOLS environment variable will be |
dcubed@5898 | 172 | # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If |
dcubed@5898 | 173 | # the same variable name is used, then different values can be picked |
dcubed@5898 | 174 | # up by different parts of the build. Just to be clear, we only need |
dcubed@5898 | 175 | # two variable names because the incoming option value can be |
dcubed@5898 | 176 | # overridden in some situations, e.g., a BUILD_FLAVOR != product |
dcubed@5898 | 177 | # build. |
dcubed@5898 | 178 | |
dcubed@5898 | 179 | # Due to the multiple sub-make processes that occur this logic gets |
dcubed@5898 | 180 | # executed multiple times. We reduce the noise by at least checking that |
dcubed@5898 | 181 | # BUILD_FLAVOR has been set. |
dcubed@5898 | 182 | ifneq ($(BUILD_FLAVOR),) |
dcubed@5898 | 183 | ifeq ($(BUILD_FLAVOR), product) |
dcubed@5898 | 184 | FULL_DEBUG_SYMBOLS ?= 1 |
dcubed@5898 | 185 | ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) |
dcubed@5898 | 186 | else |
dcubed@5898 | 187 | # debug variants always get Full Debug Symbols (if available) |
dcubed@5898 | 188 | ENABLE_FULL_DEBUG_SYMBOLS = 1 |
dcubed@5898 | 189 | endif |
dcubed@5898 | 190 | _JUNK_ := $(shell \ |
dcubed@5898 | 191 | echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") |
dcubed@5898 | 192 | # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later |
dcubed@5898 | 193 | |
dcubed@5898 | 194 | ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
dcubed@5898 | 195 | ifeq ($(OS_VENDOR), Darwin) |
dcubed@5898 | 196 | # MacOS X doesn't use OBJCOPY or STRIP_POLICY |
dcubed@5898 | 197 | OBJCOPY= |
dcubed@5898 | 198 | STRIP_POLICY= |
dcubed@5898 | 199 | ZIP_DEBUGINFO_FILES ?= 1 |
dcubed@5898 | 200 | else |
dcubed@5898 | 201 | # Default OBJCOPY comes from GNU Binutils on BSD |
dcubed@5898 | 202 | ifeq ($(CROSS_COMPILE_ARCH),) |
dcubed@5898 | 203 | DEF_OBJCOPY=/usr/bin/objcopy |
dcubed@5898 | 204 | else |
dcubed@5898 | 205 | # Assume objcopy is part of the cross-compilation toolset |
dcubed@5898 | 206 | ifneq ($(ALT_COMPILER_PATH),) |
dcubed@5898 | 207 | DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy |
dcubed@5898 | 208 | endif |
dcubed@5898 | 209 | endif |
dcubed@5898 | 210 | OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) |
dcubed@5898 | 211 | ifneq ($(ALT_OBJCOPY),) |
dcubed@5898 | 212 | _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)") |
dcubed@5898 | 213 | OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) |
dcubed@5898 | 214 | endif |
dcubed@5898 | 215 | |
dcubed@5898 | 216 | ifeq ($(OBJCOPY),) |
dcubed@5898 | 217 | _JUNK_ := $(shell \ |
dcubed@5898 | 218 | echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo" \ |
dcubed@5898 | 219 | "files. You may need to set ALT_OBJCOPY.") |
dcubed@5898 | 220 | ENABLE_FULL_DEBUG_SYMBOLS=0 |
dcubed@5898 | 221 | _JUNK_ := $(shell \ |
dcubed@5898 | 222 | echo >&2 "INFO:" \ |
dcubed@5898 | 223 | "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") |
dcubed@5898 | 224 | else |
dcubed@5898 | 225 | _JUNK_ := $(shell \ |
dcubed@5898 | 226 | echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo" \ |
dcubed@5898 | 227 | "files.") |
dcubed@5898 | 228 | |
dcubed@5898 | 229 | # Library stripping policies for .debuginfo configs: |
dcubed@5898 | 230 | # all_strip - strips everything from the library |
dcubed@5898 | 231 | # min_strip - strips most stuff from the library; leaves |
dcubed@5898 | 232 | # minimum symbols |
dcubed@5898 | 233 | # no_strip - does not strip the library at all |
dcubed@5898 | 234 | # |
dcubed@5898 | 235 | # Oracle security policy requires "all_strip". A waiver was |
dcubed@5898 | 236 | # granted on 2011.09.01 that permits using "min_strip" in the |
dcubed@5898 | 237 | # Java JDK and Java JRE. |
dcubed@5898 | 238 | # |
dcubed@5898 | 239 | # Currently, STRIP_POLICY is only used when Full Debug Symbols |
dcubed@5898 | 240 | # is enabled. |
dcubed@5898 | 241 | # |
dcubed@5898 | 242 | STRIP_POLICY ?= min_strip |
dcubed@5898 | 243 | |
dcubed@5898 | 244 | _JUNK_ := $(shell \ |
dcubed@5898 | 245 | echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)") |
dcubed@5898 | 246 | |
dcubed@5898 | 247 | ZIP_DEBUGINFO_FILES ?= 1 |
dcubed@5898 | 248 | endif |
dcubed@5898 | 249 | |
dcubed@5898 | 250 | _JUNK_ := $(shell \ |
dcubed@5898 | 251 | echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)") |
dcubed@5898 | 252 | endif |
dcubed@5898 | 253 | endif # ENABLE_FULL_DEBUG_SYMBOLS=1 |
dcubed@5898 | 254 | endif # BUILD_FLAVOR |
dcubed@5898 | 255 | endif # JDK_6_OR_EARLIER |
dcubed@5898 | 256 | |
never@3156 | 257 | JDK_INCLUDE_SUBDIR=bsd |
never@3156 | 258 | |
never@3156 | 259 | # Library suffix |
never@3156 | 260 | ifeq ($(OS_VENDOR),Darwin) |
never@3156 | 261 | LIBRARY_SUFFIX=dylib |
never@3156 | 262 | else |
never@3156 | 263 | LIBRARY_SUFFIX=so |
never@3156 | 264 | endif |
never@3156 | 265 | |
never@3156 | 266 | EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html |
never@3156 | 267 | |
never@3156 | 268 | # client and server subdirectories have symbolic links to ../libjsig.so |
never@3156 | 269 | EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) |
dcubed@5898 | 270 | |
dcubed@5898 | 271 | ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
dcubed@5898 | 272 | ifeq ($(ZIP_DEBUGINFO_FILES),1) |
dcubed@5898 | 273 | EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz |
dcubed@5898 | 274 | else |
dcubed@5898 | 275 | ifeq ($(OS_VENDOR), Darwin) |
dcubed@5898 | 276 | EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM |
dcubed@5898 | 277 | else |
dcubed@5898 | 278 | EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo |
dcubed@5898 | 279 | endif |
dcubed@5898 | 280 | endif |
dcubed@5898 | 281 | endif |
dcubed@5898 | 282 | |
never@3156 | 283 | EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server |
phh@3473 | 284 | EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client |
jprovino@4165 | 285 | EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal |
never@3156 | 286 | |
erikj@3649 | 287 | ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) |
erikj@3649 | 288 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt |
erikj@3649 | 289 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) |
dcubed@5898 | 290 | |
dcubed@5898 | 291 | ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
dcubed@5898 | 292 | ifeq ($(ZIP_DEBUGINFO_FILES),1) |
dcubed@5898 | 293 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz |
dcubed@5898 | 294 | else |
dcubed@5898 | 295 | ifeq ($(OS_VENDOR), Darwin) |
dcubed@5898 | 296 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM |
dcubed@5898 | 297 | else |
dcubed@5898 | 298 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo |
dcubed@5898 | 299 | endif |
dcubed@5898 | 300 | endif |
dcubed@5898 | 301 | endif |
never@3156 | 302 | endif |
never@3156 | 303 | |
erikj@3649 | 304 | ifeq ($(JVM_VARIANT_CLIENT),true) |
erikj@3649 | 305 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt |
erikj@3649 | 306 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) |
dcubed@5898 | 307 | |
dcubed@5898 | 308 | ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
dcubed@5898 | 309 | ifeq ($(ZIP_DEBUGINFO_FILES),1) |
dcubed@5898 | 310 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz |
dcubed@5898 | 311 | else |
dcubed@5898 | 312 | ifeq ($(OS_VENDOR), Darwin) |
dcubed@5898 | 313 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM |
dcubed@5898 | 314 | else |
dcubed@5898 | 315 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo |
dcubed@5898 | 316 | endif |
dcubed@5898 | 317 | endif |
dcubed@5898 | 318 | endif |
never@3156 | 319 | endif |
never@3156 | 320 | |
jprovino@4165 | 321 | ifeq ($(JVM_VARIANT_MINIMAL1),true) |
jprovino@4165 | 322 | EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt |
jprovino@4165 | 323 | EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX) |
jprovino@4165 | 324 | endif |
jprovino@4165 | 325 | |
never@3156 | 326 | # Serviceability Binaries |
never@3156 | 327 | # No SA Support for PPC, IA64, ARM or zero |
never@3156 | 328 | ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
never@3156 | 329 | $(EXPORT_LIB_DIR)/sa-jdi.jar |
dcubed@5898 | 330 | |
dcubed@5898 | 331 | ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
dcubed@5898 | 332 | ifeq ($(ZIP_DEBUGINFO_FILES),1) |
dcubed@5898 | 333 | ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz |
dcubed@5898 | 334 | else |
dcubed@5898 | 335 | ifeq ($(OS_VENDOR), Darwin) |
dcubed@5898 | 336 | ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM |
dcubed@5898 | 337 | else |
dcubed@5898 | 338 | ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
dcubed@5898 | 339 | endif |
dcubed@5898 | 340 | endif |
dcubed@5898 | 341 | endif |
dcubed@5898 | 342 | |
never@3156 | 343 | ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
never@3156 | 344 | $(EXPORT_LIB_DIR)/sa-jdi.jar |
dcubed@3202 | 345 | ADD_SA_BINARIES/universal = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
dcubed@3202 | 346 | $(EXPORT_LIB_DIR)/sa-jdi.jar |
dcubed@5898 | 347 | |
dcubed@5898 | 348 | ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
dcubed@5898 | 349 | ifeq ($(ZIP_DEBUGINFO_FILES),1) |
dcubed@5898 | 350 | ADD_SA_BINARIES/universal += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz |
dcubed@5898 | 351 | else |
dcubed@5898 | 352 | ifeq ($(OS_VENDOR), Darwin) |
dcubed@5898 | 353 | ADD_SA_BINARIES/universal += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM |
dcubed@5898 | 354 | else |
dcubed@5898 | 355 | ADD_SA_BINARIES/universal += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
dcubed@5898 | 356 | endif |
dcubed@5898 | 357 | endif |
dcubed@5898 | 358 | endif |
dcubed@5898 | 359 | |
never@3156 | 360 | ADD_SA_BINARIES/ppc = |
never@3156 | 361 | ADD_SA_BINARIES/ia64 = |
never@3156 | 362 | ADD_SA_BINARIES/arm = |
never@3156 | 363 | ADD_SA_BINARIES/zero = |
never@3156 | 364 | |
never@3156 | 365 | EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH)) |
dcubed@3202 | 366 | |
phh@3492 | 367 | # Universal build settings |
phh@3492 | 368 | ifeq ($(OS_VENDOR), Darwin) |
phh@3492 | 369 | # Build universal binaries by default on Mac OS X |
phh@3492 | 370 | MACOSX_UNIVERSAL = true |
phh@3492 | 371 | ifneq ($(ALT_MACOSX_UNIVERSAL),) |
phh@3492 | 372 | MACOSX_UNIVERSAL = $(ALT_MACOSX_UNIVERSAL) |
phh@3492 | 373 | endif |
phh@3492 | 374 | MAKE_ARGS += MACOSX_UNIVERSAL=$(MACOSX_UNIVERSAL) |
dcubed@3202 | 375 | |
phh@3492 | 376 | # Universal settings |
phh@3492 | 377 | ifeq ($(MACOSX_UNIVERSAL), true) |
phh@3492 | 378 | |
phh@3492 | 379 | # Set universal export path but avoid using ARCH or PLATFORM subdirs |
phh@3492 | 380 | EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR) |
phh@3512 | 381 | ifneq ($(ALT_EXPORT_PATH),) |
phh@3512 | 382 | EXPORT_PATH=$(ALT_EXPORT_PATH) |
phh@3512 | 383 | endif |
phh@3492 | 384 | |
phh@3492 | 385 | # Set universal image dir |
phh@3492 | 386 | JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR) |
twisti@3567 | 387 | ifneq ($(ALT_JDK_IMAGE_DIR),) |
twisti@3567 | 388 | JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR) |
twisti@3567 | 389 | endif |
phh@3492 | 390 | |
phh@3492 | 391 | # Binaries to 'universalize' if built |
phh@3492 | 392 | UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX) |
phh@3492 | 393 | UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX) |
phh@3492 | 394 | UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX) |
phh@3492 | 395 | UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX) |
phh@3492 | 396 | |
phh@3492 | 397 | # Files to simply copy in place |
phh@3492 | 398 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt |
phh@3492 | 399 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt |
dcubed@5898 | 400 | ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
dcubed@5898 | 401 | ifeq ($(ZIP_DEBUGINFO_FILES),1) |
dcubed@5898 | 402 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.diz |
dcubed@5898 | 403 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.diz |
dcubed@5898 | 404 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.diz |
dcubed@5898 | 405 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.diz |
dcubed@5898 | 406 | else |
dcubed@5898 | 407 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX).dSYM |
dcubed@5898 | 408 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX).dSYM |
dcubed@5898 | 409 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM |
dcubed@5898 | 410 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM |
dcubed@5898 | 411 | endif |
dcubed@5898 | 412 | endif |
phh@3492 | 413 | |
phh@3492 | 414 | endif |
phh@3492 | 415 | endif |