author | tschatzl |
Wed, 11 Sep 2019 10:19:09 +0200 | |
changeset 58081 | 8b08eaf9a0eb |
parent 55169 | 256a5cbb4439 |
child 58481 | 48a73ec3a817 |
permissions | -rw-r--r-- |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
2 |
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
4 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
10 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
15 |
# accompanied this code). |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
16 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
20 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
23 |
# questions. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
24 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
25 |
|
27565 | 26 |
WIN_VERIFY_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify/verify.lib |
13702 | 27 |
|
35262
6ffcba13c973
8138677: IllegalAccessException Class sun.usagetracker.UsageTrackerClient$4 (module java.base) can not access a member of class java.lang.management.ManagementFactory (module java.management)
jbachorik
parents:
34014
diff
changeset
|
28 |
# Hook to include the corresponding custom file, if present. |
47314 | 29 |
$(eval $(call IncludeCustomExtension, lib/CoreLibraries.gmk)) |
35262
6ffcba13c973
8138677: IllegalAccessException Class sun.usagetracker.UsageTrackerClient$4 (module java.base) can not access a member of class java.lang.management.ManagementFactory (module java.management)
jbachorik
parents:
34014
diff
changeset
|
30 |
|
6ffcba13c973
8138677: IllegalAccessException Class sun.usagetracker.UsageTrackerClient$4 (module java.base) can not access a member of class java.lang.management.ManagementFactory (module java.management)
jbachorik
parents:
34014
diff
changeset
|
31 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
32 |
########################################################################################## |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
33 |
# libfdlibm is statically linked with libjava below and not delivered into the |
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25859
diff
changeset
|
34 |
# product on its own. |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
35 |
|
42353
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
36 |
BUILD_LIBFDLIBM_OPTIMIZATION := NONE |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
37 |
|
53683 | 38 |
ifeq ($(call isTargetOs, solaris), true) |
42353
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
39 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
40 |
endif |
13164 | 41 |
|
51765
e10ade04afe5
8210416: [linux] Poor StrictMath performance due to non-optimized compilation
sgehwolf
parents:
51669
diff
changeset
|
42 |
# If FDLIBM_CFLAGS is non-empty we know that we can optimize |
e10ade04afe5
8210416: [linux] Poor StrictMath performance due to non-optimized compilation
sgehwolf
parents:
51669
diff
changeset
|
43 |
# fdlibm when adding those extra C flags. Currently GCC, |
e10ade04afe5
8210416: [linux] Poor StrictMath performance due to non-optimized compilation
sgehwolf
parents:
51669
diff
changeset
|
44 |
# and clang only. |
e10ade04afe5
8210416: [linux] Poor StrictMath performance due to non-optimized compilation
sgehwolf
parents:
51669
diff
changeset
|
45 |
ifneq ($(FDLIBM_CFLAGS), ) |
e10ade04afe5
8210416: [linux] Poor StrictMath performance due to non-optimized compilation
sgehwolf
parents:
51669
diff
changeset
|
46 |
BUILD_LIBFDLIBM_OPTIMIZATION := LOW |
12892 | 47 |
endif |
48 |
||
47217 | 49 |
LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm |
51765
e10ade04afe5
8210416: [linux] Poor StrictMath performance due to non-optimized compilation
sgehwolf
parents:
51669
diff
changeset
|
50 |
LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) $(FDLIBM_CFLAGS) |
25859 | 51 |
|
51783 | 52 |
$(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM, \ |
53 |
NAME := fdlibm, \ |
|
54 |
TYPE := STATIC_LIBRARY, \ |
|
55 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |
|
56 |
SRC := $(LIBFDLIBM_SRC), \ |
|
57 |
OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \ |
|
58 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ |
|
59 |
CFLAGS_windows_debug := -DLOGGING, \ |
|
60 |
CFLAGS_aix := -qfloat=nomaf, \ |
|
61 |
DISABLED_WARNINGS_gcc := sign-compare misleading-indentation array-bounds, \ |
|
51853
ec62d6cab037
8211029: Have a common set of enabled warnings for all native libraries
ihse
parents:
51825
diff
changeset
|
62 |
DISABLED_WARNINGS_clang := sign-compare, \ |
51783 | 63 |
DISABLED_WARNINGS_microsoft := 4146 4244 4018, \ |
64 |
ARFLAGS := $(ARFLAGS), \ |
|
65 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
|
66 |
)) |
|
20890 | 67 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
68 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
69 |
|
20547 | 70 |
LIBVERIFY_OPTIMIZATION := HIGH |
53683 | 71 |
ifeq ($(call isTargetOs, solaris linux), true) |
35276 | 72 |
ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true) |
20547 | 73 |
LIBVERIFY_OPTIMIZATION := LOW |
74 |
endif |
|
13702 | 75 |
endif |
76 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
77 |
$(eval $(call SetupJdkLibrary, BUILD_LIBVERIFY, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
78 |
NAME := verify, \ |
20547 | 79 |
OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \ |
80 |
CFLAGS := $(CFLAGS_JDKLIB), \ |
|
81 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
|
82 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
49241 | 83 |
LIBS_unix := -ljvm, \ |
33406 | 84 |
LIBS_windows := jvm.lib, \ |
35276 | 85 |
)) |
13164 | 86 |
|
27565 | 87 |
TARGETS += $(BUILD_LIBVERIFY) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
88 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
89 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
90 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
91 |
LIBJAVA_CFLAGS := -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' |
13164 | 92 |
|
53683 | 93 |
ifeq ($(call isTargetOs, macosx), true) |
20547 | 94 |
BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c |
95 |
BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c |
|
13164 | 96 |
endif |
97 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
98 |
$(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
99 |
NAME := java, \ |
20547 | 100 |
OPTIMIZATION := HIGH, \ |
101 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
102 |
$(LIBJAVA_CFLAGS), \ |
|
33984
2333676816eb
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30784
diff
changeset
|
103 |
jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
104 |
EXTRA_HEADER_DIRS := libfdlibm, \ |
37529
868c7195632c
8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build
simonis
parents:
37525
diff
changeset
|
105 |
WARNINGS_AS_ERRORS_xlc := false, \ |
51853
ec62d6cab037
8211029: Have a common set of enabled warnings for all native libraries
ihse
parents:
51825
diff
changeset
|
106 |
DISABLED_WARNINGS_gcc := unused-result unused-function, \ |
32408
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
107 |
DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
20547 | 108 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
109 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
33406 | 110 |
LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \ |
49440 | 111 |
LDFLAGS_windows := -delayload:shell32.dll, \ |
51783 | 112 |
LIBS := $(BUILD_LIBFDLIBM_TARGET), \ |
33406 | 113 |
LIBS_unix := -ljvm -lverify, \ |
51783 | 114 |
LIBS_linux := $(LIBDL), \ |
115 |
LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL), \ |
|
116 |
LIBS_aix := $(LIBDL) $(LIBM),\ |
|
117 |
LIBS_macosx := -framework CoreFoundation \ |
|
20547 | 118 |
-framework Foundation \ |
55169
256a5cbb4439
8223804: [macos] remove obsoleted reference to security framework in launcher code
prr
parents:
54053
diff
changeset
|
119 |
-framework SystemConfiguration, \ |
51783 | 120 |
LIBS_windows := jvm.lib $(WIN_VERIFY_LIB) \ |
33406 | 121 |
shell32.lib delayimp.lib \ |
31246
dfc58fd4feec
8066504: GetVersionEx in java.base/windows/native/libjava/java_props_md.c might not get correct Windows version 0
rriggs
parents:
30784
diff
changeset
|
122 |
advapi32.lib version.lib, \ |
35276 | 123 |
)) |
13164 | 124 |
|
27565 | 125 |
TARGETS += $(BUILD_LIBJAVA) |
20547 | 126 |
|
127 |
$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY) |
|
128 |
||
129 |
$(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM) |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
130 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
131 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
132 |
|
20547 | 133 |
BUILD_LIBZIP_EXCLUDES := |
134 |
ifeq ($(USE_EXTERNAL_LIBZ), true) |
|
43806 | 135 |
LIBZIP_EXCLUDES += zlib |
20547 | 136 |
endif |
137 |
||
138 |
ifeq ($(LIBZIP_CAN_USE_MMAP), true) |
|
139 |
BUILD_LIBZIP_MMAP := -DUSE_MMAP |
|
140 |
endif |
|
141 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
142 |
$(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
143 |
NAME := zip, \ |
20547 | 144 |
OPTIMIZATION := LOW, \ |
145 |
EXCLUDES := $(LIBZIP_EXCLUDES), \ |
|
146 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
147 |
$(LIBZ_CFLAGS), \ |
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27186
diff
changeset
|
148 |
CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \ |
51853
ec62d6cab037
8211029: Have a common set of enabled warnings for all native libraries
ihse
parents:
51825
diff
changeset
|
149 |
DISABLED_WARNINGS_gcc := unused-function, \ |
20547 | 150 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
33406 | 151 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
152 |
LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \ |
33406 | 153 |
LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ |
35276 | 154 |
)) |
20547 | 155 |
|
156 |
$(BUILD_LIBZIP): $(BUILD_LIBJAVA) |
|
157 |
||
27565 | 158 |
TARGETS += $(BUILD_LIBZIP) |
20547 | 159 |
|
160 |
########################################################################################## |
|
161 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
162 |
$(eval $(call SetupJdkLibrary, BUILD_LIBJIMAGE, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
163 |
NAME := jimage, \ |
41217
c3bdba3a880a
8160630: libjimage.so and others should link statically to libgcc
erikj
parents:
38783
diff
changeset
|
164 |
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
165 |
OPTIMIZATION := LOW, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
166 |
CFLAGS := $(CFLAGS_JDKLIB), \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
167 |
CXXFLAGS := $(CXXFLAGS_JDKLIB), \ |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
168 |
CFLAGS_unix := -UDEBUG, \ |
41475 | 169 |
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ |
33406 | 170 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
171 |
LIBS_unix := -ljvm -ldl $(LIBCXX), \ |
|
172 |
LIBS_macosx := -lc++, \ |
|
173 |
LIBS_windows := jvm.lib, \ |
|
35276 | 174 |
)) |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
175 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
176 |
$(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA) |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
177 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
178 |
TARGETS += $(BUILD_LIBJIMAGE) |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
179 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
180 |
########################################################################################## |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
181 |
|
53683 | 182 |
ifeq ($(call isTargetOs, macosx), true) |
51825
e3632b4706c4
8210931: JLI and launchers normalization and cleanup
ihse
parents:
51811
diff
changeset
|
183 |
LIBJLI_EXCLUDE_FILES += java_md_solinux.c |
20547 | 184 |
endif |
185 |
||
53683 | 186 |
ifeq ($(call isTargetOs, windows), true) |
28984
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
187 |
# Supply the name of the C runtime lib. |
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
188 |
LIBJLI_CFLAGS += -DMSVCR_DLL_NAME='"$(notdir $(MSVCR_DLL))"' |
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
189 |
ifneq ($(MSVCP_DLL), ) |
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
190 |
LIBJLI_CFLAGS += -DMSVCP_DLL_NAME='"$(notdir $(MSVCP_DLL))"' |
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
191 |
endif |
20547 | 192 |
endif |
193 |
||
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
194 |
LIBJLI_CFLAGS += $(LIBZ_CFLAGS) |
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
195 |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
196 |
ifneq ($(USE_EXTERNAL_LIBZ), true) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
197 |
LIBJLI_EXTRA_FILES += \ |
47217 | 198 |
$(addprefix $(TOPDIR)/src/java.base/share/native/libzip/zlib/, \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
199 |
inflate.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
200 |
inftrees.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
201 |
inffast.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
202 |
zadler32.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
203 |
zcrc32.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
204 |
zutil.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
205 |
) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
206 |
endif |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
207 |
|
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
208 |
$(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
209 |
NAME := jli, \ |
51825
e3632b4706c4
8210931: JLI and launchers normalization and cleanup
ihse
parents:
51811
diff
changeset
|
210 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
211 |
EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
212 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
20547 | 213 |
OPTIMIZATION := HIGH, \ |
51808 | 214 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ |
51853
ec62d6cab037
8211029: Have a common set of enabled warnings for all native libraries
ihse
parents:
51825
diff
changeset
|
215 |
DISABLED_WARNINGS_gcc := unused-function, \ |
ec62d6cab037
8211029: Have a common set of enabled warnings for all native libraries
ihse
parents:
51825
diff
changeset
|
216 |
DISABLED_WARNINGS_clang := sometimes-uninitialized format-nonliteral, \ |
32408
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
217 |
DISABLED_WARNINGS_solstudio := \ |
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
218 |
E_ASM_DISABLES_OPTIMIZATION \ |
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
219 |
E_STATEMENT_NOT_REACHED, \ |
20547 | 220 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
221 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
222 |
LIBS_unix := $(LIBZ_LIBS), \ |
49241 | 223 |
LIBS_linux := $(LIBDL) -lpthread, \ |
224 |
LIBS_solaris := $(LIBDL), \ |
|
33406 | 225 |
LIBS_aix := $(LIBDL),\ |
226 |
LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \ |
|
227 |
LIBS_windows := advapi32.lib comctl32.lib user32.lib, \ |
|
35276 | 228 |
)) |
20547 | 229 |
|
27565 | 230 |
TARGETS += $(BUILD_LIBJLI) |
20547 | 231 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
232 |
LIBJLI_SRC_DIRS := $(call FindSrcDirsForComponent, java.base, libjli) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50469
diff
changeset
|
233 |
|
53683 | 234 |
ifeq ($(call isTargetOs, aix), true) |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
235 |
# AIX also requires a static libjli because the compiler doesn't support '-rpath' |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
236 |
$(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
237 |
NAME := jli_static, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
238 |
TYPE := STATIC_LIBRARY, \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
239 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
240 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
241 |
EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
242 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
243 |
OPTIMIZATION := HIGH, \ |
51896 | 244 |
CFLAGS := $(STATIC_LIBRARY_FLAGS) $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \ |
50506
54fcaffa8fac
8204684: [AIX] Build of libjli_static broken after change 8204572 (SetupJdkLibrary)
simonis
parents:
50471
diff
changeset
|
245 |
$(addprefix -I, $(LIBJLI_SRC_DIRS)), \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
246 |
ARFLAGS := $(ARFLAGS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
247 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static)) |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
248 |
|
27565 | 249 |
TARGETS += $(BUILD_LIBJLI_STATIC) |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
250 |
|
20547 | 251 |
endif |