author | ihse |
Thu, 15 Mar 2018 09:33:36 +0100 | |
branch | ihse-cflags-rewrite-branch |
changeset 56312 | a52bcf4118eb |
parent 56245 | d232728af5cf |
parent 49160 | cefb7b496d17 |
child 56726 | 3a9b7a1f9197 |
permissions | -rw-r--r-- |
37437 | 1 |
# |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48608
diff
changeset
|
2 |
# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. |
37437 | 3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
# |
|
5 |
# This code is free software; you can redistribute it and/or modify it |
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
|
7 |
# published by the Free Software Foundation. Oracle designates this |
|
8 |
# particular file as subject to the "Classpath" exception as provided |
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
|
10 |
# |
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
# accompanied this code). |
|
16 |
# |
|
17 |
# You should have received a copy of the GNU General Public License version |
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
# |
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
# or visit www.oracle.com if you need additional information or have any |
|
23 |
# questions. |
|
24 |
# |
|
25 |
||
26 |
# Include support files that will setup compiler flags due to the selected |
|
27 |
# jvm feature set, and specific file overrides. |
|
28 |
include lib/JvmFeatures.gmk |
|
29 |
include lib/JvmOverrideFiles.gmk |
|
30 |
||
47314 | 31 |
$(eval $(call IncludeCustomExtension, hotspot/lib/CompileJvm.gmk)) |
37437 | 32 |
|
33 |
################################################################################ |
|
34 |
# Setup compilation of the main Hotspot native library (libjvm). |
|
35 |
||
36 |
JVM_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm |
|
37 |
JVM_MAPFILE := $(JVM_OUTPUTDIR)/mapfile |
|
38 |
||
39 |
################################################################################ |
|
40 |
# Platform independent setup |
|
41 |
||
42 |
# This variable may be added to by a custom extension |
|
47217 | 43 |
JVM_SRC_ROOTS += $(TOPDIR)/src/hotspot |
37437 | 44 |
|
45 |
JVM_SRC_DIRS += $(call uniq, $(wildcard $(foreach d, $(JVM_SRC_ROOTS), \ |
|
47217 | 46 |
$d/share \ |
47 |
$d/os/$(HOTSPOT_TARGET_OS) \ |
|
48 |
$d/os/$(HOTSPOT_TARGET_OS_TYPE) \ |
|
49 |
$d/cpu/$(HOTSPOT_TARGET_CPU_ARCH) \ |
|
50 |
$d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH) \ |
|
37437 | 51 |
))) \ |
52 |
$(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles \ |
|
53 |
$(JVM_VARIANT_OUTPUTDIR)/gensrc/tracefiles \ |
|
54 |
# |
|
55 |
||
56 |
JVM_CFLAGS_INCLUDES += \ |
|
57 |
$(patsubst %,-I%,$(filter-out $(JVM_VARIANT_OUTPUTDIR)/gensrc/%, $(JVM_SRC_DIRS))) \ |
|
58 |
-I$(JVM_VARIANT_OUTPUTDIR)/gensrc \ |
|
47217 | 59 |
-I$(TOPDIR)/src/hotspot/share/precompiled \ |
48300
8a5edac3d5a2
8190484: Move jvm.h, jmm.h et al to hotspot/*/include
ihse
parents:
48111
diff
changeset
|
60 |
-I$(TOPDIR)/src/hotspot/share/include \ |
8a5edac3d5a2
8190484: Move jvm.h, jmm.h et al to hotspot/*/include
ihse
parents:
48111
diff
changeset
|
61 |
-I$(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \ |
48355 | 62 |
-I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \ |
63 |
-I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \ |
|
48011 | 64 |
-I$(TOPDIR)/src/java.base/share/native/libjimage \ |
37437 | 65 |
# |
66 |
||
40010 | 67 |
# INCLUDE_SUFFIX_* is only meant for including the proper |
68 |
# platform files. Don't use it to guard code. Use the value of |
|
69 |
# HOTSPOT_TARGET_CPU_DEFINE etc. instead. |
|
43402
caa829a4272a
8004842: Unify values of boolean make variables set in configure to true/false
ihse
parents:
42664
diff
changeset
|
70 |
# Remaining TARGET_ARCH_* is needed to select the cpu specific |
42664 | 71 |
# sources for 64-bit ARM ports (arm versus aarch64). |
37437 | 72 |
JVM_CFLAGS_TARGET_DEFINES += \ |
73 |
-DTARGET_ARCH_$(HOTSPOT_TARGET_CPU_ARCH) \ |
|
40010 | 74 |
-DINCLUDE_SUFFIX_OS=_$(HOTSPOT_TARGET_OS) \ |
75 |
-DINCLUDE_SUFFIX_CPU=_$(HOTSPOT_TARGET_CPU_ARCH) \ |
|
46560
388aa8d67c80
8181449: Fix debug.hpp / globalDefinitions.hpp dependency inversion
kbarrett
parents:
44411
diff
changeset
|
76 |
-DINCLUDE_SUFFIX_COMPILER=_$(HOTSPOT_TOOLCHAIN_TYPE) \ |
37437 | 77 |
-DTARGET_COMPILER_$(HOTSPOT_TOOLCHAIN_TYPE) \ |
78 |
-D$(HOTSPOT_TARGET_CPU_DEFINE) \ |
|
79 |
-DHOTSPOT_LIB_ARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' \ |
|
80 |
# |
|
81 |
||
82 |
ifeq ($(DEBUG_LEVEL), release) |
|
83 |
# For hotspot, release builds differ internally between "optimized" and "product" |
|
84 |
# in that "optimize" does not define PRODUCT. |
|
85 |
ifneq ($(HOTSPOT_DEBUG_LEVEL), optimized) |
|
86 |
JVM_CFLAGS_DEBUGLEVEL := -DPRODUCT |
|
87 |
endif |
|
88 |
else ifeq ($(DEBUG_LEVEL), fastdebug) |
|
89 |
JVM_CFLAGS_DEBUGLEVEL := -DASSERT |
|
90 |
ifeq ($(filter $(OPENJDK_TARGET_OS), windows aix), ) |
|
91 |
# NOTE: Old build did not define CHECK_UNHANDLED_OOPS on Windows and AIX. |
|
92 |
JVM_CFLAGS_DEBUGLEVEL += -DCHECK_UNHANDLED_OOPS |
|
93 |
endif |
|
94 |
else ifeq ($(DEBUG_LEVEL), slowdebug) |
|
95 |
# _NMT_NOINLINE_ informs NMT that no inlining is done by the compiler |
|
96 |
JVM_CFLAGS_DEBUGLEVEL := -DASSERT -D_NMT_NOINLINE_ |
|
97 |
endif |
|
98 |
||
99 |
JVM_CFLAGS += \ |
|
100 |
$(JVM_CFLAGS_DEBUGLEVEL) \ |
|
101 |
$(JVM_CFLAGS_TARGET_DEFINES) \ |
|
102 |
$(JVM_CFLAGS_FEATURES) \ |
|
103 |
$(JVM_CFLAGS_INCLUDES) \ |
|
104 |
$(EXTRA_CFLAGS) \ |
|
105 |
# |
|
106 |
||
107 |
JVM_LDFLAGS += \ |
|
108 |
$(SHARED_LIBRARY_FLAGS) \ |
|
109 |
$(JVM_LDFLAGS_FEATURES) \ |
|
110 |
$(EXTRA_LDFLAGS) \ |
|
111 |
# |
|
112 |
||
113 |
JVM_LIBS += \ |
|
114 |
$(JVM_LIBS_FEATURES) \ |
|
115 |
# |
|
116 |
||
117 |
# These files and directories are always excluded |
|
48093 | 118 |
JVM_EXCLUDE_FILES += args.cc |
37437 | 119 |
JVM_EXCLUDES += adlc |
120 |
||
121 |
# Needed by vm_version.cpp |
|
122 |
ifeq ($(OPENJDK_TARGET_CPU), x86_64) |
|
123 |
OPENJDK_TARGET_CPU_VM_VERSION := amd64 |
|
124 |
else ifeq ($(OPENJDK_TARGET_CPU), sparcv9) |
|
125 |
OPENJDK_TARGET_CPU_VM_VERSION := sparc |
|
44411
8c642d0b237e
8177390: java -version does not differentiate between which port of AArch64 is used
neugens
parents:
43402
diff
changeset
|
126 |
else ifeq ($(HOTSPOT_TARGET_CPU_ARCH), arm) |
8c642d0b237e
8177390: java -version does not differentiate between which port of AArch64 is used
neugens
parents:
43402
diff
changeset
|
127 |
ifeq ($(OPENJDK_TARGET_CPU), aarch64) |
8c642d0b237e
8177390: java -version does not differentiate between which port of AArch64 is used
neugens
parents:
43402
diff
changeset
|
128 |
# This sets the Oracle Aarch64 port to use arm64 |
8c642d0b237e
8177390: java -version does not differentiate between which port of AArch64 is used
neugens
parents:
43402
diff
changeset
|
129 |
# while the original Aarch64 port uses aarch64 |
8c642d0b237e
8177390: java -version does not differentiate between which port of AArch64 is used
neugens
parents:
43402
diff
changeset
|
130 |
OPENJDK_TARGET_CPU_VM_VERSION := arm64 |
8c642d0b237e
8177390: java -version does not differentiate between which port of AArch64 is used
neugens
parents:
43402
diff
changeset
|
131 |
endif |
37437 | 132 |
else |
133 |
OPENJDK_TARGET_CPU_VM_VERSION := $(OPENJDK_TARGET_CPU) |
|
134 |
endif |
|
135 |
||
136 |
CFLAGS_VM_VERSION := \ |
|
137 |
$(VERSION_CFLAGS) \ |
|
138 |
-DHOTSPOT_VERSION_STRING='"$(VERSION_STRING)"' \ |
|
139 |
-DDEBUG_LEVEL='"$(DEBUG_LEVEL)"' \ |
|
140 |
-DHOTSPOT_BUILD_USER='"$(USERNAME)"' \ |
|
141 |
-DHOTSPOT_VM_DISTRO='"$(HOTSPOT_VM_DISTRO)"' \ |
|
142 |
-DCPU='"$(OPENJDK_TARGET_CPU_VM_VERSION)"' \ |
|
143 |
# |
|
144 |
||
145 |
# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. |
|
43402
caa829a4272a
8004842: Unify values of boolean make variables set in configure to true/false
ihse
parents:
42664
diff
changeset
|
146 |
ifeq ($(USE_PRECOMPILED_HEADER), false) |
37437 | 147 |
JVM_CFLAGS += -DDONT_USE_PRECOMPILED_HEADER |
148 |
endif |
|
149 |
||
150 |
################################################################################ |
|
151 |
# Platform specific setup |
|
152 |
||
42664 | 153 |
# ARM source selection |
154 |
||
155 |
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), linux-arm) |
|
156 |
JVM_EXCLUDE_PATTERNS += arm_64 |
|
157 |
||
158 |
else ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), linux-aarch64) |
|
43402
caa829a4272a
8004842: Unify values of boolean make variables set in configure to true/false
ihse
parents:
42664
diff
changeset
|
159 |
# For 64-bit arm builds, we use the 64 bit hotspot/src/cpu/arm |
42664 | 160 |
# hotspot sources if HOTSPOT_TARGET_CPU_ARCH is set to arm. |
161 |
# Exclude the aarch64 and 32 bit arm files for this build. |
|
162 |
ifeq ($(HOTSPOT_TARGET_CPU_ARCH), arm) |
|
163 |
JVM_EXCLUDE_PATTERNS += arm_32 aarch64 |
|
164 |
endif |
|
165 |
endif |
|
166 |
||
37437 | 167 |
ifneq ($(filter $(OPENJDK_TARGET_OS), linux macosx windows), ) |
47217 | 168 |
JVM_PRECOMPILED_HEADER := $(TOPDIR)/src/hotspot/share/precompiled/precompiled.hpp |
37437 | 169 |
endif |
170 |
||
171 |
ifeq ($(OPENJDK_TARGET_CPU), x86) |
|
172 |
JVM_EXCLUDE_PATTERNS += x86_64 |
|
173 |
else ifeq ($(OPENJDK_TARGET_CPU), x86_64) |
|
174 |
JVM_EXCLUDE_PATTERNS += x86_32 |
|
175 |
endif |
|
176 |
||
177 |
# Inline assembly for solaris |
|
178 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
|
179 |
ifeq ($(OPENJDK_TARGET_CPU), x86_64) |
|
47217 | 180 |
JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.il |
37437 | 181 |
else ifeq ($(OPENJDK_TARGET_CPU), sparcv9) |
47217 | 182 |
JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_sparc/solaris_sparc.il |
37437 | 183 |
endif |
184 |
endif |
|
185 |
||
186 |
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9) |
|
187 |
ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), false) |
|
188 |
# NOTE: In the old build, we weirdly enough set -g/-g0 always, regardless |
|
189 |
# of if debug symbols were needed. Without it, compilation fails on |
|
190 |
# sparc! :-( |
|
191 |
JVM_CFLAGS += -g0 |
|
192 |
endif |
|
193 |
endif |
|
194 |
||
195 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
196 |
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
|
197 |
RC_DESC := 64-Bit$(SPACE) |
|
198 |
endif |
|
199 |
JVM_RCFLAGS += -D"HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(RC_DESC)$(JVM_VARIANT) VM" |
|
200 |
endif |
|
201 |
||
202 |
JVM_OPTIMIZATION ?= HIGHEST_JVM |
|
203 |
||
41674
8ff2f216109b
8164120: The minimal VM should be stripped using --strip-unneeded
erikj
parents:
40010
diff
changeset
|
204 |
# Need to set JVM_STRIPFLAGS to the default value from SPEC since the STRIPFLAGS |
8ff2f216109b
8164120: The minimal VM should be stripped using --strip-unneeded
erikj
parents:
40010
diff
changeset
|
205 |
# parameter to SetupNativeCompilation allows an empty value to override the |
8ff2f216109b
8164120: The minimal VM should be stripped using --strip-unneeded
erikj
parents:
40010
diff
changeset
|
206 |
# default. |
8ff2f216109b
8164120: The minimal VM should be stripped using --strip-unneeded
erikj
parents:
40010
diff
changeset
|
207 |
JVM_STRIPFLAGS ?= $(STRIPFLAGS) |
8ff2f216109b
8164120: The minimal VM should be stripped using --strip-unneeded
erikj
parents:
40010
diff
changeset
|
208 |
|
37437 | 209 |
################################################################################ |
210 |
# Now set up the actual compilation of the main hotspot native library |
|
211 |
||
212 |
$(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \ |
|
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48608
diff
changeset
|
213 |
NAME := jvm, \ |
41193
9e274c9c3047
8160630: libjimage.so and others should link statically to libgcc
erikj
parents:
40010
diff
changeset
|
214 |
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
41277 | 215 |
OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \ |
37437 | 216 |
SRC := $(JVM_SRC_DIRS), \ |
49124
6abbc1f5c2a1
8198862: Stop doing funky compilation stuff for dtrace
ihse
parents:
49070
diff
changeset
|
217 |
EXTRA_FILES := $(DTRACE_EXTRA_SOURCE_FILES), \ |
37437 | 218 |
EXCLUDES := $(JVM_EXCLUDES), \ |
219 |
EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \ |
|
220 |
EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \ |
|
221 |
EXTRA_OBJECT_FILES := $(DTRACE_EXTRA_OBJECT_FILES), \ |
|
222 |
CFLAGS := $(JVM_CFLAGS), \ |
|
223 |
vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \ |
|
48598
c7eea4b541d1
8189761: COMPANY_NAME, IMPLEMENTOR, BUNDLE_VENDOR, VENDOR, but no configure flag
simonis
parents:
48300
diff
changeset
|
224 |
arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \ |
56238 | 225 |
DISABLED_WARNINGS_gcc := suggest-attribute=format unknown-pragmas comment \ |
226 |
delete-non-virtual-dtor ignored-qualifiers parentheses reorder \ |
|
227 |
unused-local-typedefs unused-variable address \ |
|
228 |
missing-field-initializers unused-but-set-variable char-subscripts \ |
|
56244
b73757919fba
Now I believe this compiles with gcc 4.8, 4.9, 5.0, 6.0, 7.0.
ihse
parents:
56241
diff
changeset
|
229 |
array-bounds narrowing empty-body unused-but-set-parameter \ |
b73757919fba
Now I believe this compiles with gcc 4.8, 4.9, 5.0, 6.0, 7.0.
ihse
parents:
56241
diff
changeset
|
230 |
maybe-uninitialized logical-op \ |
b73757919fba
Now I believe this compiles with gcc 4.8, 4.9, 5.0, 6.0, 7.0.
ihse
parents:
56241
diff
changeset
|
231 |
implicit-fallthrough expansion-to-defined, \ |
46630
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46560
diff
changeset
|
232 |
DISABLED_WARNINGS_clang := tautological-compare, \ |
56245 | 233 |
DISABLED_WARNINGS_solstudio := hidef w_novirtualdescr inlafteruse \ |
234 |
unknownpragma doubunder w_enumnotused w_toomanyenumnotused \ |
|
235 |
wvarhidenmem wunreachable wnoretvalue, \ |
|
37437 | 236 |
DISABLED_WARNINGS_xlc := 1540-0216 1540-0198 1540-1090 1540-1639 \ |
237 |
1540-1088 1500-010, \ |
|
238 |
ASFLAGS := $(JVM_ASFLAGS), \ |
|
239 |
LDFLAGS := $(JVM_LDFLAGS), \ |
|
240 |
LIBS := $(JVM_LIBS), \ |
|
241 |
OPTIMIZATION := $(JVM_OPTIMIZATION), \ |
|
242 |
OBJECT_DIR := $(JVM_OUTPUTDIR)/objs, \ |
|
243 |
MAPFILE := $(JVM_MAPFILE), \ |
|
244 |
USE_MAPFILE_FOR_SYMBOLS := true, \ |
|
41674
8ff2f216109b
8164120: The minimal VM should be stripped using --strip-unneeded
erikj
parents:
40010
diff
changeset
|
245 |
STRIPFLAGS := $(JVM_STRIPFLAGS), \ |
37437 | 246 |
EMBED_MANIFEST := true, \ |
247 |
RC_FLAGS := $(JVM_RCFLAGS), \ |
|
47217 | 248 |
VERSIONINFO_RESOURCE := $(TOPDIR)/src/hotspot/os/windows/version.rc, \ |
37437 | 249 |
PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \ |
250 |
PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \ |
|
251 |
)) |
|
252 |
||
41277 | 253 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
254 |
# It doesn't matter which jvm.lib file gets exported, but we need |
|
255 |
# to pick just one. |
|
256 |
ifeq ($(JVM_VARIANT), $(firstword $(JVM_VARIANTS))) |
|
257 |
$(eval $(call SetupCopyFiles, COPY_JVM_LIB, \ |
|
258 |
DEST := $(LIB_OUTPUTDIR), \ |
|
259 |
FILES :=$(JVM_VARIANT_OUTPUTDIR)/libjvm/objs/jvm.lib, \ |
|
260 |
)) |
|
261 |
TARGETS += $(COPY_JVM_LIB) |
|
262 |
endif |
|
263 |
endif |
|
264 |
||
37437 | 265 |
# AIX warning explanation: |
266 |
# 1500-010 : (W) WARNING in ...: Infinite loop. Program may not stop. |
|
267 |
# There are several infinite loops in the vm, so better suppress. |
|
268 |
# 1540-0198 : (W) The omitted keyword "private" is assumed for base class "...". |
|
269 |
# 1540-0216 : (W) An expression of type .. cannot be converted to type .. |
|
270 |
# In hotspot this fires for functionpointer to pointer conversions |
|
271 |
# 1540-1088 : (W) The exception specification is being ignored. |
|
272 |
# In hotspot this is caused by throw() in declaration of new() in nmethod.hpp. |
|
273 |
# 1540-1090 : (I) The destructor of "..." might not be called. |
|
274 |
# 1540-1639 : (I) The behavior of long type bit fields has changed ... |
|
275 |
||
276 |
# Include mapfile generation. It relies on BUILD_LIBJVM_ALL_OBJS which is only |
|
277 |
# defined after the above call to BUILD_LIBJVM. Mapfile will be generated |
|
278 |
# after all object files are built, but before the jvm library is linked. |
|
279 |
include lib/JvmMapfile.gmk |
|
280 |
||
281 |
TARGETS += $(BUILD_LIBJVM) |