author | ihse |
Tue, 20 Feb 2018 20:41:51 +0100 | |
branch | ihse-cflags-rewrite-branch |
changeset 56161 | a7585ecb9fc2 |
parent 56158 | 97b2b2de66f2 |
child 56168 | cb0b10e44247 |
permissions | -rw-r--r-- |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1 |
# |
48767
0c6ce8fdb50a
8080990: libdt_socket/socket_md.c(202) : warning C4996: 'gethostbyname': Use getaddrinfo() or GetAddrInfoW()
gadams
parents:
48751
diff
changeset
|
2 |
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
4 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
10 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
15 |
# accompanied this code). |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
16 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
20 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
23 |
# questions. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
24 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
25 |
|
42538 | 26 |
################################################################################ |
27 |
# |
|
28 |
||
56150 | 29 |
AC_DEFUN([FLAGS_SETUP_LINKER_FLAGS_FOR_JDK], |
32810
8203e52cd373
8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents:
30856
diff
changeset
|
30 |
[ |
56149 | 31 |
### LINKER |
32 |
### COMMON LINKER FLAGS |
|
33 |
FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_HELPER |
|
34 |
||
35 |
# TARGET CHAIN |
|
36 |
# On some platforms (mac) the linker warns about non existing -L dirs. |
|
37 |
# For any of the variants server, client or minimal, the dir matches the |
|
38 |
# variant name. The "main" variant should be used for linking. For the |
|
39 |
# rest, the dir is just server. |
|
40 |
if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) \ |
|
41 |
|| HOTSPOT_CHECK_JVM_VARIANT(minimal); then |
|
42 |
TARGET_JVM_VARIANT_PATH=$JVM_VARIANT_MAIN |
|
43 |
else |
|
44 |
TARGET_JVM_VARIANT_PATH=server |
|
45 |
fi |
|
46 |
FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_CPU_DEP([TARGET]) |
|
47 |
||
48 |
# BUILD CHAIN |
|
49 |
||
50 |
# When building a buildjdk, it's always only the server variant |
|
51 |
BUILD_JVM_VARIANT_PATH=server |
|
52 |
||
53 |
FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_CPU_DEP([BUILD], [OPENJDK_BUILD_]) |
|
54 |
||
55 |
LDFLAGS_TESTLIB="$LDFLAGS_JDKLIB" |
|
56 |
LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE ${TARGET_LDFLAGS_JDK_LIBPATH}" |
|
57 |
AC_SUBST(LDFLAGS_TESTLIB) |
|
58 |
AC_SUBST(LDFLAGS_TESTEXE) |
|
37402 | 59 |
]) |
60 |
||
61 |
################################################################################ |
|
56149 | 62 |
|
63 |
# CPU independent |
|
64 |
AC_DEFUN([FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_HELPER], |
|
65 |
[ |
|
56144 | 66 |
# BASIC_LDFLAGS (per toolchain) |
67 |
if test "x$TOOLCHAIN_TYPE" = xgcc; then |
|
56161
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
68 |
# "-z relro" supported in GNU binutils 2.17 and later |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
69 |
LINKER_RELRO_FLAG="-Wl,-z,relro" |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
70 |
FLAGS_LINKER_CHECK_ARGUMENTS(ARGUMENT: [$LINKER_RELRO_FLAG], |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
71 |
IF_TRUE: [HAS_LINKER_RELRO=true], |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
72 |
IF_FALSE: [HAS_LINKER_RELRO=false]) |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
73 |
|
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
74 |
# "-z now" supported in GNU binutils 2.11 and later |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
75 |
LINKER_NOW_FLAG="-Wl,-z,now" |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
76 |
FLAGS_LINKER_CHECK_ARGUMENTS(ARGUMENT: [$LINKER_NOW_FLAG], |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
77 |
IF_TRUE: [HAS_LINKER_NOW=true], |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
78 |
IF_FALSE: [HAS_LINKER_NOW=false]) |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
79 |
|
56144 | 80 |
# If this is a --hash-style=gnu system, use --hash-style=both, why? |
81 |
# We have previously set HAS_GNU_HASH if this is the case |
|
82 |
if test -n "$HAS_GNU_HASH"; then |
|
83 |
BASIC_LDFLAGS="-Wl,--hash-style=both" |
|
84 |
LIBJSIG_HASHSTYLE_LDFLAGS="-Wl,--hash-style=both" |
|
85 |
fi |
|
86 |
||
87 |
# And since we now know that the linker is gnu, then add -z defs, to forbid |
|
88 |
# undefined symbols in object files. |
|
89 |
BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,-z,defs" |
|
90 |
||
91 |
BASIC_LDFLAGS_JVM_ONLY="-Wl,-z,noexecstack -Wl,-O1" |
|
92 |
||
93 |
BASIC_LDFLAGS_JDK_LIB_ONLY="-Wl,-z,noexecstack" |
|
94 |
LIBJSIG_NOEXECSTACK_LDFLAGS="-Wl,-z,noexecstack" |
|
95 |
||
96 |
||
97 |
if test "x$HAS_LINKER_RELRO" = "xtrue"; then |
|
98 |
BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY $LINKER_RELRO_FLAG" |
|
99 |
fi |
|
100 |
||
101 |
elif test "x$TOOLCHAIN_TYPE" = xclang; then |
|
102 |
BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 -stdlib=libstdc++ -fPIC" |
|
103 |
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
|
104 |
BASIC_LDFLAGS="-Wl,-z,defs" |
|
105 |
BASIC_LDFLAGS_ONLYCXX="-norunpath" |
|
106 |
BASIC_LDFLAGS_ONLYCXX_JDK_ONLY="-xnolib" |
|
107 |
||
108 |
BASIC_LDFLAGS_JDK_ONLY="-ztext" |
|
109 |
BASIC_LDFLAGS_JVM_ONLY="-library=%none -mt -z noversion" |
|
110 |
elif test "x$TOOLCHAIN_TYPE" = xxlc; then |
|
111 |
BASIC_LDFLAGS="-b64 -brtl -bnolibpath -bexpall -bernotok -btextpsize:64K -bdatapsize:64K -bstackpsize:64K" |
|
56147 | 112 |
BASIC_LDFLAGS_JVM_ONLY="-Wl,-lC_r" |
56144 | 113 |
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
114 |
BASIC_LDFLAGS="-nologo -opt:ref" |
|
115 |
BASIC_LDFLAGS_JDK_ONLY="-incremental:no" |
|
116 |
BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows -base:0x8000000" |
|
117 |
fi |
|
118 |
||
119 |
# OS_LDFLAGS (per toolchain) |
|
120 |
if test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xgcc; then |
|
56149 | 121 |
if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
56144 | 122 |
# Assume clang or gcc. |
123 |
# FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead. |
|
56149 | 124 |
OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.." |
125 |
OS_LDFLAGS_JDK_ONLY="-mmacosx-version-min=\$(MACOSX_VERSION_MIN)" |
|
56144 | 126 |
fi |
127 |
fi |
|
128 |
||
129 |
# DEBUGLEVEL_LDFLAGS (per toolchain) |
|
130 |
if test "x$TOOLCHAIN_TYPE" = xgcc; then |
|
56149 | 131 |
if test "x$OPENJDK_TARGET_OS" = xlinux; then |
56144 | 132 |
if test x$DEBUG_LEVEL = xrelease; then |
56149 | 133 |
DEBUGLEVEL_LDFLAGS_JDK_ONLY="$DEBUGLEVEL_LDFLAGS_JDK_ONLY -Wl,-O1" |
56144 | 134 |
else |
135 |
# mark relocations read only on (fast/slow) debug builds |
|
136 |
if test "x$HAS_LINKER_RELRO" = "xtrue"; then |
|
137 |
DEBUGLEVEL_LDFLAGS_JDK_ONLY="$LINKER_RELRO_FLAG" |
|
138 |
fi |
|
139 |
fi |
|
140 |
if test x$DEBUG_LEVEL = xslowdebug; then |
|
141 |
if test "x$HAS_LINKER_NOW" = "xtrue"; then |
|
142 |
# do relocations at load |
|
143 |
DEBUGLEVEL_LDFLAGS="$LINKER_NOW_FLAG" |
|
144 |
fi |
|
145 |
fi |
|
146 |
fi |
|
147 |
elif test "x$TOOLCHAIN_TYPE" = xxlc; then |
|
148 |
# We need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows. |
|
149 |
# Hotspot now overflows its 64K TOC (currently only for debug), |
|
150 |
# so we build with '-qpic=large -bbigtoc'. |
|
151 |
if test "x$DEBUG_LEVEL" != xrelease; then |
|
56149 | 152 |
DEBUGLEVEL_LDFLAGS_JVM_ONLY="$DEBUGLEVEL_LDFLAGS_JVM_ONLY -bbigtoc" |
56144 | 153 |
fi |
154 |
fi |
|
155 |
||
156 |
# EXECUTABLE_LDFLAGS (per toolchain) |
|
157 |
if test "x$TOOLCHAIN_TYPE" = xgcc; then |
|
56149 | 158 |
EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -Wl,--allow-shlib-undefined" |
56144 | 159 |
fi |
160 |
||
56149 | 161 |
# EXPORT to old api |
162 |
LDFLAGS_CXX_JDK="$BASIC_LDFLAGS_ONLYCXX $BASIC_LDFLAGS_ONLYCXX_JDK_ONLY" |
|
163 |
AC_SUBST(LDFLAGS_CXX_JDK) |
|
164 |
AC_SUBST(LIBJSIG_HASHSTYLE_LDFLAGS) |
|
165 |
AC_SUBST(LIBJSIG_NOEXECSTACK_LDFLAGS) |
|
166 |
]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
167 |
|
56149 | 168 |
################################################################################ |
169 |
# $1 - Either BUILD or TARGET to pick the correct OS/CPU variables to check |
|
170 |
# conditionals against. |
|
171 |
# $2 - Optional prefix for each variable defined. |
|
172 |
AC_DEFUN([FLAGS_SETUP_LINKER_FLAGS_FOR_JDK_CPU_DEP], |
|
173 |
[ |
|
174 |
# CPU_LDFLAGS (per toolchain) |
|
175 |
# These can differ between TARGET and BUILD. |
|
176 |
if test "x$TOOLCHAIN_TYPE" = xgcc; then |
|
56161
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
177 |
if test "x${OPENJDK_$1_CPU}" = xx86; then |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
178 |
$1_CPU_LDFLAGS_JVM_ONLY="-march=i586" |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
179 |
elif test "x$OPENJDK_$1_CPU" = xarm; then |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
180 |
$1_CPU_LDFLAGS_JVM_ONLY="${$1_CPU_LDFLAGS_JVM_ONLY} -fsigned-char" |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
181 |
$1_CPU_LDFLAGS="$ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS" |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
182 |
elif test "x$FLAGS_CPU" = xaarch64; then |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
183 |
if test "x$HOTSPOT_TARGET_CPU_PORT" = xarm64; then |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
184 |
$1_CPU_LDFLAGS_JVM_ONLY="${$1_CPU_LDFLAGS_JVM_ONLY} -fsigned-char" |
56149 | 185 |
fi |
56161
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
186 |
fi |
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
187 |
|
56149 | 188 |
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
189 |
if test "x${OPENJDK_$1_CPU}" = "xsparcv9"; then |
|
190 |
$1_CPU_LDFLAGS_JVM_ONLY="-xarch=sparc" |
|
191 |
fi |
|
56161
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
192 |
|
56149 | 193 |
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
194 |
if test "x${OPENJDK_$1_CPU}" = "xx86"; then |
|
195 |
$1_CPU_LDFLAGS="-safeseh" |
|
196 |
# NOTE: Old build added -machine. Probably not needed. |
|
197 |
$1_CPU_LDFLAGS_JVM_ONLY="-machine:I386" |
|
56161
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
198 |
$1_CPU_EXECUTABLE_LDFLAGS="-stack:327680" |
56149 | 199 |
else |
200 |
$1_CPU_LDFLAGS_JVM_ONLY="-machine:AMD64" |
|
56161
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
56158
diff
changeset
|
201 |
$1_CPU_EXECUTABLE_LDFLAGS="-stack:1048576" |
56149 | 202 |
fi |
56148 | 203 |
fi |
204 |
||
56149 | 205 |
# JVM_VARIANT_PATH depends on if this is build or target... |
206 |
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
|
207 |
$1_LDFLAGS_JDK_LIBPATH="-libpath:${OUTPUTDIR}/support/modules_libs/java.base" |
|
208 |
else |
|
209 |
$1_LDFLAGS_JDK_LIBPATH="-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \ |
|
210 |
-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/${$1_JVM_VARIANT_PATH}" |
|
211 |
fi |
|
56148 | 212 |
|
56149 | 213 |
# Export to old API, prefix with $2 if present |
56153 | 214 |
LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY $OS_LDFLAGS_JDK_ONLY $DEBUGLEVEL_LDFLAGS_JDK_ONLY $EXTRA_LDFLAGS" |
56158
97b2b2de66f2
Fixing PIC-flag issues, and all remaining differences on linux_x64.
ihse
parents:
56153
diff
changeset
|
215 |
$2LDFLAGS_JDKLIB="$LDFLAGS_JDK_COMMON $BASIC_LDFLAGS_JDK_LIB_ONLY ${$1_LDFLAGS_JDK_LIBPATH} $SHARED_LIBRARY_FLAGS" |
56149 | 216 |
$2LDFLAGS_JDKEXE="$LDFLAGS_JDK_COMMON $EXECUTABLE_LDFLAGS ${$1_CPU_EXECUTABLE_LDFLAGS}" |
217 |
||
218 |
$2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS_JVM_ONLY \ |
|
219 |
$DEBUGLEVEL_LDFLAGS $DEBUGLEVEL_LDFLAGS_JVM_ONLY $BASIC_LDFLAGS_ONLYCXX \ |
|
56153 | 220 |
${$1_CPU_LDFLAGS} ${$1_CPU_LDFLAGS_JVM_ONLY} $EXTRA_LDFLAGS" |
37402 | 221 |
|
222 |
AC_SUBST($2LDFLAGS_JDKLIB) |
|
223 |
AC_SUBST($2LDFLAGS_JDKEXE) |
|
29305
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29304
diff
changeset
|
224 |
|
37402 | 225 |
AC_SUBST($2JVM_LDFLAGS) |
56149 | 226 |
]) |