author | ihse |
Thu, 15 Mar 2018 09:33:36 +0100 | |
branch | ihse-cflags-rewrite-branch |
changeset 56312 | a52bcf4118eb |
parent 56237 | 9ccbd02e0c2c |
parent 49244 | 995a5556edfa |
child 56726 | 3a9b7a1f9197 |
permissions | -rw-r--r-- |
25859 | 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. |
25859 | 3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
# |
|
5 |
# This code is free software; you can redistribute it and/or modify it |
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
|
7 |
# published by the Free Software Foundation. Oracle designates this |
|
8 |
# particular file as subject to the "Classpath" exception as provided |
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
|
10 |
# |
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
# accompanied this code). |
|
16 |
# |
|
17 |
# You should have received a copy of the GNU General Public License version |
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
# |
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
# or visit www.oracle.com if you need additional information or have any |
|
23 |
# questions. |
|
24 |
# |
|
25 |
||
26 |
include LauncherCommon.gmk |
|
27 |
||
33523 | 28 |
$(eval $(call SetupBuildLauncher, pack200, \ |
36511 | 29 |
MAIN_MODULE := java.base, \ |
33523 | 30 |
MAIN_CLASS := com.sun.java.util.jar.pack.Driver, \ |
31 |
)) |
|
25859 | 32 |
|
33 |
################################################################################ |
|
34 |
# The order of the object files on the link command line affects the size of the resulting |
|
35 |
# binary (at least on linux) which causes the size to differ between old and new build. |
|
36 |
||
47217 | 37 |
UNPACKEXE_SRC := $(TOPDIR)/src/jdk.pack/share/native/common-unpack \ |
38 |
$(TOPDIR)/src/jdk.pack/share/native/unpack200 |
|
39 |
UNPACKEXE_CFLAGS := -I$(TOPDIR)/src/jdk.pack/share/native/common-unpack \ |
|
40 |
-I$(TOPDIR)/src/java.base/share/native/libjava \ |
|
41 |
-I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava |
|
25859 | 42 |
|
43 |
ifeq ($(USE_EXTERNAL_LIBZ), true) |
|
44 |
UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB |
|
33305
ed708a0e3482
8140223: fix the build with a toolchain with a linker defaulting to ld --as-needed
erikj
parents:
30434
diff
changeset
|
45 |
UNPACKEXE_LIBS := -lz |
25859 | 46 |
else |
47217 | 47 |
UNPACKEXE_CFLAGS += -I$(TOPDIR)/src/java.base/share/native/libzip/zlib |
27565 | 48 |
UNPACKEXE_ZIPOBJS := $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zcrc32$(OBJ_SUFFIX) \ |
49 |
$(SUPPORT_OUTPUTDIR)/native/java.base/libzip/deflate$(OBJ_SUFFIX) \ |
|
50 |
$(SUPPORT_OUTPUTDIR)/native/java.base/libzip/trees$(OBJ_SUFFIX) \ |
|
51 |
$(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zadler32$(OBJ_SUFFIX) \ |
|
52 |
$(SUPPORT_OUTPUTDIR)/native/java.base/libzip/compress$(OBJ_SUFFIX) \ |
|
53 |
$(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zutil$(OBJ_SUFFIX) \ |
|
54 |
$(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inflate$(OBJ_SUFFIX) \ |
|
55 |
$(SUPPORT_OUTPUTDIR)/native/java.base/libzip/infback$(OBJ_SUFFIX) \ |
|
56 |
$(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inftrees$(OBJ_SUFFIX) \ |
|
57 |
$(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inffast$(OBJ_SUFFIX) |
|
25859 | 58 |
|
59 |
endif |
|
60 |
||
47217 | 61 |
UNPACK_MAPFILE_DIR := $(TOPDIR)/make/mapfiles/libunpack |
29879
eede785c4e0d
8077419: Launcher mapfile fails linking with SS12u4
erikj
parents:
29591
diff
changeset
|
62 |
UNPACK_MAPFILE_PLATFORM_FILE := \ |
eede785c4e0d
8077419: Launcher mapfile fails linking with SS12u4
erikj
parents:
29591
diff
changeset
|
63 |
$(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH) |
eede785c4e0d
8077419: Launcher mapfile fails linking with SS12u4
erikj
parents:
29591
diff
changeset
|
64 |
|
25859 | 65 |
# The linker on older SuSE distros (e.g. on SLES 10) complains with: |
66 |
# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable." |
|
67 |
# if feeded with a version script which contains named tags. |
|
68 |
ifeq ($(USING_BROKEN_SUSE_LD), yes) |
|
29879
eede785c4e0d
8077419: Launcher mapfile fails linking with SS12u4
erikj
parents:
29591
diff
changeset
|
69 |
UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200.anonymous |
eede785c4e0d
8077419: Launcher mapfile fails linking with SS12u4
erikj
parents:
29591
diff
changeset
|
70 |
else ifneq ($(wildcard $(UNPACK_MAPFILE_PLATFORM_FILE)), ) |
eede785c4e0d
8077419: Launcher mapfile fails linking with SS12u4
erikj
parents:
29591
diff
changeset
|
71 |
UNPACK_MAPFILE := $(UNPACK_MAPFILE_PLATFORM_FILE) |
25859 | 72 |
else |
29879
eede785c4e0d
8077419: Launcher mapfile fails linking with SS12u4
erikj
parents:
29591
diff
changeset
|
73 |
UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200 |
25859 | 74 |
endif |
75 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
76 |
$(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
77 |
NAME := unpack200, \ |
25859 | 78 |
SRC := $(UNPACKEXE_SRC), \ |
41479
bf50b06f27b5
8167479: arm 32/64 slowdebug fails to build on unpack200
erikj
parents:
41472
diff
changeset
|
79 |
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
25859 | 80 |
OPTIMIZATION := LOW, \ |
28846
b96683be2713
8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents:
27799
diff
changeset
|
81 |
CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) -DFULL, \ |
25859 | 82 |
CFLAGS_release := -DPRODUCT, \ |
83 |
CFLAGS_linux := -fPIC, \ |
|
84 |
CFLAGS_solaris := -KPIC, \ |
|
85 |
CFLAGS_macosx := -fPIC, \ |
|
48766
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
47217
diff
changeset
|
86 |
DISABLED_WARNINGS_gcc := unused-result implicit-fallthrough, \ |
56237
9ccbd02e0c2c
Push wunreachable on solstudio down to where it belongs.
ihse
parents:
49070
diff
changeset
|
87 |
DISABLED_WARNINGS_solstudio := wunreachable, \ |
25859 | 88 |
MAPFILE := $(UNPACK_MAPFILE),\ |
28846
b96683be2713
8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents:
27799
diff
changeset
|
89 |
LDFLAGS := $(UNPACKEXE_ZIPOBJS) \ |
b96683be2713
8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents:
27799
diff
changeset
|
90 |
$(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ |
25859 | 91 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
33406 | 92 |
LIBS := $(UNPACKEXE_LIBS) $(LIBCXX), \ |
33523 | 93 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe, \ |
47217 | 94 |
MANIFEST := $(TOPDIR)/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest, \ |
33984
2333676816eb
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30434
diff
changeset
|
95 |
MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \ |
29925
6d47adfc6b47
8077847: Better handling of Windows executable manifest version
ihse
parents:
29879
diff
changeset
|
96 |
)) |
25859 | 97 |
|
98 |
ifneq ($(USE_EXTERNAL_LIBZ), true) |
|
99 |
||
100 |
$(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS) |
|
101 |
||
102 |
endif |
|
103 |
||
28846
b96683be2713
8071329: Stop exporting INCLUDE and LIB when building on windows
erikj
parents:
27799
diff
changeset
|
104 |
TARGETS += $(BUILD_UNPACKEXE) |
25859 | 105 |
|
106 |
################################################################################ |