148 AC_SUBST(LDFLAGS_CXX_JDK)
149 ])
150
151 ################################################################################
152 # $1 - Either BUILD or TARGET to pick the correct OS/CPU variables to check
153 # conditionals against.
154 # $2 - Optional prefix for each variable defined.
155 AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
156 [
157 # Setup CPU-dependent basic LDFLAGS. These can differ between the target and
158 # build toolchain.
159 if test "x$TOOLCHAIN_TYPE" = xgcc; then
160 if test "x${OPENJDK_$1_CPU}" = xx86; then
161 $1_CPU_LDFLAGS_JVM_ONLY="-march=i586"
162 elif test "x$OPENJDK_$1_CPU" = xarm; then
163 $1_CPU_LDFLAGS_JVM_ONLY="${$1_CPU_LDFLAGS_JVM_ONLY} -fsigned-char"
164 $1_CPU_LDFLAGS="$ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS"
165 fi
166
167 elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
168 if test "x${OPENJDK_$1_CPU}" = "xx86"; then
169 $1_CPU_LDFLAGS="-safeseh"
170 # NOTE: Old build added -machine. Probably not needed.
171 $1_CPU_LDFLAGS_JVM_ONLY="-machine:I386"
172 $1_CPU_EXECUTABLE_LDFLAGS="-stack:327680"
173 else
174 $1_CPU_LDFLAGS_JVM_ONLY="-machine:AMD64"
175 $1_CPU_EXECUTABLE_LDFLAGS="-stack:1048576"
176 fi
177 fi
178
179 # JVM_VARIANT_PATH depends on if this is build or target...
180 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
181 $1_LDFLAGS_JDK_LIBPATH="-libpath:${OUTPUTDIR}/support/modules_libs/java.base"
182 else
183 $1_LDFLAGS_JDK_LIBPATH="-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
184 -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/${$1_JVM_VARIANT_PATH}"
185 fi
186
187 # Export variables according to old definitions, prefix with $2 if present.
188 LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY \
189 $OS_LDFLAGS_JDK_ONLY $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}"
190 $2LDFLAGS_JDKLIB="$LDFLAGS_JDK_COMMON $BASIC_LDFLAGS_JDK_LIB_ONLY \
191 ${$1_LDFLAGS_JDK_LIBPATH} $SHARED_LIBRARY_FLAGS"
192 $2LDFLAGS_JDKEXE="$LDFLAGS_JDK_COMMON $EXECUTABLE_LDFLAGS \
193 ${$1_CPU_EXECUTABLE_LDFLAGS}"
194
195 $2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS_JVM_ONLY \
|
148 AC_SUBST(LDFLAGS_CXX_JDK)
149 ])
150
151 ################################################################################
152 # $1 - Either BUILD or TARGET to pick the correct OS/CPU variables to check
153 # conditionals against.
154 # $2 - Optional prefix for each variable defined.
155 AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
156 [
157 # Setup CPU-dependent basic LDFLAGS. These can differ between the target and
158 # build toolchain.
159 if test "x$TOOLCHAIN_TYPE" = xgcc; then
160 if test "x${OPENJDK_$1_CPU}" = xx86; then
161 $1_CPU_LDFLAGS_JVM_ONLY="-march=i586"
162 elif test "x$OPENJDK_$1_CPU" = xarm; then
163 $1_CPU_LDFLAGS_JVM_ONLY="${$1_CPU_LDFLAGS_JVM_ONLY} -fsigned-char"
164 $1_CPU_LDFLAGS="$ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS"
165 fi
166
167 elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
168 if test "x${OPENJDK_$1_CPU_BITS}" = "x32"; then
169 $1_CPU_EXECUTABLE_LDFLAGS="-stack:327680"
170 elif test "x${OPENJDK_$1_CPU_BITS}" = "x64"; then
171 $1_CPU_EXECUTABLE_LDFLAGS="-stack:1048576"
172 fi
173 if test "x${OPENJDK_$1_CPU}" = "xx86"; then
174 $1_CPU_LDFLAGS="-safeseh"
175 fi
176 fi
177
178 # JVM_VARIANT_PATH depends on if this is build or target...
179 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
180 $1_LDFLAGS_JDK_LIBPATH="-libpath:${OUTPUTDIR}/support/modules_libs/java.base"
181 else
182 $1_LDFLAGS_JDK_LIBPATH="-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
183 -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/${$1_JVM_VARIANT_PATH}"
184 fi
185
186 # Export variables according to old definitions, prefix with $2 if present.
187 LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY \
188 $OS_LDFLAGS_JDK_ONLY $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}"
189 $2LDFLAGS_JDKLIB="$LDFLAGS_JDK_COMMON $BASIC_LDFLAGS_JDK_LIB_ONLY \
190 ${$1_LDFLAGS_JDK_LIBPATH} $SHARED_LIBRARY_FLAGS"
191 $2LDFLAGS_JDKEXE="$LDFLAGS_JDK_COMMON $EXECUTABLE_LDFLAGS \
192 ${$1_CPU_EXECUTABLE_LDFLAGS}"
193
194 $2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS_JVM_ONLY \
|