Mon, 28 Nov 2011 14:58:31 +0100
7116081: USE_PRECOMPILED_HEADER=0 triggers a single threaded build of the JVM
Summary: Changed the conditional to see if the precompiled header has been specified. Also, removed the unused PrecompiledOption.
Reviewed-by: dholmes, brutisso
duke@435 | 1 | # |
dcubed@3150 | 2 | # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. |
duke@435 | 3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | # |
duke@435 | 5 | # This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | # under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | # published by the Free Software Foundation. |
duke@435 | 8 | # |
duke@435 | 9 | # This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | # version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | # accompanied this code). |
duke@435 | 14 | # |
duke@435 | 15 | # You should have received a copy of the GNU General Public License version |
duke@435 | 16 | # 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | # |
trims@1907 | 19 | # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
trims@1907 | 20 | # or visit www.oracle.com if you need additional information or have any |
trims@1907 | 21 | # questions. |
duke@435 | 22 | # |
duke@435 | 23 | # |
duke@435 | 24 | |
duke@435 | 25 | # The common definitions for hotspot solaris builds. |
duke@435 | 26 | # Include the top level defs.make under make directory instead of this one. |
duke@435 | 27 | # This file is included into make/defs.make. |
duke@435 | 28 | |
duke@435 | 29 | # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name |
duke@435 | 30 | SLASH_JAVA ?= /java |
duke@435 | 31 | ARCH:=$(shell uname -p) |
duke@435 | 32 | PATH_SEP = : |
duke@435 | 33 | ifeq ($(LP64), 1) |
duke@435 | 34 | ARCH_DATA_MODEL=64 |
duke@435 | 35 | else |
duke@435 | 36 | ARCH_DATA_MODEL=32 |
duke@435 | 37 | endif |
duke@435 | 38 | |
duke@435 | 39 | ifeq ($(ARCH),sparc) |
duke@435 | 40 | ifeq ($(ARCH_DATA_MODEL), 64) |
duke@435 | 41 | MAKE_ARGS += LP64=1 |
duke@435 | 42 | PLATFORM=solaris-sparcv9 |
duke@435 | 43 | VM_PLATFORM=solaris_sparcv9 |
duke@435 | 44 | else |
duke@435 | 45 | PLATFORM=solaris-sparc |
duke@435 | 46 | VM_PLATFORM=solaris_sparc |
duke@435 | 47 | endif |
duke@435 | 48 | HS_ARCH=sparc |
duke@435 | 49 | else |
duke@435 | 50 | ifeq ($(ARCH_DATA_MODEL), 64) |
duke@435 | 51 | MAKE_ARGS += LP64=1 |
duke@435 | 52 | PLATFORM=solaris-amd64 |
duke@435 | 53 | VM_PLATFORM=solaris_amd64 |
duke@435 | 54 | HS_ARCH=x86 |
duke@435 | 55 | else |
duke@435 | 56 | PLATFORM=solaris-i586 |
duke@435 | 57 | VM_PLATFORM=solaris_i486 |
duke@435 | 58 | HS_ARCH=x86 |
duke@435 | 59 | endif |
duke@435 | 60 | endif |
duke@435 | 61 | |
dcubed@3150 | 62 | # determine if HotSpot is being built in JDK6 or earlier version |
dcubed@3150 | 63 | JDK6_OR_EARLIER=0 |
dcubed@3150 | 64 | ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1" |
dcubed@3150 | 65 | # if the longer variable names (newer build style) are set, then check those |
dcubed@3150 | 66 | ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1" |
dcubed@3150 | 67 | JDK6_OR_EARLIER=1 |
dcubed@3150 | 68 | endif |
dcubed@3150 | 69 | else |
dcubed@3150 | 70 | # the longer variables aren't set so check the shorter variable names |
dcubed@3150 | 71 | ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1" |
dcubed@3150 | 72 | JDK6_OR_EARLIER=1 |
dcubed@3150 | 73 | endif |
dcubed@3150 | 74 | endif |
dcubed@3150 | 75 | |
dcubed@3150 | 76 | ifeq ($(JDK6_OR_EARLIER),0) |
dcubed@3150 | 77 | # Full Debug Symbols is supported on JDK7 or newer |
dcubed@3150 | 78 | |
dcubed@3150 | 79 | ifdef ENABLE_FULL_DEBUG_SYMBOLS |
dcubed@3150 | 80 | # Only check for Full Debug Symbols support on Solaris if it is |
dcubed@3150 | 81 | # specifically enabled. Hopefully, it can be enabled by default |
dcubed@3150 | 82 | # once the .debuginfo size issues are worked out. |
dcubed@3150 | 83 | |
dcubed@3150 | 84 | # Default OBJCOPY comes from the SUNWbinutils package: |
dcubed@3150 | 85 | DEF_OBJCOPY=/usr/sfw/bin/gobjcopy |
dcubed@3150 | 86 | ifeq ($(VM_PLATFORM),solaris_amd64) |
dcubed@3150 | 87 | # On Solaris AMD64/X64, gobjcopy is not happy and fails: |
dcubed@3150 | 88 | # |
dcubed@3150 | 89 | # usr/sfw/bin/gobjcopy --add-gnu-debuglink=<lib>.debuginfo <lib>.so |
dcubed@3150 | 90 | # BFD: stKPaiop: Not enough room for program headers, try linking with -N |
dcubed@3150 | 91 | # /usr/sfw/bin/gobjcopy: stKPaiop: Bad value |
dcubed@3150 | 92 | # BFD: stKPaiop: Not enough room for program headers, try linking with -N |
dcubed@3150 | 93 | # /usr/sfw/bin/gobjcopy: libsaproc.debuginfo: Bad value |
dcubed@3150 | 94 | # BFD: stKPaiop: Not enough room for program headers, try linking with -N |
dcubed@3150 | 95 | # /usr/sfw/bin/gobjcopy: stKPaiop: Bad value |
dcubed@3150 | 96 | _JUNK_ := $(shell \ |
dcubed@3150 | 97 | echo >&2 "INFO: $(DEF_OBJCOPY) is not working on Solaris AMD64/X64") |
dcubed@3150 | 98 | OBJCOPY= |
dcubed@3150 | 99 | else |
dcubed@3150 | 100 | OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) |
dcubed@3150 | 101 | ifneq ($(ALT_OBJCOPY),) |
dcubed@3150 | 102 | _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)") |
dcubed@3150 | 103 | # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path |
dcubed@3150 | 104 | OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) |
dcubed@3150 | 105 | endif |
dcubed@3150 | 106 | endif |
dcubed@3150 | 107 | endif |
dcubed@3150 | 108 | |
dcubed@3150 | 109 | ifeq ($(OBJCOPY),) |
dcubed@3150 | 110 | _JUNK_ := $(shell \ |
dcubed@3150 | 111 | echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.") |
dcubed@3150 | 112 | else |
dcubed@3150 | 113 | _JUNK_ := $(shell \ |
dcubed@3150 | 114 | echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.") |
dcubed@3150 | 115 | |
dcubed@3150 | 116 | # Library stripping policies for .debuginfo configs: |
dcubed@3150 | 117 | # all_strip - strips everything from the library |
dcubed@3150 | 118 | # min_strip - strips most stuff from the library; leaves minimum symbols |
dcubed@3150 | 119 | # no_strip - does not strip the library at all |
dcubed@3150 | 120 | # |
dcubed@3150 | 121 | # Oracle security policy requires "all_strip". A waiver was granted on |
dcubed@3150 | 122 | # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE. |
dcubed@3150 | 123 | # |
dcubed@3150 | 124 | DEF_STRIP_POLICY="min_strip" |
dcubed@3150 | 125 | ifeq ($(ALT_STRIP_POLICY),) |
dcubed@3150 | 126 | STRIP_POLICY=$(DEF_STRIP_POLICY) |
dcubed@3150 | 127 | else |
dcubed@3150 | 128 | STRIP_POLICY=$(ALT_STRIP_POLICY) |
dcubed@3150 | 129 | endif |
dcubed@3150 | 130 | _JUNK_ := $(shell \ |
dcubed@3150 | 131 | echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)") |
dcubed@3150 | 132 | endif |
dcubed@3150 | 133 | endif |
dcubed@3150 | 134 | |
duke@435 | 135 | JDK_INCLUDE_SUBDIR=solaris |
duke@435 | 136 | |
never@3156 | 137 | # Library suffix |
never@3156 | 138 | LIBRARY_SUFFIX=so |
never@3156 | 139 | |
duke@435 | 140 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms |
duke@435 | 141 | VM_DEBUG=jvmg |
duke@435 | 142 | |
duke@435 | 143 | EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html |
kvn@1450 | 144 | |
never@3156 | 145 | # client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX) |
never@3156 | 146 | EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) |
dcubed@3150 | 147 | ifneq ($(OBJCOPY),) |
dcubed@3150 | 148 | EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo |
dcubed@3150 | 149 | endif |
kvn@1450 | 150 | |
duke@435 | 151 | EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server |
kvn@3044 | 152 | EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client |
kvn@3044 | 153 | |
bobv@2036 | 154 | ifneq ($(BUILD_CLIENT_ONLY),true) |
duke@435 | 155 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt |
never@3156 | 156 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) |
never@3156 | 157 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX) |
never@3156 | 158 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) |
dcubed@3150 | 159 | ifneq ($(OBJCOPY),) |
dcubed@3150 | 160 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo |
dcubed@3150 | 161 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo |
dcubed@3150 | 162 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.debuginfo |
dcubed@3150 | 163 | endif |
bobv@2036 | 164 | endif |
duke@435 | 165 | ifeq ($(ARCH_DATA_MODEL), 32) |
duke@435 | 166 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt |
never@3156 | 167 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) |
never@3156 | 168 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) |
never@3156 | 169 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) |
never@3156 | 170 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) |
never@3156 | 171 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) |
dcubed@3150 | 172 | ifneq ($(OBJCOPY),) |
iveresov@3162 | 173 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo |
iveresov@3162 | 174 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo |
dcubed@3150 | 175 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.debuginfo |
dcubed@3150 | 176 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo |
dcubed@3150 | 177 | EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo |
dcubed@3150 | 178 | endif |
bobv@2036 | 179 | ifneq ($(BUILD_CLIENT_ONLY), true) |
never@3156 | 180 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) |
never@3156 | 181 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) |
dcubed@3150 | 182 | ifneq ($(OBJCOPY),) |
dcubed@3150 | 183 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.debuginfo |
dcubed@3150 | 184 | EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.debuginfo |
dcubed@3150 | 185 | endif |
bobv@2036 | 186 | endif |
duke@435 | 187 | endif |
duke@435 | 188 | |
never@3156 | 189 | EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) |
dcubed@3150 | 190 | ifneq ($(OBJCOPY),) |
dcubed@3150 | 191 | EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
dcubed@3150 | 192 | endif |
duke@435 | 193 | EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar |