Thu, 13 Oct 2011 09:35:42 -0700
7098194: integrate macosx-port changes
Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29.
Reviewed-by: kvn, dholmes, never, phh
Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
never@3156 | 1 | # |
never@3156 | 2 | # Copyright (c) 2006, 2010, 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. |
never@3156 | 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 |
never@3156 | 41 | ifeq ($(ZERO_BUILD), 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 |
never@3156 | 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 | |
never@3156 | 127 | JDK_INCLUDE_SUBDIR=bsd |
never@3156 | 128 | |
never@3156 | 129 | # Library suffix |
never@3156 | 130 | OS_VENDOR:=$(shell uname -s) |
never@3156 | 131 | ifeq ($(OS_VENDOR),Darwin) |
never@3156 | 132 | LIBRARY_SUFFIX=dylib |
never@3156 | 133 | else |
never@3156 | 134 | LIBRARY_SUFFIX=so |
never@3156 | 135 | endif |
never@3156 | 136 | |
never@3156 | 137 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms |
never@3156 | 138 | VM_DEBUG=jvmg |
never@3156 | 139 | |
never@3156 | 140 | EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html |
never@3156 | 141 | |
never@3156 | 142 | # client and server subdirectories have symbolic links to ../libjsig.so |
never@3156 | 143 | EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) |
never@3156 | 144 | EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server |
never@3156 | 145 | |
never@3156 | 146 | ifndef BUILD_CLIENT_ONLY |
never@3156 | 147 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt |
never@3156 | 148 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) |
never@3156 | 149 | endif |
never@3156 | 150 | |
never@3156 | 151 | ifneq ($(ZERO_BUILD), true) |
never@3156 | 152 | ifeq ($(ARCH_DATA_MODEL), 32) |
never@3156 | 153 | EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client |
never@3156 | 154 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt |
never@3156 | 155 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) |
never@3156 | 156 | endif |
never@3156 | 157 | endif |
never@3156 | 158 | |
never@3156 | 159 | # Serviceability Binaries |
never@3156 | 160 | # No SA Support for PPC, IA64, ARM or zero |
never@3156 | 161 | ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
never@3156 | 162 | $(EXPORT_LIB_DIR)/sa-jdi.jar |
never@3156 | 163 | ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
never@3156 | 164 | $(EXPORT_LIB_DIR)/sa-jdi.jar |
dcubed@3202 | 165 | ADD_SA_BINARIES/universal = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
dcubed@3202 | 166 | $(EXPORT_LIB_DIR)/sa-jdi.jar |
never@3156 | 167 | ADD_SA_BINARIES/ppc = |
never@3156 | 168 | ADD_SA_BINARIES/ia64 = |
never@3156 | 169 | ADD_SA_BINARIES/arm = |
never@3156 | 170 | ADD_SA_BINARIES/zero = |
never@3156 | 171 | |
never@3156 | 172 | EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH)) |
dcubed@3202 | 173 | |
dcubed@3202 | 174 | UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX) |
dcubed@3202 | 175 | UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX) |
dcubed@3202 | 176 | UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX) |
dcubed@3202 | 177 | |
dcubed@3202 | 178 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt |
dcubed@3202 | 179 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt |
dcubed@3202 | 180 | UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX) |