author | dfuchs |
Fri, 09 Mar 2018 11:24:37 +0000 | |
branch | http-client-branch |
changeset 56268 | 481d8c9acc7f |
parent 49070 | d7859531621b |
child 49241 | de4b3a04feae |
child 56246 | ec2458f5505a |
child 56287 | 593a452fcbeb |
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 |
|
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
38 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
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 |
|
42353
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
42 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
43 |
ifeq ($(OPENJDK_TARGET_CPU), ppc64) |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
44 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
45 |
else ifeq ($(OPENJDK_TARGET_CPU), ppc64le) |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
46 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
47 |
else ifeq ($(OPENJDK_TARGET_CPU), s390x) |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
48 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
49 |
else ifeq ($(OPENJDK_TARGET_CPU), aarch64) |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
50 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
51 |
endif |
12892 | 52 |
endif |
53 |
||
47217 | 54 |
LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm |
25859 | 55 |
LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) |
56 |
||
20547 | 57 |
ifneq ($(OPENJDK_TARGET_OS), macosx) |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
58 |
$(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
59 |
NAME := fdlibm, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
60 |
TYPE := STATIC_LIBRARY, \ |
27565 | 61 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ |
25859 | 62 |
SRC := $(LIBFDLIBM_SRC), \ |
20547 | 63 |
OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \ |
25859 | 64 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ |
20547 | 65 |
CFLAGS_windows_debug := -DLOGGING, \ |
22594 | 66 |
CFLAGS_aix := -qfloat=nomaf, \ |
42353
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
67 |
CFLAGS_linux_ppc64 := -ffp-contract=off, \ |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
68 |
CFLAGS_linux_ppc64le := -ffp-contract=off, \ |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
69 |
CFLAGS_linux_s390x := -ffp-contract=off, \ |
ac0c725825bc
8170153: PPC64/s390x/aarch64: Poor StrictMath performance due to non-optimized compilation
gromero
parents:
41475
diff
changeset
|
70 |
CFLAGS_linux_aarch64 := -ffp-contract=off, \ |
48766
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
71 |
DISABLED_WARNINGS_gcc := sign-compare misleading-indentation, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
72 |
DISABLED_WARNINGS_microsoft := 4146 4244 4018, \ |
20547 | 73 |
ARFLAGS := $(ARFLAGS), \ |
27565 | 74 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
35276 | 75 |
)) |
13164 | 76 |
|
12892 | 77 |
else |
14855
d104ff4d4bb9
8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents:
14789
diff
changeset
|
78 |
|
20890 | 79 |
# On macosx the old build does partial (incremental) linking of fdlibm instead of |
80 |
# a plain static library. |
|
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
81 |
$(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM_MAC, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
82 |
NAME := fdlibm, \ |
27565 | 83 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
25859 | 84 |
SRC := $(LIBFDLIBM_SRC), \ |
85 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ |
|
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
86 |
LDFLAGS := -nostdlib $(ARFLAGS), \ |
27565 | 87 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ |
35276 | 88 |
)) |
20547 | 89 |
|
27565 | 90 |
BUILD_LIBFDLIBM := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) |
20547 | 91 |
$(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC) |
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
16513
diff
changeset
|
92 |
$(call install-file) |
12892 | 93 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
94 |
endif |
20890 | 95 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
96 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
97 |
|
13164 | 98 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
20547 | 99 |
ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
47217 | 100 |
BUILD_LIBVERIFY_REORDER := $(TOPDIR)/make/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU) |
20547 | 101 |
endif |
13164 | 102 |
endif |
103 |
||
20547 | 104 |
LIBVERIFY_OPTIMIZATION := HIGH |
105 |
ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), ) |
|
35276 | 106 |
ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true) |
20547 | 107 |
LIBVERIFY_OPTIMIZATION := LOW |
108 |
endif |
|
13702 | 109 |
endif |
110 |
||
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
111 |
$(eval $(call SetupNativeCompilation, BUILD_LIBVERIFY, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
112 |
NAME := verify, \ |
20547 | 113 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
47217 | 114 |
SRC := $(TOPDIR)/src/java.base/share/native/libverify, \ |
20547 | 115 |
OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \ |
116 |
CFLAGS := $(CFLAGS_JDKLIB), \ |
|
48766
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
117 |
DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
28999
diff
changeset
|
118 |
DISABLED_WARNINGS_microsoft := 4244 4267, \ |
47217 | 119 |
MAPFILE := $(TOPDIR)/make/mapfiles/libverify/mapfile-vers, \ |
20547 | 120 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
121 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
33406 | 122 |
LIBS_unix := -ljvm -lc, \ |
123 |
LIBS_windows := jvm.lib, \ |
|
25859 | 124 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 125 |
RC_FLAGS := $(RC_FLAGS) \ |
126 |
-D "JDK_FNAME=verify.dll" \ |
|
127 |
-D "JDK_INTERNAL_NAME=verify" \ |
|
128 |
-D "JDK_FTYPE=0x2L", \ |
|
129 |
REORDER := $(BUILD_LIBVERIFY_REORDER), \ |
|
27565 | 130 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify, \ |
35276 | 131 |
)) |
13164 | 132 |
|
27565 | 133 |
TARGETS += $(BUILD_LIBVERIFY) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
134 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
135 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
136 |
|
45462
0de8011890c0
8173654: Regression since 8u60: System.getenv doesn't return env var set in JNI code
robm
parents:
43806
diff
changeset
|
137 |
# Allow a custom makefile to add extra src dirs |
0de8011890c0
8173654: Regression since 8u60: System.getenv doesn't return env var set in JNI code
robm
parents:
43806
diff
changeset
|
138 |
LIBJAVA_SRC_DIRS += $(call FindSrcDirsForLib, java.base, java) |
20547 | 139 |
|
25859 | 140 |
LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \ |
47217 | 141 |
-I$(TOPDIR)/src/java.base/share/native/libfdlibm \ |
27565 | 142 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
20547 | 143 |
-DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' |
13164 | 144 |
|
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
|
145 |
# Make it possible to override this variable |
47217 | 146 |
LIBJAVA_MAPFILE ?= $(TOPDIR)/make/mapfiles/libjava/mapfile-vers |
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
|
147 |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
148 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
20547 | 149 |
BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c |
150 |
BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c |
|
13164 | 151 |
endif |
152 |
||
153 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
|
20547 | 154 |
ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
47217 | 155 |
LIBJAVA_REORDER := $(TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU) |
20547 | 156 |
endif |
13164 | 157 |
endif |
158 |
||
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
159 |
$(eval $(call SetupNativeCompilation, BUILD_LIBJAVA, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
160 |
NAME := java, \ |
20547 | 161 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
162 |
SRC := $(LIBJAVA_SRC_DIRS), \ |
|
163 |
OPTIMIZATION := HIGH, \ |
|
164 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
165 |
$(LIBJAVA_CFLAGS), \ |
|
33984
2333676816eb
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30784
diff
changeset
|
166 |
System.c_CFLAGS := $(VERSION_CFLAGS), \ |
2333676816eb
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30784
diff
changeset
|
167 |
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
|
168 |
WARNINGS_AS_ERRORS_xlc := false, \ |
36511 | 169 |
DISABLED_WARNINGS_gcc := unused-result, \ |
32408
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
170 |
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
|
171 |
MAPFILE := $(LIBJAVA_MAPFILE), \ |
20547 | 172 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
173 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
33406 | 174 |
LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \ |
175 |
LDFLAGS_windows := -export:winFileHandleOpen -export:handleLseek \ |
|
176 |
-export:getLastErrorString \ |
|
177 |
-export:getErrorString -delayload:shell32.dll, \ |
|
178 |
LIBS_unix := -ljvm -lverify, \ |
|
179 |
LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \ |
|
180 |
LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \ |
|
36110
91a3a6df36ec
8150203: Incremental update from build-infra project
ihse
parents:
35706
diff
changeset
|
181 |
LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) $(LIBM),\ |
33406 | 182 |
LIBS_macosx := -lfdlibm \ |
20547 | 183 |
-framework CoreFoundation \ |
184 |
-framework Foundation \ |
|
185 |
-framework Security -framework SystemConfiguration, \ |
|
33406 | 186 |
LIBS_windows := jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \ |
187 |
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
|
188 |
advapi32.lib version.lib, \ |
25859 | 189 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 190 |
RC_FLAGS := $(RC_FLAGS) \ |
191 |
-D "JDK_FNAME=java.dll" \ |
|
192 |
-D "JDK_INTERNAL_NAME=java" \ |
|
193 |
-D "JDK_FTYPE=0x2L", \ |
|
194 |
REORDER := $(LIBJAVA_REORDER), \ |
|
27565 | 195 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava, \ |
35276 | 196 |
)) |
13164 | 197 |
|
27565 | 198 |
TARGETS += $(BUILD_LIBJAVA) |
20547 | 199 |
|
200 |
$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY) |
|
201 |
||
202 |
$(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM) |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
203 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
204 |
########################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
205 |
|
20547 | 206 |
BUILD_LIBZIP_EXCLUDES := |
207 |
ifeq ($(USE_EXTERNAL_LIBZ), true) |
|
43806 | 208 |
LIBZIP_EXCLUDES += zlib |
20547 | 209 |
endif |
210 |
||
211 |
BUILD_LIBZIP_REORDER := |
|
212 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
|
213 |
ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
|
47217 | 214 |
BUILD_LIBZIP_REORDER := $(TOPDIR)/make/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU) |
20547 | 215 |
endif |
216 |
endif |
|
217 |
||
218 |
ifeq ($(LIBZIP_CAN_USE_MMAP), true) |
|
219 |
BUILD_LIBZIP_MMAP := -DUSE_MMAP |
|
220 |
endif |
|
221 |
||
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
222 |
$(eval $(call SetupNativeCompilation, BUILD_LIBZIP, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
223 |
NAME := zip, \ |
20547 | 224 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
225 |
OPTIMIZATION := LOW, \ |
|
47217 | 226 |
SRC := $(TOPDIR)/src/java.base/share/native/libzip, \ |
20547 | 227 |
EXCLUDES := $(LIBZIP_EXCLUDES), \ |
228 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
229 |
$(LIBZ_CFLAGS) \ |
47217 | 230 |
-I$(TOPDIR)/src/java.base/share/native/libjava \ |
231 |
-I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ |
|
27565 | 232 |
-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
|
233 |
CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \ |
48766
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
234 |
DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
47217 | 235 |
MAPFILE := $(TOPDIR)/make/mapfiles/libzip/mapfile-vers, \ |
20547 | 236 |
REORDER := $(BUILD_LIBZIP_REORDER), \ |
237 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
|
33406 | 238 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
20547 | 239 |
LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ |
27565 | 240 |
-export:ZIP_ReadEntry -export:ZIP_GetNextEntry \ |
41358 | 241 |
-export:ZIP_InflateFully -export:ZIP_CRC32 -export:ZIP_FreeEntry, \ |
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
242 |
LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \ |
33406 | 243 |
LIBS_solaris := -lc, \ |
244 |
LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ |
|
25859 | 245 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 246 |
RC_FLAGS := $(RC_FLAGS) \ |
247 |
-D "JDK_FNAME=zip.dll" \ |
|
248 |
-D "JDK_INTERNAL_NAME=zip" \ |
|
249 |
-D "JDK_FTYPE=0x2L", \ |
|
27565 | 250 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libzip, \ |
35276 | 251 |
)) |
20547 | 252 |
|
253 |
$(BUILD_LIBZIP): $(BUILD_LIBJAVA) |
|
254 |
||
27565 | 255 |
TARGETS += $(BUILD_LIBZIP) |
20547 | 256 |
|
257 |
########################################################################################## |
|
258 |
||
35706 | 259 |
JIMAGELIB_CPPFLAGS := \ |
47217 | 260 |
-I$(TOPDIR)/src/java.base/share/native/libjava \ |
261 |
-I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ |
|
262 |
-I$(TOPDIR)/src/java.base/share/native/libjimage \ |
|
35706 | 263 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
264 |
# |
|
265 |
||
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
266 |
$(eval $(call SetupNativeCompilation, BUILD_LIBJIMAGE, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
267 |
NAME := jimage, \ |
41217
c3bdba3a880a
8160630: libjimage.so and others should link statically to libgcc
erikj
parents:
38783
diff
changeset
|
268 |
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
269 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
270 |
OPTIMIZATION := LOW, \ |
47217 | 271 |
SRC := $(TOPDIR)/src/java.base/share/native/libjimage \ |
272 |
$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \ |
|
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
273 |
EXCLUDES := $(LIBJIMAGE_EXCLUDES), \ |
35706 | 274 |
CFLAGS := $(CFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \ |
275 |
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \ |
|
48766
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
276 |
DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
277 |
CFLAGS_unix := -UDEBUG, \ |
47217 | 278 |
MAPFILE := $(TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \ |
41475 | 279 |
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ |
33406 | 280 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
281 |
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
|
282 |
-export:JIMAGE_PackageToModule \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
283 |
-export:JIMAGE_FindResource -export:JIMAGE_GetResource \ |
37612
2c9bb54c90dc
8147634: Need a JImage API that given a JImageLocationRef returns class name
jlaskey
parents:
37529
diff
changeset
|
284 |
-export:JIMAGE_ResourceIterator -export:JIMAGE_ResourcePath, \ |
33406 | 285 |
LIBS_unix := -ljvm -ldl $(LIBCXX), \ |
286 |
LIBS_solaris := -lc, \ |
|
287 |
LIBS_macosx := -lc++, \ |
|
288 |
LIBS_windows := jvm.lib, \ |
|
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
289 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
290 |
RC_FLAGS := $(RC_FLAGS) \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
291 |
-D "JDK_FNAME=jimage.dll" \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
292 |
-D "JDK_INTERNAL_NAME=jimage" \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
293 |
-D "JDK_FTYPE=0x2L", \ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
294 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjimage, \ |
35276 | 295 |
)) |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
296 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
297 |
$(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA) |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
298 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
299 |
TARGETS += $(BUILD_LIBJIMAGE) |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
300 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
301 |
########################################################################################## |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
32267
diff
changeset
|
302 |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
303 |
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
|
304 |
|
25859 | 305 |
LIBJLI_CFLAGS := $(CFLAGS_JDKLIB) |
20547 | 306 |
|
47687 | 307 |
ifeq ($(call check-jvm-variant, zero), true) |
20547 | 308 |
ERGO_FAMILY := zero |
309 |
else |
|
310 |
ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86) |
|
311 |
ERGO_FAMILY := i586 |
|
312 |
else |
|
313 |
ERGO_FAMILY := $(OPENJDK_TARGET_CPU_ARCH) |
|
314 |
endif |
|
315 |
endif |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
316 |
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
|
317 |
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
|
318 |
# 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
|
319 |
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
|
320 |
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
|
321 |
endif |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
322 |
LIBJLI_EXCLUDE_FILES += $(notdir $(LIBJLI_EXCLUDE_ERGO)) |
20547 | 323 |
|
324 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
29742
b73f38796859
8074840: Resolve disabled warnings for libjli and libjli_static
mikael
parents:
29374
diff
changeset
|
325 |
LIBJLI_EXCLUDE_FILES += java_md_solinux.c ergo.c ergo_i586.c |
20547 | 326 |
|
327 |
BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c |
|
328 |
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
|
329 |
|
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
330 |
LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" |
20547 | 331 |
endif |
332 |
||
333 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
334 |
# Staticically link with c runtime on windows. |
|
335 |
LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS)) |
|
336 |
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
|
337 |
# 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
|
338 |
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
|
339 |
ifneq ($(MSVCP_DLL), ) |
12031ba2dc38
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27799
diff
changeset
|
340 |
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
|
341 |
endif |
20547 | 342 |
else |
343 |
LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli |
|
344 |
endif |
|
345 |
||
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
346 |
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
|
347 |
|
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
348 |
LIBJLI_CFLAGS += $(LIBZ_CFLAGS) |
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
349 |
|
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
350 |
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
|
351 |
LIBJLI_EXTRA_FILES += \ |
47217 | 352 |
$(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
|
353 |
inflate.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
354 |
inftrees.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
355 |
inffast.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
356 |
zadler32.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
357 |
zcrc32.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
358 |
zutil.c \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
359 |
) |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
360 |
endif |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
361 |
|
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
362 |
$(eval $(call SetupNativeCompilation, BUILD_LIBJLI, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
363 |
NAME := jli, \ |
20547 | 364 |
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
|
365 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
366 |
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
|
367 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
20547 | 368 |
OPTIMIZATION := HIGH, \ |
369 |
CFLAGS := $(LIBJLI_CFLAGS), \ |
|
48766
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
370 |
DISABLED_WARNINGS_gcc := maybe-uninitialized, \ |
32408
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
371 |
DISABLED_WARNINGS_solstudio := \ |
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
372 |
E_ASM_DISABLES_OPTIMIZATION \ |
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
32267
diff
changeset
|
373 |
E_STATEMENT_NOT_REACHED, \ |
47217 | 374 |
MAPFILE := $(TOPDIR)/make/mapfiles/libjli/mapfile-vers, \ |
20547 | 375 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
376 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
377 |
LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
|
378 |
LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
|
33406 | 379 |
LDFLAGS_windows := \ |
20547 | 380 |
-export:JLI_Launch \ |
381 |
-export:JLI_ManifestIterate \ |
|
382 |
-export:JLI_SetTraceLauncher \ |
|
383 |
-export:JLI_ReportErrorMessage \ |
|
384 |
-export:JLI_ReportErrorMessageSys \ |
|
385 |
-export:JLI_ReportMessage \ |
|
386 |
-export:JLI_ReportExceptionDescription \ |
|
387 |
-export:JLI_MemAlloc \ |
|
388 |
-export:JLI_CmdToArgs \ |
|
389 |
-export:JLI_GetStdArgc \ |
|
390 |
-export:JLI_GetStdArgs \ |
|
32267
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
391 |
-export:JLI_List_new \ |
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
392 |
-export:JLI_List_add \ |
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
393 |
-export:JLI_StringDup \ |
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
394 |
-export:JLI_MemFree \ |
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
395 |
-export:JLI_InitArgProcessing \ |
4e96a9ee01b1
8027634: Support @argfiles for java command-line tool
henryjen
parents:
31246
diff
changeset
|
396 |
-export:JLI_PreprocessArg \ |
43325
033e4cced1dc
8170832: Add a new launcher environment variable JAVA_OPTIONS
henryjen
parents:
42755
diff
changeset
|
397 |
-export:JLI_AddArgsFromEnvVar \ |
33406 | 398 |
-export:JLI_GetAppArgIndex, \ |
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
399 |
LIBS_unix := $(LIBZ_LIBS), \ |
33406 | 400 |
LIBS_linux := $(LIBDL) -lc -lpthread, \ |
401 |
LIBS_solaris := $(LIBDL) -lc, \ |
|
402 |
LIBS_aix := $(LIBDL),\ |
|
403 |
LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \ |
|
404 |
LIBS_windows := advapi32.lib comctl32.lib user32.lib, \ |
|
25859 | 405 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 406 |
RC_FLAGS := $(RC_FLAGS) \ |
407 |
-D "JDK_FNAME=jli.dll" \ |
|
408 |
-D "JDK_INTERNAL_NAME=jli" \ |
|
409 |
-D "JDK_FTYPE=0x2L", \ |
|
27565 | 410 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli, \ |
35276 | 411 |
)) |
20547 | 412 |
|
27565 | 413 |
TARGETS += $(BUILD_LIBJLI) |
20547 | 414 |
|
415 |
# On windows, the static library has the same suffix as the import library created by |
|
416 |
# with the shared library, so the static library is given a different name. No harm |
|
417 |
# in doing it for all platform to reduce complexity. |
|
418 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
419 |
$(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
420 |
NAME := jli_static, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
421 |
TYPE := STATIC_LIBRARY, \ |
27565 | 422 |
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
|
423 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
424 |
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
|
425 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
20547 | 426 |
OPTIMIZATION := HIGH, \ |
427 |
CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \ |
|
428 |
ARFLAGS := $(ARFLAGS), \ |
|
27565 | 429 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
35276 | 430 |
)) |
20547 | 431 |
|
27565 | 432 |
TARGETS += $(BUILD_LIBJLI_STATIC) |
20547 | 433 |
|
434 |
else ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
435 |
# |
|
436 |
# On macosx they do partial (incremental) linking of libjli_static.a |
|
437 |
# code it here...rather than add support to NativeCompilation |
|
438 |
# as this is first time I see it |
|
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
439 |
$(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
440 |
NAME := jli_static, \ |
27565 | 441 |
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
|
442 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
443 |
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
|
444 |
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ |
20547 | 445 |
OPTIMIZATION := HIGH, \ |
446 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ |
|
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
47687
diff
changeset
|
447 |
LDFLAGS := -nostdlib $(ARFLAGS), \ |
27565 | 448 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \ |
35276 | 449 |
)) |
20547 | 450 |
|
33653
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
451 |
ifeq ($(STATIC_BUILD), true) |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
452 |
TARGETS += $(BUILD_LIBJLI_STATIC) |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
453 |
else |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
454 |
$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a: $(BUILD_LIBJLI_STATIC) |
20547 | 455 |
$(call install-file) |
456 |
||
33653
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32846
diff
changeset
|
457 |
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
|
458 |
endif |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
459 |
|
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
460 |
else ifeq ($(OPENJDK_TARGET_OS), aix) |
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
461 |
# 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
|
462 |
$(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
463 |
NAME := jli_static, \ |
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
464 |
TYPE := STATIC_LIBRARY, \ |
28658
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
465 |
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
|
466 |
SRC := $(LIBJLI_SRC_DIRS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
467 |
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
|
468 |
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
|
469 |
OPTIMIZATION := HIGH, \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
470 |
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
|
471 |
ARFLAGS := $(ARFLAGS), \ |
344426303820
8055190: Cleanup include and exclude of core-libs native libraries after source code restructure
erikj
parents:
27799
diff
changeset
|
472 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static)) |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
473 |
|
27565 | 474 |
TARGETS += $(BUILD_LIBJLI_STATIC) |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
475 |
|
20547 | 476 |
endif |