author | simonis |
Wed, 13 Apr 2016 11:13:15 +0200 | |
changeset 37529 | 868c7195632c |
parent 37525 | 4f8679a3077d |
child 37612 | 2c9bb54c90dc |
permissions | -rw-r--r-- |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
36122 | 2 |
# Copyright (c) 2011, 2016, 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. |
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
|
29 |
$(eval $(call IncludeCustomExtension, jdk, lib/CoreLibraries.gmk)) |
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 |
|
20547 | 36 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
13164 | 37 |
|
38 |
ifneq ($(OPENJDK_TARGET_OS), solaris) |
|
20547 | 39 |
BUILD_LIBFDLIBM_OPTIMIZATION := NONE |
12892 | 40 |
endif |
41 |
||
25859 | 42 |
LIBFDLIBM_SRC := $(JDK_TOPDIR)/src/java.base/share/native/libfdlibm |
43 |
LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) |
|
44 |
||
20547 | 45 |
ifneq ($(OPENJDK_TARGET_OS), macosx) |
46 |
$(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \ |
|
47 |
STATIC_LIBRARY := fdlibm, \ |
|
27565 | 48 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |
25859 | 49 |
SRC := $(LIBFDLIBM_SRC), \ |
20547 | 50 |
OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \ |
25859 | 51 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ |
20547 | 52 |
CFLAGS_windows_debug := -DLOGGING, \ |
22594 | 53 |
CFLAGS_aix := -qfloat=nomaf, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
54 |
DISABLED_WARNINGS_gcc := sign-compare, \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
55 |
DISABLED_WARNINGS_microsoft := 4146 4244 4018, \ |
20547 | 56 |
ARFLAGS := $(ARFLAGS), \ |
27565 | 57 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
35276 | 58 |
)) |
13164 | 59 |
|
12892 | 60 |
else |
14855
d104ff4d4bb9
8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents:
14789
diff
changeset
|
61 |
|
20890 | 62 |
# On macosx the old build does partial (incremental) linking of fdlibm instead of |
63 |
# a plain static library. |
|
20547 | 64 |
$(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC, \ |
65 |
LIBRARY := fdlibm, \ |
|
27565 | 66 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
25859 | 67 |
SRC := $(LIBFDLIBM_SRC), \ |
68 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ |
|
20547 | 69 |
LDFLAGS := -nostdlib -r -arch x86_64, \ |
27565 | 70 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
35276 | 71 |
)) |
20547 | 72 |
|
27565 | 73 |
BUILD_LIBFDLIBM := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) |
20547 | 74 |
$(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC) |
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
16513
diff
changeset
|
75 |
$(call install-file) |
12892 | 76 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
77 |
endif |
20890 | 78 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
79 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
80 |
|
13164 | 81 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
20547 | 82 |
ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
21805 | 83 |
BUILD_LIBVERIFY_REORDER := $(JDK_TOPDIR)/make/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU) |
20547 | 84 |
endif |
13164 | 85 |
endif |
86 |
||
20547 | 87 |
LIBVERIFY_OPTIMIZATION := HIGH |
88 |
ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), ) |
|
35276 | 89 |
ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true) |
20547 | 90 |
LIBVERIFY_OPTIMIZATION := LOW |
91 |
endif |
|
13702 | 92 |
endif |
93 |
||
20547 | 94 |
$(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \ |
95 |
LIBRARY := verify, \ |
|
96 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
25859 | 97 |
SRC := $(JDK_TOPDIR)/src/java.base/share/native/libverify, \ |
20547 | 98 |
OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \ |
99 |
CFLAGS := $(CFLAGS_JDKLIB), \ |
|
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
100 |
DISABLED_WARNINGS_microsoft := 4244 4267, \ |
21805 | 101 |
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libverify/mapfile-vers, \ |
20547 | 102 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
103 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
33406 | 104 |
LIBS_unix := -ljvm -lc, \ |
105 |
LIBS_windows := jvm.lib, \ |
|
25859 | 106 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 107 |
RC_FLAGS := $(RC_FLAGS) \ |
108 |
-D "JDK_FNAME=verify.dll" \ |
|
109 |
-D "JDK_INTERNAL_NAME=verify" \ |
|
110 |
-D "JDK_FTYPE=0x2L", \ |
|
111 |
REORDER := $(BUILD_LIBVERIFY_REORDER), \ |
|
27565 | 112 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify, \ |
35276 | 113 |
)) |
13164 | 114 |
|
27565 | 115 |
TARGETS += $(BUILD_LIBVERIFY) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
116 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
117 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
118 |
|
25859 | 119 |
LIBJAVA_SRC_DIRS := $(call FindSrcDirsForLib, java.base, java) |
20547 | 120 |
|
25859 | 121 |
LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \ |
122 |
-I$(JDK_TOPDIR)/src/java.base/share/native/libfdlibm \ |
|
27565 | 123 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
20547 | 124 |
-DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' |
13164 | 125 |
|
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
|
126 |
# Make it possible to override this variable |
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
|
127 |
LIBJAVA_MAPFILE ?= $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers |
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
|
128 |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
129 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
20547 | 130 |
BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c |
131 |
BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c |
|
13164 | 132 |
endif |
133 |
||
134 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
|
20547 | 135 |
ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
21805 | 136 |
LIBJAVA_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU) |
20547 | 137 |
endif |
13164 | 138 |
endif |
139 |
||
20547 | 140 |
$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \ |
141 |
LIBRARY := java, \ |
|
142 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
143 |
SRC := $(LIBJAVA_SRC_DIRS), \ |
|
144 |
OPTIMIZATION := HIGH, \ |
|
145 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
146 |
$(LIBJAVA_CFLAGS), \ |
|
33984
2333676816eb
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30784
diff
changeset
|
147 |
System.c_CFLAGS := $(VERSION_CFLAGS), \ |
2333676816eb
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30784
diff
changeset
|
148 |
jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \ |
37529
868c7195632c
8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build
simonis
parents:
37525
diff
changeset
|
149 |
WARNINGS_AS_ERRORS_xlc := false, \ |
36511 | 150 |
DISABLED_WARNINGS_gcc := unused-result, \ |
32408
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
151 |
DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
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
|
152 |
MAPFILE := $(LIBJAVA_MAPFILE), \ |
20547 | 153 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
154 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
33406 | 155 |
LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \ |
156 |
LDFLAGS_windows := -export:winFileHandleOpen -export:handleLseek \ |
|
157 |
-export:getLastErrorString \ |
|
158 |
-export:getErrorString -delayload:shell32.dll, \ |
|
159 |
LIBS_unix := -ljvm -lverify, \ |
|
160 |
LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \ |
|
161 |
LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \ |
|
36110
91a3a6df36ec
8150203: Incremental update from build-infra project
ihse
parents:
35706
diff
changeset
|
162 |
LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) $(LIBM),\ |
33406 | 163 |
LIBS_macosx := -lfdlibm \ |
20547 | 164 |
-framework CoreFoundation \ |
165 |
-framework Foundation \ |
|
166 |
-framework Security -framework SystemConfiguration, \ |
|
33406 | 167 |
LIBS_windows := jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \ |
168 |
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
|
169 |
advapi32.lib version.lib, \ |
25859 | 170 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 171 |
RC_FLAGS := $(RC_FLAGS) \ |
172 |
-D "JDK_FNAME=java.dll" \ |
|
173 |
-D "JDK_INTERNAL_NAME=java" \ |
|
174 |
-D "JDK_FTYPE=0x2L", \ |
|
175 |
REORDER := $(LIBJAVA_REORDER), \ |
|
27565 | 176 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava, \ |
35276 | 177 |
)) |
13164 | 178 |
|
27565 | 179 |
TARGETS += $(BUILD_LIBJAVA) |
20547 | 180 |
|
181 |
$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY) |
|
182 |
||
183 |
$(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM) |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
184 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
185 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
186 |
|
20547 | 187 |
BUILD_LIBZIP_EXCLUDES := |
188 |
ifeq ($(USE_EXTERNAL_LIBZ), true) |
|
24710
c019dc4104b2
8044725: Bug in zlib 1.2.5 prevents inflation of some gzipped files
sherman
parents:
23562
diff
changeset
|
189 |
LIBZIP_EXCLUDES += zlib-1.2.8 |
20547 | 190 |
endif |
191 |
||
192 |
BUILD_LIBZIP_REORDER := |
|
193 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
|
194 |
ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
|
21805 | 195 |
BUILD_LIBZIP_REORDER := $(JDK_TOPDIR)/make/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU) |
20547 | 196 |
endif |
197 |
endif |
|
198 |
||
199 |
ifeq ($(LIBZIP_CAN_USE_MMAP), true) |
|
200 |
BUILD_LIBZIP_MMAP := -DUSE_MMAP |
|
201 |
endif |
|
202 |
||
203 |
$(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \ |
|
204 |
LIBRARY := zip, \ |
|
205 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
206 |
OPTIMIZATION := LOW, \ |
|
25859 | 207 |
SRC := $(JDK_TOPDIR)/src/java.base/share/native/libzip, \ |
20547 | 208 |
EXCLUDES := $(LIBZIP_EXCLUDES), \ |
209 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
210 |
$(ZLIB_CPPFLAGS) \ |
|
25859 | 211 |
-I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ |
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27186
diff
changeset
|
212 |
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ |
27565 | 213 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.base, \ |
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27186
diff
changeset
|
214 |
CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
215 |
DISABLED_WARNINGS_gcc := parentheses, \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
216 |
DISABLED_WARNINGS_clang := dangling-else, \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
217 |
DISABLED_WARNINGS_microsoft := 4267, \ |
21805 | 218 |
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libzip/mapfile-vers, \ |
20547 | 219 |
REORDER := $(BUILD_LIBZIP_REORDER), \ |
220 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
|
33406 | 221 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
20547 | 222 |
LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ |
27565 | 223 |
-export:ZIP_ReadEntry -export:ZIP_GetNextEntry \ |
33406 | 224 |
-export:ZIP_InflateFully -export:ZIP_CRC32, \ |
225 |
LIBS_unix := -ljvm -ljava $(LIBZ), \ |
|
226 |
LIBS_solaris := -lc, \ |
|
227 |
LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ |
|
25859 | 228 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 229 |
RC_FLAGS := $(RC_FLAGS) \ |
230 |
-D "JDK_FNAME=zip.dll" \ |
|
231 |
-D "JDK_INTERNAL_NAME=zip" \ |
|
232 |
-D "JDK_FTYPE=0x2L", \ |
|
27565 | 233 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libzip, \ |
35276 | 234 |
)) |
20547 | 235 |
|
236 |
$(BUILD_LIBZIP): $(BUILD_LIBJAVA) |
|
237 |
||
27565 | 238 |
TARGETS += $(BUILD_LIBZIP) |
20547 | 239 |
|
240 |
########################################################################################## |
|
241 |
||
32654
23ae9cdf149e
8136690: AIX: libjimage should be linked with the C++ compiler
simonis
parents:
32758
diff
changeset
|
242 |
ifeq ($(OPENJDK_TARGET_OS), aix) |
23ae9cdf149e
8136690: AIX: libjimage should be linked with the C++ compiler
simonis
parents:
32758
diff
changeset
|
243 |
LIBJIMAGE_TOOLCHAIN := TOOLCHAIN_LINK_CXX |
23ae9cdf149e
8136690: AIX: libjimage should be linked with the C++ compiler
simonis
parents:
32758
diff
changeset
|
244 |
endif # OPENJDK_TARGET_OS aix |
23ae9cdf149e
8136690: AIX: libjimage should be linked with the C++ compiler
simonis
parents:
32758
diff
changeset
|
245 |
|
35706 | 246 |
JIMAGELIB_CPPFLAGS := \ |
247 |
-I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ |
|
248 |
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ |
|
249 |
-I$(JDK_TOPDIR)/src/java.base/share/native/libjimage \ |
|
250 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
|
251 |
# |
|
252 |
||
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
253 |
$(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
254 |
LIBRARY := jimage, \ |
32654
23ae9cdf149e
8136690: AIX: libjimage should be linked with the C++ compiler
simonis
parents:
32758
diff
changeset
|
255 |
TOOLCHAIN := $(LIBJIMAGE_TOOLCHAIN), \ |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
256 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
257 |
OPTIMIZATION := LOW, \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
258 |
SRC := $(JDK_TOPDIR)/src/java.base/share/native/libjimage \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
259 |
$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
260 |
EXCLUDES := $(LIBJIMAGE_EXCLUDES), \ |
35706 | 261 |
CFLAGS := $(CFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \ |
262 |
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \ |
|
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
263 |
CFLAGS_unix := -UDEBUG, \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
264 |
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
265 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
33406 | 266 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
267 |
LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
268 |
-export:JIMAGE_PackageToModule \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
269 |
-export:JIMAGE_FindResource -export:JIMAGE_GetResource \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
270 |
-export:JIMAGE_ResourceIterator, \ |
33406 | 271 |
LIBS_unix := -ljvm -ldl $(LIBCXX), \ |
272 |
LIBS_solaris := -lc, \ |
|
273 |
LIBS_macosx := -lc++, \ |
|
274 |
LIBS_windows := jvm.lib, \ |
|
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
275 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
276 |
RC_FLAGS := $(RC_FLAGS) \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
277 |
-D "JDK_FNAME=jimage.dll" \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
278 |
-D "JDK_INTERNAL_NAME=jimage" \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
279 |
-D "JDK_FTYPE=0x2L", \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
280 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjimage, \ |
35276 | 281 |
)) |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
282 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
283 |
$(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA) |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
284 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
285 |
TARGETS += $(BUILD_LIBJIMAGE) |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
286 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
287 |
########################################################################################## |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
288 |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
289 |
LIBJLI_SRC_DIRS := $(call FindSrcDirsForLib, java.base, jli) |
22951
5fd21112b2b6
8034043: Native methods for preferences API should not be in libjava
alanb
parents:
22941
diff
changeset
|
290 |
|
25859 | 291 |
LIBJLI_CFLAGS := $(CFLAGS_JDKLIB) |
20547 | 292 |
|
37525 | 293 |
ifeq ($(call check-jvm-variant, zero zeroshark), true) |
20547 | 294 |
ERGO_FAMILY := zero |
295 |
else |
|
296 |
ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86) |
|
297 |
ERGO_FAMILY := i586 |
|
298 |
else |
|
299 |
ERGO_FAMILY := $(OPENJDK_TARGET_CPU_ARCH) |
|
300 |
endif |
|
301 |
endif |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
302 |
LIBJLI_ALL_ERGO := $(wildcard $(addsuffix /ergo_*.c, $(LIBJLI_SRC_DIRS))) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
303 |
LIBJLI_EXCLUDE_ERGO := $(filter-out %/ergo_$(ERGO_FAMILY).c, $(LIBJLI_ALL_ERGO)) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
304 |
# If all specialized ergo files are excluded, use generic ergo |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
305 |
ifeq ($(LIBJLI_ALL_ERGO), $(LIBJLI_EXCLUDE_ERGO)) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
306 |
LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
307 |
endif |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
308 |
LIBJLI_EXCLUDE_FILES += $(notdir $(LIBJLI_EXCLUDE_ERGO)) |
20547 | 309 |
|
310 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
29742
b73f38796859
8074840: Resolve disabled warnings for libjli and libjli_static
mikael
parents:
29374
diff
changeset
|
311 |
LIBJLI_EXCLUDE_FILES += java_md_solinux.c ergo.c ergo_i586.c |
20547 | 312 |
|
313 |
BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c |
|
314 |
BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS := -x objective-c |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
315 |
|
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
316 |
LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" |
20547 | 317 |
endif |
318 |
||
319 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
320 |
# Staticically link with c runtime on windows. |
|
321 |
LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS)) |
|
322 |
LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE) |
|
28984
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
323 |
# 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
|
324 |
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
|
325 |
ifneq ($(MSVCP_DLL), ) |
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
326 |
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
|
327 |
endif |
20547 | 328 |
else |
329 |
LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli |
|
330 |
endif |
|
331 |
||
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
332 |
LIBJLI_CFLAGS += $(addprefix -I, $(LIBJLI_SRC_DIRS)) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
333 |
|
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
334 |
# Append defines depending on target platform |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
335 |
LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
336 |
|
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
337 |
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
|
338 |
LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
339 |
LIBJLI_EXTRA_FILES += \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
340 |
$(addprefix $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8/, \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
341 |
inflate.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
342 |
inftrees.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
343 |
inffast.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
344 |
zadler32.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
345 |
zcrc32.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
346 |
zutil.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
347 |
) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
348 |
endif |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
349 |
|
20547 | 350 |
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \ |
351 |
LIBRARY := jli, \ |
|
352 |
OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \ |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
353 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
354 |
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
|
355 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
20547 | 356 |
OPTIMIZATION := HIGH, \ |
357 |
CFLAGS := $(LIBJLI_CFLAGS), \ |
|
32408
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
358 |
DISABLED_WARNINGS_solstudio := \ |
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
359 |
E_ASM_DISABLES_OPTIMIZATION \ |
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
360 |
E_STATEMENT_NOT_REACHED, \ |
21805 | 361 |
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjli/mapfile-vers, \ |
20547 | 362 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
363 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
364 |
LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
|
365 |
LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
|
33406 | 366 |
LDFLAGS_windows := \ |
20547 | 367 |
-export:JLI_Launch \ |
368 |
-export:JLI_ManifestIterate \ |
|
369 |
-export:JLI_SetTraceLauncher \ |
|
370 |
-export:JLI_ReportErrorMessage \ |
|
371 |
-export:JLI_ReportErrorMessageSys \ |
|
372 |
-export:JLI_ReportMessage \ |
|
373 |
-export:JLI_ReportExceptionDescription \ |
|
374 |
-export:JLI_MemAlloc \ |
|
375 |
-export:JLI_CmdToArgs \ |
|
376 |
-export:JLI_GetStdArgc \ |
|
377 |
-export:JLI_GetStdArgs \ |
|
32267
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
378 |
-export:JLI_List_new \ |
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
379 |
-export:JLI_List_add \ |
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
380 |
-export:JLI_StringDup \ |
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
381 |
-export:JLI_MemFree \ |
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
382 |
-export:JLI_InitArgProcessing \ |
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
383 |
-export:JLI_PreprocessArg \ |
33406 | 384 |
-export:JLI_GetAppArgIndex, \ |
385 |
LIBS_unix := $(LIBZ), \ |
|
386 |
LIBS_linux := $(LIBDL) -lc -lpthread, \ |
|
387 |
LIBS_solaris := $(LIBDL) -lc, \ |
|
388 |
LIBS_aix := $(LIBDL),\ |
|
389 |
LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \ |
|
390 |
LIBS_windows := advapi32.lib comctl32.lib user32.lib, \ |
|
25859 | 391 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 392 |
RC_FLAGS := $(RC_FLAGS) \ |
393 |
-D "JDK_FNAME=jli.dll" \ |
|
394 |
-D "JDK_INTERNAL_NAME=jli" \ |
|
395 |
-D "JDK_FTYPE=0x2L", \ |
|
27565 | 396 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli, \ |
35276 | 397 |
)) |
20547 | 398 |
|
27565 | 399 |
TARGETS += $(BUILD_LIBJLI) |
20547 | 400 |
|
401 |
# On windows, the static library has the same suffix as the import library created by |
|
402 |
# with the shared library, so the static library is given a different name. No harm |
|
403 |
# in doing it for all platform to reduce complexity. |
|
404 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
405 |
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ |
|
406 |
STATIC_LIBRARY := jli_static, \ |
|
27565 | 407 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
408 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
409 |
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
|
410 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
20547 | 411 |
OPTIMIZATION := HIGH, \ |
412 |
CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \ |
|
413 |
ARFLAGS := $(ARFLAGS), \ |
|
27565 | 414 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
35276 | 415 |
)) |
20547 | 416 |
|
27565 | 417 |
TARGETS += $(BUILD_LIBJLI_STATIC) |
20547 | 418 |
|
419 |
else ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
420 |
# |
|
421 |
# On macosx they do partial (incremental) linking of libjli_static.a |
|
422 |
# code it here...rather than add support to NativeCompilation |
|
423 |
# as this is first time I see it |
|
424 |
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ |
|
425 |
LIBRARY := jli_static, \ |
|
27565 | 426 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
427 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
428 |
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
|
429 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
20547 | 430 |
OPTIMIZATION := HIGH, \ |
431 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ |
|
432 |
LDFLAGS := -nostdlib -r, \ |
|
27565 | 433 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
35276 | 434 |
)) |
20547 | 435 |
|
33653
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
436 |
ifeq ($(STATIC_BUILD), true) |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
437 |
TARGETS += $(BUILD_LIBJLI_STATIC) |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
438 |
else |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
439 |
$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a: $(BUILD_LIBJLI_STATIC) |
20547 | 440 |
$(call install-file) |
441 |
||
33653
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
442 |
TARGETS += $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
443 |
endif |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
444 |
|
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
445 |
else ifeq ($(OPENJDK_TARGET_OS), aix) |
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
446 |
# AIX also requires a static libjli because the compiler doesn't support '-rpath' |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
447 |
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
448 |
STATIC_LIBRARY := jli_static, \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
449 |
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
|
450 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
451 |
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
|
452 |
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
|
453 |
OPTIMIZATION := HIGH, \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
454 |
CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
455 |
ARFLAGS := $(ARFLAGS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
456 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static)) |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
457 |
|
27565 | 458 |
TARGETS += $(BUILD_LIBJLI_STATIC) |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
459 |
|
20547 | 460 |
endif |