1.1 --- a/common/autoconf/toolchain.m4 Wed Mar 21 09:19:00 2018 -0700
1.2 +++ b/common/autoconf/toolchain.m4 Thu Apr 05 07:59:52 2018 -0700
1.3 @@ -23,8 +23,37 @@
1.4 # questions.
1.5 #
1.6
1.7 +########################################################################
1.8 +# This file is responsible for detecting, verifying and setting up the
1.9 +# toolchain, i.e. the compiler, linker and related utilities. It will setup
1.10 +# proper paths to the binaries, but it will not setup any flags.
1.11 +#
1.12 +# The binaries used is determined by the toolchain type, which is the family of
1.13 +# compilers and related tools that are used.
1.14 +########################################################################
1.15 +
1.16 +
1.17 +# All valid toolchains, regardless of platform (used by help.m4)
1.18 +VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft"
1.19 +
1.20 +# These toolchains are valid on different platforms
1.21 +VALID_TOOLCHAINS_linux="gcc clang"
1.22 +VALID_TOOLCHAINS_solaris="solstudio"
1.23 +VALID_TOOLCHAINS_macosx="gcc clang"
1.24 +VALID_TOOLCHAINS_aix="xlc"
1.25 +VALID_TOOLCHAINS_windows="microsoft"
1.26 +
1.27 +# Toolchain descriptions
1.28 +TOOLCHAIN_DESCRIPTION_clang="clang/LLVM"
1.29 +TOOLCHAIN_DESCRIPTION_gcc="GNU Compiler Collection"
1.30 +TOOLCHAIN_DESCRIPTION_microsoft="Microsoft Visual Studio"
1.31 +TOOLCHAIN_DESCRIPTION_solstudio="Oracle Solaris Studio"
1.32 +TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
1.33 +
1.34 # Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be called.
1.35 # Must have CC_VERSION_NUMBER and CXX_VERSION_NUMBER.
1.36 +# $1 - optional variable prefix for compiler and version variables (BUILD_)
1.37 +# $2 - optional variable prefix for comparable variable (OPENJDK_BUILD_)
1.38 AC_DEFUN([TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS],
1.39 [
1.40 if test "x$CC_VERSION" != "x$CXX_VERSION"; then
1.41 @@ -41,7 +70,7 @@
1.42 AC_MSG_WARN([C compiler version number has a part larger than 99999: $CC_VERSION. Comparisons might be wrong.])
1.43 fi
1.44
1.45 - COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", [$]1, [$]2, [$]3) }' <<< "$CC_VERSION"`
1.46 + $2COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", [$]1, [$]2, [$]3) }' <<< "$CC_VERSION"`
1.47 ])
1.48
1.49 # Check if the configured compiler (C and C++) is of a specific version or
1.50 @@ -73,226 +102,115 @@
1.51 fi
1.52 ])
1.53
1.54 -# $1 = compiler to test (CC or CXX)
1.55 -# $2 = human readable name of compiler (C or C++)
1.56 -AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
1.57 +
1.58 +# Setup a number of variables describing how native output files are
1.59 +# named on this platform/toolchain.
1.60 +AC_DEFUN([TOOLCHAIN_SETUP_FILENAME_PATTERNS],
1.61 [
1.62 - COMPILER=[$]$1
1.63 - COMPILER_NAME=$2
1.64 + # Define filename patterns
1.65 + if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.66 + LIBRARY_PREFIX=
1.67 + SHARED_LIBRARY_SUFFIX='.dll'
1.68 + STATIC_LIBRARY_SUFFIX='.lib'
1.69 + SHARED_LIBRARY='[$]1.dll'
1.70 + STATIC_LIBRARY='[$]1.lib'
1.71 + OBJ_SUFFIX='.obj'
1.72 + EXE_SUFFIX='.exe'
1.73 + else
1.74 + LIBRARY_PREFIX=lib
1.75 + SHARED_LIBRARY_SUFFIX='.so'
1.76 + STATIC_LIBRARY_SUFFIX='.a'
1.77 + SHARED_LIBRARY='lib[$]1.so'
1.78 + STATIC_LIBRARY='lib[$]1.a'
1.79 + OBJ_SUFFIX='.o'
1.80 + EXE_SUFFIX=''
1.81 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.82 + SHARED_LIBRARY='lib[$]1.dylib'
1.83 + SHARED_LIBRARY_SUFFIX='.dylib'
1.84 + fi
1.85 + fi
1.86
1.87 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.88 - # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
1.89 - COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
1.90 - $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
1.91 - if test $? -ne 0; then
1.92 - GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
1.93 -
1.94 - AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler.])
1.95 - AC_MSG_NOTICE([The result from running with -V was: "$COMPILER_VERSION_TEST" and with --version: "$GCC_VERSION_TEST"])
1.96 - AC_MSG_ERROR([Sun Studio compiler is required. Try setting --with-tools-dir.])
1.97 - else
1.98 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*@<:@ ,\t@:>@$COMPILER_NAME@<:@ ,\t@:>@\(@<:@1-9@:>@\.@<:@0-9@:>@@<:@0-9@:>@*\).*/\1/p"`
1.99 - COMPILER_VENDOR="Sun Studio"
1.100 - fi
1.101 - elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.102 - COMPILER_VERSION_TEST=`$COMPILER -qversion 2>&1 | $TAIL -n 1`
1.103 - $ECHO $COMPILER_VERSION_TEST | $GREP "^Version: " > /dev/null
1.104 - if test $? -ne 0; then
1.105 - AC_MSG_ERROR([Failed to detect the compiler version of $COMPILER ....])
1.106 - else
1.107 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \([0-9][0-9]\.[0-9][0-9]*\).*/\1/p'`
1.108 - COMPILER_VENDOR='IBM'
1.109 - fi
1.110 - elif test "x$OPENJDK_TARGET_OS" = xwindows; then
1.111 - # First line typically looks something like:
1.112 - # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
1.113 - COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.114 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \(@<:@1-9@:>@@<:@0-9.@:>@*\) .*/\1/p"`
1.115 - COMPILER_VENDOR="Microsoft CL.EXE"
1.116 - COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
1.117 - if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
1.118 - if test "x$COMPILER_CPU_TEST" != "x80x86"; then
1.119 - AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86".])
1.120 - fi
1.121 - elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
1.122 - if test "x$COMPILER_CPU_TEST" != "xx64"; then
1.123 - AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "x64".])
1.124 - fi
1.125 - fi
1.126 - else
1.127 - COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
1.128 - # Check that this is likely to be GCC.
1.129 - $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
1.130 - if test $? -ne 0; then
1.131 - AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler.])
1.132 - AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_TEST"])
1.133 - AC_MSG_ERROR([GCC compiler is required. Try setting --with-tools-dir.])
1.134 - fi
1.135 -
1.136 - # First line typically looks something like:
1.137 - # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
1.138 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \
1.139 - $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'`
1.140 - COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) @<:@1-9@:>@@<:@0-9.@:>@*/\1/p"`
1.141 - fi
1.142 - # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)
1.143 - $1_VERSION="$COMPILER_VERSION"
1.144 - # This sets CC_VENDOR or CXX_VENDOR. (This comment is a grep marker)
1.145 - $1_VENDOR="$COMPILER_VENDOR"
1.146 -
1.147 - AC_MSG_NOTICE([Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)])
1.148 + AC_SUBST(LIBRARY_PREFIX)
1.149 + AC_SUBST(SHARED_LIBRARY_SUFFIX)
1.150 + AC_SUBST(STATIC_LIBRARY_SUFFIX)
1.151 + AC_SUBST(SHARED_LIBRARY)
1.152 + AC_SUBST(STATIC_LIBRARY)
1.153 + AC_SUBST(OBJ_SUFFIX)
1.154 + AC_SUBST(EXE_SUFFIX)
1.155 ])
1.156
1.157 +# Determine which toolchain type to use, and make sure it is valid for this
1.158 +# platform. Setup various information about the selected toolchain.
1.159 +AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
1.160 +[
1.161 + AC_ARG_WITH(toolchain-type, [AS_HELP_STRING([--with-toolchain-type],
1.162 + [the toolchain type (or family) to use, use '--help' to show possible values @<:@platform dependent@:>@])])
1.163
1.164 -AC_DEFUN_ONCE([TOOLCHAIN_SETUP_SYSROOT_AND_OUT_OPTIONS],
1.165 -[
1.166 - ###############################################################################
1.167 - #
1.168 - # Configure the development tool paths and potential sysroot.
1.169 - #
1.170 - AC_LANG(C++)
1.171 + # Use indirect variable referencing
1.172 + toolchain_var_name=VALID_TOOLCHAINS_$OPENJDK_BUILD_OS
1.173 + VALID_TOOLCHAINS=${!toolchain_var_name}
1.174 + # First toolchain type in the list is the default
1.175 + DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
1.176
1.177 - # The option used to specify the target .o,.a or .so file.
1.178 - # When compiling, how to specify the to be created object file.
1.179 - CC_OUT_OPTION='-o$(SPACE)'
1.180 - # When linking, how to specify the to be created executable.
1.181 - EXE_OUT_OPTION='-o$(SPACE)'
1.182 - # When linking, how to specify the to be created dynamically linkable library.
1.183 - LD_OUT_OPTION='-o$(SPACE)'
1.184 - # When archiving, how to specify the to be create static archive for object files.
1.185 - AR_OUT_OPTION='rcs$(SPACE)'
1.186 - AC_SUBST(CC_OUT_OPTION)
1.187 - AC_SUBST(EXE_OUT_OPTION)
1.188 - AC_SUBST(LD_OUT_OPTION)
1.189 - AC_SUBST(AR_OUT_OPTION)
1.190 + if test "x$with_toolchain_type" = xlist; then
1.191 + # List all toolchains
1.192 + AC_MSG_NOTICE([The following toolchains are valid on this platform:])
1.193 + for toolchain in $VALID_TOOLCHAINS; do
1.194 + toolchain_var_name=TOOLCHAIN_DESCRIPTION_$toolchain
1.195 + TOOLCHAIN_DESCRIPTION=${!toolchain_var_name}
1.196 + $PRINTF " %-10s %s\n" $toolchain "$TOOLCHAIN_DESCRIPTION"
1.197 + done
1.198 +
1.199 + exit 0
1.200 + elif test "x$with_toolchain_type" != x; then
1.201 + # User override; check that it is valid
1.202 + if test "x${VALID_TOOLCHAINS/$with_toolchain_type/}" = "x${VALID_TOOLCHAINS}"; then
1.203 + AC_MSG_NOTICE([Toolchain type $with_toolchain_type is not valid on this platform.])
1.204 + AC_MSG_NOTICE([Valid toolchains: $VALID_TOOLCHAINS.])
1.205 + AC_MSG_ERROR([Cannot continue.])
1.206 + fi
1.207 + TOOLCHAIN_TYPE=$with_toolchain_type
1.208 + else
1.209 + # No flag given, use default
1.210 + TOOLCHAIN_TYPE=$DEFAULT_TOOLCHAIN
1.211 + fi
1.212 + AC_SUBST(TOOLCHAIN_TYPE)
1.213 +
1.214 + TOOLCHAIN_CC_BINARY_clang="clang"
1.215 + TOOLCHAIN_CC_BINARY_gcc="gcc"
1.216 + TOOLCHAIN_CC_BINARY_microsoft="cl"
1.217 + TOOLCHAIN_CC_BINARY_solstudio="cc"
1.218 + TOOLCHAIN_CC_BINARY_xlc="xlc_r"
1.219 +
1.220 + TOOLCHAIN_CXX_BINARY_clang="clang++"
1.221 + TOOLCHAIN_CXX_BINARY_gcc="g++"
1.222 + TOOLCHAIN_CXX_BINARY_microsoft="cl"
1.223 + TOOLCHAIN_CXX_BINARY_solstudio="CC"
1.224 + TOOLCHAIN_CXX_BINARY_xlc="xlC_r"
1.225 +
1.226 + # Use indirect variable referencing
1.227 + toolchain_var_name=TOOLCHAIN_DESCRIPTION_$TOOLCHAIN_TYPE
1.228 + TOOLCHAIN_DESCRIPTION=${!toolchain_var_name}
1.229 + toolchain_var_name=TOOLCHAIN_CC_BINARY_$TOOLCHAIN_TYPE
1.230 + TOOLCHAIN_CC_BINARY=${!toolchain_var_name}
1.231 + toolchain_var_name=TOOLCHAIN_CXX_BINARY_$TOOLCHAIN_TYPE
1.232 + TOOLCHAIN_CXX_BINARY=${!toolchain_var_name}
1.233 +
1.234 + TOOLCHAIN_SETUP_FILENAME_PATTERNS
1.235 +
1.236 + if test "x$TOOLCHAIN_TYPE" = "x$DEFAULT_TOOLCHAIN"; then
1.237 + AC_MSG_NOTICE([Using default toolchain $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION)])
1.238 + else
1.239 + AC_MSG_NOTICE([Using user selected toolchain $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION). Default toolchain is $DEFAULT_TOOLCHAIN.])
1.240 + fi
1.241 ])
1.242
1.243 -# $1 = compiler to test (CC or CXX)
1.244 -# $2 = human readable name of compiler (C or C++)
1.245 -# $3 = list of compiler names to search for
1.246 -AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
1.247 +# Before we start detecting the toolchain executables, we might need some
1.248 +# special setup, e.g. additional paths etc.
1.249 +AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
1.250 [
1.251 - COMPILER_NAME=$2
1.252 -
1.253 - $1=
1.254 - # If TOOLS_DIR is set, check for all compiler names in there first
1.255 - # before checking the rest of the PATH.
1.256 - if test -n "$TOOLS_DIR"; then
1.257 - PATH_save="$PATH"
1.258 - PATH="$TOOLS_DIR"
1.259 - AC_PATH_PROGS(TOOLS_DIR_$1, $3)
1.260 - $1=$TOOLS_DIR_$1
1.261 - PATH="$PATH_save"
1.262 - fi
1.263 -
1.264 - # AC_PATH_PROGS can't be run multiple times with the same variable,
1.265 - # so create a new name for this run.
1.266 - if test "x[$]$1" = x; then
1.267 - AC_PATH_PROGS(POTENTIAL_$1, $3)
1.268 - $1=$POTENTIAL_$1
1.269 - fi
1.270 -
1.271 - if test "x[$]$1" = x; then
1.272 - HELP_MSG_MISSING_DEPENDENCY([devkit])
1.273 - AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG])
1.274 - fi
1.275 - BASIC_FIXUP_EXECUTABLE($1)
1.276 - TEST_COMPILER="[$]$1"
1.277 - # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
1.278 - # to 'xlc' but it is crucial that we invoke the compiler with the right name!
1.279 - if test "x$OPENJDK_BUILD_OS" != xaix; then
1.280 - AC_MSG_CHECKING([resolved symbolic links for $1])
1.281 - BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
1.282 - AC_MSG_RESULT([$TEST_COMPILER])
1.283 - fi
1.284 - AC_MSG_CHECKING([if $1 is disguised ccache])
1.285 -
1.286 - COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
1.287 - if test "x$COMPILER_BASENAME" = "xccache"; then
1.288 - AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
1.289 - # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
1.290 - # We want to control ccache invocation ourselves, so ignore this cc and try
1.291 - # searching again.
1.292 -
1.293 - # Remove the path to the fake ccache cc from the PATH
1.294 - RETRY_COMPILER_SAVED_PATH="$PATH"
1.295 - COMPILER_DIRNAME=`$DIRNAME [$]$1`
1.296 - PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
1.297 -
1.298 - # Try again looking for our compiler
1.299 - AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3)
1.300 - BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1)
1.301 - PATH="$RETRY_COMPILER_SAVED_PATH"
1.302 -
1.303 - AC_MSG_CHECKING([for resolved symbolic links for $1])
1.304 - BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1)
1.305 - AC_MSG_RESULT([$PROPER_COMPILER_$1])
1.306 - $1="$PROPER_COMPILER_$1"
1.307 - else
1.308 - AC_MSG_RESULT([no, keeping $1])
1.309 - $1="$TEST_COMPILER"
1.310 - fi
1.311 - TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
1.312 -])
1.313 -
1.314 -
1.315 -AC_DEFUN([TOOLCHAIN_SETUP_PATHS],
1.316 -[
1.317 - if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.318 - TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
1.319 - TOOLCHAIN_SETUP_MSVCR_DLL
1.320 - BASIC_DEPRECATED_ARG_WITH([dxsdk])
1.321 - BASIC_DEPRECATED_ARG_WITH([dxsdk-lib])
1.322 - BASIC_DEPRECATED_ARG_WITH([dxsdk-include])
1.323 - fi
1.324 -
1.325 - AC_SUBST(MSVCR_DLL)
1.326 -
1.327 - # If --build AND --host is set, then the configure script will find any
1.328 - # cross compilation tools in the PATH. Cross compilation tools
1.329 - # follows the cross compilation standard where they are prefixed with ${host}.
1.330 - # For example the binary i686-sun-solaris2.10-gcc
1.331 - # will cross compile for i686-sun-solaris2.10
1.332 - # If neither of build and host is not set, then build=host and the
1.333 - # default compiler found in the path will be used.
1.334 - # Setting only --host, does not seem to be really supported.
1.335 - # Please set both --build and --host if you want to cross compile.
1.336 -
1.337 - if test "x$COMPILE_TYPE" = "xcross"; then
1.338 - # Now we to find a C/C++ compiler that can build executables for the build
1.339 - # platform. We can't use the AC_PROG_CC macro, since it can only be used
1.340 - # once. Also, we need to do this before adding a tools dir to the path,
1.341 - # otherwise we might pick up cross-compilers which don't use standard naming.
1.342 - # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have
1.343 - # to wait until they are properly discovered.
1.344 - BASIC_PATH_PROGS(BUILD_CC, [cl cc gcc])
1.345 - BASIC_FIXUP_EXECUTABLE(BUILD_CC)
1.346 - BASIC_PATH_PROGS(BUILD_CXX, [cl CC g++])
1.347 - BASIC_FIXUP_EXECUTABLE(BUILD_CXX)
1.348 - BASIC_PATH_PROGS(BUILD_LD, ld)
1.349 - BASIC_FIXUP_EXECUTABLE(BUILD_LD)
1.350 - fi
1.351 - AC_SUBST(BUILD_CC)
1.352 - AC_SUBST(BUILD_CXX)
1.353 - AC_SUBST(BUILD_LD)
1.354 -
1.355 - # If a devkit is found on the builddeps server, then prepend its path to the
1.356 - # PATH variable. If there are cross compilers available in the devkit, these
1.357 - # will be found by AC_PROG_CC et al.
1.358 - DEVKIT=
1.359 - BDEPS_CHECK_MODULE(DEVKIT, devkit, xxx,
1.360 - [
1.361 - # Found devkit
1.362 - PATH="$DEVKIT/bin:$PATH"
1.363 - SYS_ROOT="$DEVKIT/${rewritten_target}/sys-root"
1.364 - if test "x$x_includes" = "xNONE"; then
1.365 - x_includes="$SYS_ROOT/usr/include/X11"
1.366 - fi
1.367 - if test "x$x_libraries" = "xNONE"; then
1.368 - x_libraries="$SYS_ROOT/usr/lib"
1.369 - fi
1.370 - ],
1.371 - [])
1.372 + # FIXME: Is this needed?
1.373 + AC_LANG(C++)
1.374
1.375 # Store the CFLAGS etal passed to the configure script.
1.376 ORG_CFLAGS="$CFLAGS"
1.377 @@ -301,9 +219,6 @@
1.378
1.379 # autoconf magic only relies on PATH, so update it if tools dir is specified
1.380 OLD_PATH="$PATH"
1.381 - if test "x$TOOLS_DIR" != x; then
1.382 - PATH=$TOOLS_DIR:$PATH
1.383 - fi
1.384
1.385 # Before we locate the compilers, we need to sanitize the Xcode build environment
1.386 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.387 @@ -386,235 +301,404 @@
1.388 LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
1.389 fi
1.390
1.391 - ### Locate C compiler (CC)
1.392 -
1.393 - # On windows, only cl.exe is supported.
1.394 - # On Solaris, cc is preferred to gcc.
1.395 - # Elsewhere, gcc is preferred to cc.
1.396 -
1.397 - if test "x$CC" != x; then
1.398 - COMPILER_CHECK_LIST="$CC"
1.399 - elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.400 - COMPILER_CHECK_LIST="cl"
1.401 - elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.402 - COMPILER_CHECK_LIST="cc gcc"
1.403 - elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
1.404 - # Do not probe for cc on AIX.
1.405 - COMPILER_CHECK_LIST="xlc_r"
1.406 - else
1.407 - COMPILER_CHECK_LIST="gcc cc"
1.408 + # For solaris we really need solaris tools, and not the GNU equivalent.
1.409 + # The build tools on Solaris reside in /usr/ccs (C Compilation System),
1.410 + # so add that to path before starting to probe.
1.411 + # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP.
1.412 + if test "x$OPENJDK_BUILD_OS" = xsolaris; then
1.413 + PATH="/usr/ccs/bin:$PATH"
1.414 fi
1.415
1.416 - TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST])
1.417 - # Now that we have resolved CC ourself, let autoconf have its go at it
1.418 - AC_PROG_CC([$CC])
1.419 -
1.420 - # Option used to tell the compiler whether to create 32- or 64-bit executables
1.421 - # Notice that CC contains the full compiler path at this point.
1.422 - case $CC in
1.423 - *xlc_r) COMPILER_TARGET_BITS_FLAG="-q";;
1.424 - *) COMPILER_TARGET_BITS_FLAG="-m";;
1.425 - esac
1.426 - AC_SUBST(COMPILER_TARGET_BITS_FLAG)
1.427 -
1.428 - ### Locate C++ compiler (CXX)
1.429 -
1.430 - if test "x$CXX" != x; then
1.431 - COMPILER_CHECK_LIST="$CXX"
1.432 - elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.433 - COMPILER_CHECK_LIST="cl"
1.434 - elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.435 - COMPILER_CHECK_LIST="CC g++"
1.436 - elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
1.437 - # Do not probe for CC on AIX .
1.438 - COMPILER_CHECK_LIST="xlC_r"
1.439 - else
1.440 - COMPILER_CHECK_LIST="g++ CC"
1.441 + # On Windows, we need to detect the visual studio installation first.
1.442 + if test "x$OPENJDK_BUILD_OS" = "xwindows" && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
1.443 + TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
1.444 fi
1.445
1.446 - TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST])
1.447 - # Now that we have resolved CXX ourself, let autoconf have its go at it
1.448 - AC_PROG_CXX([$CXX])
1.449 + # Finally add TOOLS_DIR at the beginning, to allow --with-tools-dir to
1.450 + # override all other locations.
1.451 + if test "x$TOOLS_DIR" != x; then
1.452 + PATH=$TOOLS_DIR:$PATH
1.453 + fi
1.454
1.455 - # This is the compiler version number on the form X.Y[.Z]
1.456 - AC_SUBST(CC_VERSION)
1.457 - AC_SUBST(CXX_VERSION)
1.458 + # If a devkit is found on the builddeps server, then prepend its path to the
1.459 + # PATH variable. If there are cross compilers available in the devkit, these
1.460 + # will be found by AC_PROG_CC et al.
1.461 + DEVKIT=
1.462 + BDEPS_CHECK_MODULE(DEVKIT, devkit, xxx,
1.463 + [
1.464 + # Found devkit
1.465 + PATH="$DEVKIT/bin:$PATH"
1.466 + SYS_ROOT="$DEVKIT/${rewritten_target}/sys-root"
1.467 + if test "x$x_includes" = "xNONE"; then
1.468 + x_includes="$SYS_ROOT/usr/include/X11"
1.469 + fi
1.470 + if test "x$x_libraries" = "xNONE"; then
1.471 + x_libraries="$SYS_ROOT/usr/lib"
1.472 + fi
1.473 + ],
1.474 + [])
1.475 +])
1.476
1.477 - TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS
1.478 -
1.479 - ### Locate other tools
1.480 -
1.481 - if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.482 - AC_PROG_OBJC
1.483 - BASIC_FIXUP_EXECUTABLE(OBJC)
1.484 - else
1.485 - OBJC=
1.486 - fi
1.487 +# Restore path, etc
1.488 +AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
1.489 +[
1.490 + # Restore old path.
1.491 + PATH="$OLD_PATH"
1.492
1.493 # Restore the flags to the user specified values.
1.494 # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
1.495 CFLAGS="$ORG_CFLAGS"
1.496 CXXFLAGS="$ORG_CXXFLAGS"
1.497 OBJCFLAGS="$ORG_OBJCFLAGS"
1.498 +])
1.499
1.500 - LD="$CC"
1.501 - LDEXE="$CC"
1.502 - LDCXX="$CXX"
1.503 - LDEXECXX="$CXX"
1.504 - AC_SUBST(LD)
1.505 - # LDEXE is the linker to use, when creating executables.
1.506 - AC_SUBST(LDEXE)
1.507 - # Linking C++ libraries.
1.508 - AC_SUBST(LDCXX)
1.509 - # Linking C++ executables.
1.510 - AC_SUBST(LDEXECXX)
1.511 +# Check if a compiler is of the toolchain type we expect, and save the version
1.512 +# information from it. If the compiler does not match the expected type,
1.513 +# this function will abort using AC_MSG_ERROR. If it matches, the version will
1.514 +# be stored in CC_VERSION_NUMBER/CXX_VERSION_NUMBER (as a dotted number), and
1.515 +# the full version string in CC_VERSION_STRING/CXX_VERSION_STRING.
1.516 +#
1.517 +# $1 = compiler to test (CC or CXX)
1.518 +# $2 = human readable name of compiler (C or C++)
1.519 +AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
1.520 +[
1.521 + COMPILER=[$]$1
1.522 + COMPILER_NAME=$2
1.523
1.524 - if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.525 - BASIC_CHECK_TOOLS(AR, ar)
1.526 - BASIC_FIXUP_EXECUTABLE(AR)
1.527 + if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.528 + # cc -V output typically looks like
1.529 + # cc: Sun C 5.12 Linux_i386 2011/11/16
1.530 + COMPILER_VERSION_OUTPUT=`$COMPILER -V 2>&1`
1.531 + # Check that this is likely to be the Solaris Studio cc.
1.532 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
1.533 + if test $? -ne 0; then
1.534 + ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.535 + AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
1.536 + AC_MSG_NOTICE([The result from running with -V was: "$COMPILER_VERSION_OUTPUT"])
1.537 + AC_MSG_NOTICE([The result from running with --version was: "$ALT_VERSION_OUTPUT"])
1.538 + AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.])
1.539 + fi
1.540 + # Remove usage instructions (if present), and
1.541 + # collapse compiler output into a single line
1.542 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.543 + $SED -e 's/ *@<:@Uu@:>@sage:.*//'`
1.544 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.545 + $SED -e "s/^.*@<:@ ,\t@:>@$COMPILER_NAME@<:@ ,\t@:>@\(@<:@1-9@:>@\.@<:@0-9@:>@@<:@0-9@:>@*\).*/\1/"`
1.546 + elif test "x$TOOLCHAIN_TYPE" = xxlc; then
1.547 + # xlc -qversion output typically looks like
1.548 + # IBM XL C/C++ for AIX, V11.1 (5724-X13)
1.549 + # Version: 11.01.0000.0015
1.550 + COMPILER_VERSION_OUTPUT=`$COMPILER -qversion 2>&1`
1.551 + # Check that this is likely to be the IBM XL C compiler.
1.552 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "IBM XL C" > /dev/null
1.553 + if test $? -ne 0; then
1.554 + ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.555 + AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
1.556 + AC_MSG_NOTICE([The result from running with -qversion was: "$COMPILER_VERSION_OUTPUT"])
1.557 + AC_MSG_NOTICE([The result from running with --version was: "$ALT_VERSION_OUTPUT"])
1.558 + AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.])
1.559 + fi
1.560 + # Collapse compiler output into a single line
1.561 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
1.562 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.563 + $SED -e 's/^.*, V\(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'`
1.564 + elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.565 + # There is no specific version flag, but all output starts with a version string.
1.566 + # First line typically looks something like:
1.567 + # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
1.568 + COMPILER_VERSION_OUTPUT=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.569 + # Check that this is likely to be Microsoft CL.EXE.
1.570 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Microsoft.*Compiler" > /dev/null
1.571 + if test $? -ne 0; then
1.572 + AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
1.573 + AC_MSG_NOTICE([The result from running it was: "$COMPILER_VERSION_OUTPUT"])
1.574 + AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.])
1.575 + fi
1.576 + # Collapse compiler output into a single line
1.577 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
1.578 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.579 + $SED -e 's/^.*ersion.\(@<:@1-9@:>@@<:@0-9.@:>@*\) .*$/\1/'`
1.580 + elif test "x$TOOLCHAIN_TYPE" = xgcc; then
1.581 + # gcc --version output typically looks like
1.582 + # gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1
1.583 + # Copyright (C) 2013 Free Software Foundation, Inc.
1.584 + # This is free software; see the source for copying conditions. There is NO
1.585 + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1.586 + COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.587 + # Check that this is likely to be GCC.
1.588 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Free Software Foundation" > /dev/null
1.589 + if test $? -ne 0; then
1.590 + AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
1.591 + AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION"])
1.592 + AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.])
1.593 + fi
1.594 + # Remove Copyright and legalese from version string, and
1.595 + # collapse into a single line
1.596 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.597 + $SED -e 's/ *Copyright .*//'`
1.598 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.599 + $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'`
1.600 + elif test "x$TOOLCHAIN_TYPE" = xclang; then
1.601 + # clang --version output typically looks like
1.602 + # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
1.603 + # clang version 3.3 (tags/RELEASE_33/final)
1.604 + # or
1.605 + # Debian clang version 3.2-7ubuntu1 (tags/RELEASE_32/final) (based on LLVM 3.2)
1.606 + # Target: x86_64-pc-linux-gnu
1.607 + # Thread model: posix
1.608 + COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.609 + # Check that this is likely to be clang
1.610 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "clang" > /dev/null
1.611 + if test $? -ne 0; then
1.612 + AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
1.613 + AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_OUTPUT"])
1.614 + AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.])
1.615 + fi
1.616 + # Collapse compiler output into a single line
1.617 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
1.618 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.619 + $SED -e 's/^.*clang version \(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'`
1.620 +
1.621 + else
1.622 + AC_MSG_ERROR([Unknown toolchain type $TOOLCHAIN_TYPE.])
1.623 fi
1.624 - if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.625 - ARFLAGS="-r"
1.626 - elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.627 - ARFLAGS="-X64"
1.628 + # This sets CC_VERSION_NUMBER or CXX_VERSION_NUMBER. (This comment is a grep marker)
1.629 + $1_VERSION_NUMBER="$COMPILER_VERSION_NUMBER"
1.630 + # This sets CC_VERSION_STRING or CXX_VERSION_STRING. (This comment is a grep marker)
1.631 + $1_VERSION_STRING="$COMPILER_VERSION_STRING"
1.632 +
1.633 + AC_MSG_NOTICE([Using $TOOLCHAIN_TYPE $COMPILER_NAME compiler version $COMPILER_VERSION_NUMBER @<:@$COMPILER_VERSION_STRING@:>@])
1.634 +])
1.635 +
1.636 +
1.637 +# Try to locate the given C or C++ compiler in the path, or otherwise.
1.638 +#
1.639 +# $1 = compiler to test (CC or CXX)
1.640 +# $2 = human readable name of compiler (C or C++)
1.641 +# $3 = list of compiler names to search for
1.642 +AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
1.643 +[
1.644 + COMPILER_NAME=$2
1.645 + SEARCH_LIST="$3"
1.646 +
1.647 + if test "x[$]$1" != x; then
1.648 + # User has supplied compiler name already, always let that override.
1.649 + AC_MSG_NOTICE([Will use user supplied compiler $1=[$]$1])
1.650 + if test "x`basename [$]$1`" = "x[$]$1"; then
1.651 + # A command without a complete path is provided, search $PATH.
1.652 +
1.653 + AC_PATH_PROGS(POTENTIAL_$1, [$]$1)
1.654 + if test "x$POTENTIAL_$1" != x; then
1.655 + $1=$POTENTIAL_$1
1.656 + else
1.657 + AC_MSG_ERROR([User supplied compiler $1=[$]$1 could not be found])
1.658 + fi
1.659 + else
1.660 + # Otherwise it might already be a complete path
1.661 + if test ! -x "[$]$1"; then
1.662 + AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist])
1.663 + fi
1.664 + fi
1.665 else
1.666 - ARFLAGS=""
1.667 + # No user supplied value. Locate compiler ourselves.
1.668 +
1.669 + # If we are cross compiling, assume cross compilation tools follows the
1.670 + # cross compilation standard where they are prefixed with the autoconf
1.671 + # standard name for the target. For example the binary
1.672 + # i686-sun-solaris2.10-gcc will cross compile for i686-sun-solaris2.10.
1.673 + # If we are not cross compiling, then the default compiler name will be
1.674 + # used.
1.675 +
1.676 + $1=
1.677 + # If TOOLS_DIR is set, check for all compiler names in there first
1.678 + # before checking the rest of the PATH.
1.679 + # FIXME: Now that we prefix the TOOLS_DIR to the PATH in the PRE_DETECTION
1.680 + # step, this should not be necessary.
1.681 + if test -n "$TOOLS_DIR"; then
1.682 + PATH_save="$PATH"
1.683 + PATH="$TOOLS_DIR"
1.684 + AC_PATH_PROGS(TOOLS_DIR_$1, $3)
1.685 + $1=$TOOLS_DIR_$1
1.686 + PATH="$PATH_save"
1.687 + fi
1.688 +
1.689 + # AC_PATH_PROGS can't be run multiple times with the same variable,
1.690 + # so create a new name for this run.
1.691 + if test "x[$]$1" = x; then
1.692 + AC_PATH_PROGS(POTENTIAL_$1, $3)
1.693 + $1=$POTENTIAL_$1
1.694 + fi
1.695 +
1.696 + if test "x[$]$1" = x; then
1.697 + HELP_MSG_MISSING_DEPENDENCY([devkit])
1.698 + AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG])
1.699 + fi
1.700 fi
1.701 - AC_SUBST(ARFLAGS)
1.702
1.703 - # For hotspot, we need these in Windows mixed path; other platforms keep them the same
1.704 - HOTSPOT_CXX="$CXX"
1.705 - HOTSPOT_LD="$LD"
1.706 - AC_SUBST(HOTSPOT_CXX)
1.707 - AC_SUBST(HOTSPOT_LD)
1.708 + # Now we have a compiler binary in $1. Make sure it's okay.
1.709 + BASIC_FIXUP_EXECUTABLE($1)
1.710 + TEST_COMPILER="[$]$1"
1.711 + # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
1.712 + # to 'xlc' but it is crucial that we invoke the compiler with the right name!
1.713 + if test "x$OPENJDK_BUILD_OS" != xaix; then
1.714 + # FIXME: This test should not be needed anymore; we don't do that for any platform.
1.715 + AC_MSG_CHECKING([resolved symbolic links for $1])
1.716 + BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
1.717 + AC_MSG_RESULT([$TEST_COMPILER])
1.718 + fi
1.719 + AC_MSG_CHECKING([if $1 is disguised ccache])
1.720
1.721 - COMPILER_NAME=gcc
1.722 - COMPILER_TYPE=CC
1.723 - AS_IF([test "x$OPENJDK_TARGET_OS" = xwindows], [
1.724 - # For now, assume that we are always compiling using cl.exe.
1.725 - CC_OUT_OPTION=-Fo
1.726 - EXE_OUT_OPTION=-out:
1.727 - LD_OUT_OPTION=-out:
1.728 - AR_OUT_OPTION=-out:
1.729 - # On Windows, reject /usr/bin/link (as determined in CYGWIN_LINK), which is a cygwin
1.730 - # program for something completely different.
1.731 - AC_CHECK_PROG([WINLD], [link],[link],,, [$CYGWIN_LINK])
1.732 - # Since we must ignore the first found link, WINLD will contain
1.733 - # the full path to the link.exe program.
1.734 - BASIC_FIXUP_EXECUTABLE(WINLD)
1.735 - printf "Windows linker was found at $WINLD\n"
1.736 + COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
1.737 + if test "x$COMPILER_BASENAME" = "xccache"; then
1.738 + AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
1.739 + # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
1.740 + # We want to control ccache invocation ourselves, so ignore this cc and try
1.741 + # searching again.
1.742 +
1.743 + # Remove the path to the fake ccache cc from the PATH
1.744 + RETRY_COMPILER_SAVED_PATH="$PATH"
1.745 + COMPILER_DIRNAME=`$DIRNAME [$]$1`
1.746 + PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e "s,::,:,g" -e "s,^:,,g"`"
1.747 +
1.748 + # Try again looking for our compiler
1.749 + AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3)
1.750 + BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1)
1.751 + PATH="$RETRY_COMPILER_SAVED_PATH"
1.752 +
1.753 + AC_MSG_CHECKING([for resolved symbolic links for $1])
1.754 + BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1)
1.755 + AC_MSG_RESULT([$PROPER_COMPILER_$1])
1.756 + $1="$PROPER_COMPILER_$1"
1.757 + else
1.758 + AC_MSG_RESULT([no, keeping $1])
1.759 + $1="$TEST_COMPILER"
1.760 + fi
1.761 +
1.762 + TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
1.763 +])
1.764 +
1.765 +# Detect the core components of the toolchain, i.e. the compilers (CC and CXX),
1.766 +# preprocessor (CPP and CXXCPP), the linker (LD), the assembler (AS) and the
1.767 +# archiver (AR). Verify that the compilers are correct according to the
1.768 +# toolchain type.
1.769 +AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
1.770 +[
1.771 + #
1.772 + # Setup the compilers (CC and CXX)
1.773 + #
1.774 + TOOLCHAIN_FIND_COMPILER([CC], [C], $TOOLCHAIN_CC_BINARY)
1.775 + # Now that we have resolved CC ourself, let autoconf have its go at it
1.776 + AC_PROG_CC([$CC])
1.777 +
1.778 + TOOLCHAIN_FIND_COMPILER([CXX], [C++], $TOOLCHAIN_CXX_BINARY)
1.779 + # Now that we have resolved CXX ourself, let autoconf have its go at it
1.780 + AC_PROG_CXX([$CXX])
1.781 +
1.782 + # This is the compiler version number on the form X.Y[.Z]
1.783 + AC_SUBST(CC_VERSION_NUMBER)
1.784 + AC_SUBST(CXX_VERSION_NUMBER)
1.785 +
1.786 + TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS
1.787 +
1.788 + #
1.789 + # Setup the preprocessor (CPP and CXXCPP)
1.790 + #
1.791 + AC_PROG_CPP
1.792 + BASIC_FIXUP_EXECUTABLE(CPP)
1.793 + AC_PROG_CXXCPP
1.794 + BASIC_FIXUP_EXECUTABLE(CXXCPP)
1.795 +
1.796 + #
1.797 + # Setup the linker (LD)
1.798 + #
1.799 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.800 + # In the Microsoft toolchain we have a separate LD command "link".
1.801 + # Make sure we reject /usr/bin/link (as determined in CYGWIN_LINK), which is
1.802 + # a cygwin program for something completely different.
1.803 + AC_CHECK_PROG([LD], [link],[link],,, [$CYGWIN_LINK])
1.804 + BASIC_FIXUP_EXECUTABLE(LD)
1.805 + # Verify that we indeed succeeded with this trick.
1.806 AC_MSG_CHECKING([if the found link.exe is actually the Visual Studio linker])
1.807 - "$WINLD" --version > /dev/null
1.808 + "$LD" --version > /dev/null
1.809 if test $? -eq 0 ; then
1.810 AC_MSG_RESULT([no])
1.811 AC_MSG_ERROR([This is the Cygwin link tool. Please check your PATH and rerun configure.])
1.812 else
1.813 AC_MSG_RESULT([yes])
1.814 fi
1.815 - LD="$WINLD"
1.816 - LDEXE="$WINLD"
1.817 - LDCXX="$WINLD"
1.818 - LDEXECXX="$WINLD"
1.819 + LDCXX="$LD"
1.820 + else
1.821 + # All other toolchains use the compiler to link.
1.822 + LD="$CC"
1.823 + LDCXX="$CXX"
1.824 + fi
1.825 + AC_SUBST(LD)
1.826 + # FIXME: it should be CXXLD, according to standard (cf CXXCPP)
1.827 + AC_SUBST(LDCXX)
1.828
1.829 - AC_CHECK_PROG([MT], [mt], [mt],,, [/usr/bin/mt])
1.830 - BASIC_FIXUP_EXECUTABLE(MT)
1.831 - # The resource compiler
1.832 - AC_CHECK_PROG([RC], [rc], [rc],,, [/usr/bin/rc])
1.833 - BASIC_FIXUP_EXECUTABLE(RC)
1.834 -
1.835 - # For hotspot, we need these in Windows mixed path,
1.836 - # so rewrite them all. Need added .exe suffix.
1.837 - HOTSPOT_CXX="$CXX.exe"
1.838 - HOTSPOT_LD="$LD.exe"
1.839 - HOTSPOT_MT="$MT.exe"
1.840 - HOTSPOT_RC="$RC.exe"
1.841 - BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_CXX)
1.842 - BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_LD)
1.843 - BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_MT)
1.844 - BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_RC)
1.845 - AC_SUBST(HOTSPOT_MT)
1.846 - AC_SUBST(HOTSPOT_RC)
1.847 -
1.848 - RC_FLAGS="-nologo -l 0x409 -r"
1.849 - AS_IF([test "x$VARIANT" = xOPT], [
1.850 - RC_FLAGS="$RC_FLAGS -d NDEBUG"
1.851 - ])
1.852 -
1.853 - # The version variables used to create RC_FLAGS may be overridden
1.854 - # in a custom configure script, or possibly the command line.
1.855 - # Let those variables be expanded at make time in spec.gmk.
1.856 - # The \$ are escaped to the shell, and the $(...) variables
1.857 - # are evaluated by make.
1.858 - RC_FLAGS="$RC_FLAGS \
1.859 - -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
1.860 - -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
1.861 - -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
1.862 - -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
1.863 - -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
1.864 - -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
1.865 - -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\""
1.866 -
1.867 - # lib.exe is used to create static libraries.
1.868 - AC_CHECK_PROG([WINAR], [lib],[lib],,,)
1.869 - BASIC_FIXUP_EXECUTABLE(WINAR)
1.870 - AR="$WINAR"
1.871 - ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
1.872 -
1.873 - AC_CHECK_PROG([DUMPBIN], [dumpbin], [dumpbin],,,)
1.874 - BASIC_FIXUP_EXECUTABLE(DUMPBIN)
1.875 -
1.876 - COMPILER_TYPE=CL
1.877 - # silence copyright notice and other headers.
1.878 - COMMON_CCXXFLAGS="$COMMON_CCXXFLAGS -nologo"
1.879 - ])
1.880 - AC_SUBST(RC_FLAGS)
1.881 - AC_SUBST(COMPILER_TYPE)
1.882 -
1.883 - AC_PROG_CPP
1.884 - BASIC_FIXUP_EXECUTABLE(CPP)
1.885 -
1.886 - AC_PROG_CXXCPP
1.887 - BASIC_FIXUP_EXECUTABLE(CXXCPP)
1.888 -
1.889 - if test "x$COMPILE_TYPE" != "xcross"; then
1.890 - # If we are not cross compiling, use the same compilers for
1.891 - # building the build platform executables. The cross-compilation
1.892 - # case needed to be done earlier, but this can only be done after
1.893 - # the native tools have been localized.
1.894 - BUILD_CC="$CC"
1.895 - BUILD_CXX="$CXX"
1.896 - BUILD_LD="$LD"
1.897 - fi
1.898 -
1.899 - # for solaris we really need solaris tools, and not gnu equivalent
1.900 - # these seems to normally reside in /usr/ccs/bin so add that to path before
1.901 - # starting to probe
1.902 #
1.903 - # NOTE: I add this /usr/ccs/bin after TOOLS but before OLD_PATH
1.904 - # so that it can be overriden --with-tools-dir
1.905 - if test "x$OPENJDK_BUILD_OS" = xsolaris; then
1.906 - PATH="${TOOLS_DIR}:/usr/ccs/bin:${OLD_PATH}"
1.907 - fi
1.908 -
1.909 - # Find the right assembler.
1.910 + # Setup the assembler (AS)
1.911 + #
1.912 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.913 + # FIXME: should this really be solaris, or solstudio?
1.914 BASIC_PATH_PROGS(AS, as)
1.915 BASIC_FIXUP_EXECUTABLE(AS)
1.916 else
1.917 + # FIXME: is this correct for microsoft?
1.918 AS="$CC -c"
1.919 fi
1.920 AC_SUBST(AS)
1.921
1.922 + #
1.923 + # Setup the archiver (AR)
1.924 + #
1.925 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.926 + # The corresponding ar tool is lib.exe (used to create static libraries)
1.927 + AC_CHECK_PROG([AR], [lib],[lib],,,)
1.928 + else
1.929 + BASIC_CHECK_TOOLS(AR, ar)
1.930 + fi
1.931 + BASIC_FIXUP_EXECUTABLE(AR)
1.932 +])
1.933 +
1.934 +# Setup additional tools that is considered a part of the toolchain, but not the
1.935 +# core part. Many of these are highly platform-specific and do not exist,
1.936 +# and/or are not needed on all platforms.
1.937 +AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
1.938 +[
1.939 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.940 + AC_PROG_OBJC
1.941 + BASIC_FIXUP_EXECUTABLE(OBJC)
1.942 + BASIC_PATH_PROGS(LIPO, lipo)
1.943 + BASIC_FIXUP_EXECUTABLE(LIPO)
1.944 + else
1.945 + OBJC=
1.946 + fi
1.947 +
1.948 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.949 + AC_CHECK_PROG([MT], [mt], [mt],,, [/usr/bin/mt])
1.950 + BASIC_FIXUP_EXECUTABLE(MT)
1.951 + # Setup the resource compiler (RC)
1.952 + AC_CHECK_PROG([RC], [rc], [rc],,, [/usr/bin/rc])
1.953 + BASIC_FIXUP_EXECUTABLE(RC)
1.954 + AC_CHECK_PROG([DUMPBIN], [dumpbin], [dumpbin],,,)
1.955 + BASIC_FIXUP_EXECUTABLE(DUMPBIN)
1.956 + fi
1.957 +
1.958 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.959 + BASIC_PATH_PROGS(STRIP, strip)
1.960 + BASIC_FIXUP_EXECUTABLE(STRIP)
1.961 BASIC_PATH_PROGS(NM, nm)
1.962 BASIC_FIXUP_EXECUTABLE(NM)
1.963 BASIC_PATH_PROGS(GNM, gnm)
1.964 BASIC_FIXUP_EXECUTABLE(GNM)
1.965 - BASIC_PATH_PROGS(STRIP, strip)
1.966 - BASIC_FIXUP_EXECUTABLE(STRIP)
1.967 +
1.968 BASIC_PATH_PROGS(MCS, mcs)
1.969 BASIC_FIXUP_EXECUTABLE(MCS)
1.970 elif test "x$OPENJDK_TARGET_OS" != xwindows; then
1.971 + # FIXME: we should unify this with the solaris case above.
1.972 + BASIC_CHECK_TOOLS(STRIP, strip)
1.973 + BASIC_FIXUP_EXECUTABLE(STRIP)
1.974 AC_PATH_PROG(OTOOL, otool)
1.975 if test "x$OTOOL" = "x"; then
1.976 OTOOL="true"
1.977 @@ -623,8 +707,6 @@
1.978 BASIC_FIXUP_EXECUTABLE(NM)
1.979 GNM="$NM"
1.980 AC_SUBST(GNM)
1.981 - BASIC_CHECK_TOOLS(STRIP, strip)
1.982 - BASIC_FIXUP_EXECUTABLE(STRIP)
1.983 fi
1.984
1.985 # objcopy is used for moving debug symbols to separate files when
1.986 @@ -639,731 +721,114 @@
1.987
1.988 BASIC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
1.989 if test "x$OBJDUMP" != x; then
1.990 - # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
1.991 + # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE
1.992 + # bails if argument is missing.
1.993 BASIC_FIXUP_EXECUTABLE(OBJDUMP)
1.994 fi
1.995 -
1.996 - TOOLCHAIN_SETUP_JTREG
1.997 -
1.998 - # Restore old path without tools dir
1.999 - PATH="$OLD_PATH"
1.1000 ])
1.1001
1.1002 +# Setup the build tools (i.e, the compiler and linker used to build programs
1.1003 +# that should be run on the build platform, not the target platform, as a build
1.1004 +# helper). Since the non-cross-compile case uses the normal, target compilers
1.1005 +# for this, we can only do this after these have been setup.
1.1006 +AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
1.1007 +[
1.1008 + if test "x$COMPILE_TYPE" = "xcross"; then
1.1009 + # Now we need to find a C/C++ compiler that can build executables for the
1.1010 + # build platform. We can't use the AC_PROG_CC macro, since it can only be
1.1011 + # used once. Also, we need to do this without adding a tools dir to the
1.1012 + # path, otherwise we might pick up cross-compilers which don't use standard
1.1013 + # naming.
1.1014
1.1015 -AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_LIBS],
1.1016 + # FIXME: we should list the discovered compilers as an exclude pattern!
1.1017 + # If we do that, we can do this detection before POST_DETECTION, and still
1.1018 + # find the build compilers in the tools dir, if needed.
1.1019 + BASIC_PATH_PROGS(BUILD_CC, [cl cc gcc])
1.1020 + BASIC_FIXUP_EXECUTABLE(BUILD_CC)
1.1021 + BASIC_PATH_PROGS(BUILD_CXX, [cl CC g++])
1.1022 + BASIC_FIXUP_EXECUTABLE(BUILD_CXX)
1.1023 + BASIC_PATH_PROGS(BUILD_LD, ld)
1.1024 + BASIC_FIXUP_EXECUTABLE(BUILD_LD)
1.1025 + else
1.1026 + # If we are not cross compiling, use the normal target compilers for
1.1027 + # building the build platform executables.
1.1028 + BUILD_CC="$CC"
1.1029 + BUILD_CXX="$CXX"
1.1030 + BUILD_LD="$LD"
1.1031 + fi
1.1032 +])
1.1033 +
1.1034 +# Setup legacy variables that are still needed as alternative ways to refer to
1.1035 +# parts of the toolchain.
1.1036 +AC_DEFUN_ONCE([TOOLCHAIN_SETUP_LEGACY],
1.1037 [
1.1038 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.1039 + # For hotspot, we need these in Windows mixed path,
1.1040 + # so rewrite them all. Need added .exe suffix.
1.1041 + HOTSPOT_CXX="$CXX.exe"
1.1042 + HOTSPOT_LD="$LD.exe"
1.1043 + HOTSPOT_MT="$MT.exe"
1.1044 + HOTSPOT_RC="$RC.exe"
1.1045 + BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_CXX)
1.1046 + BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_LD)
1.1047 + BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_MT)
1.1048 + BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_RC)
1.1049 + AC_SUBST(HOTSPOT_MT)
1.1050 + AC_SUBST(HOTSPOT_RC)
1.1051 + else
1.1052 + HOTSPOT_CXX="$CXX"
1.1053 + HOTSPOT_LD="$LD"
1.1054 + fi
1.1055 + AC_SUBST(HOTSPOT_CXX)
1.1056 + AC_SUBST(HOTSPOT_LD)
1.1057
1.1058 - ###############################################################################
1.1059 - #
1.1060 - # How to compile shared libraries.
1.1061 - #
1.1062 + if test "x$TOOLCHAIN_TYPE" = xclang; then
1.1063 + USE_CLANG=true
1.1064 + fi
1.1065 + AC_SUBST(USE_CLANG)
1.1066
1.1067 - if test "x$GCC" = xyes; then
1.1068 - COMPILER_NAME=gcc
1.1069 - PICFLAG="-fPIC"
1.1070 - LIBRARY_PREFIX=lib
1.1071 - SHARED_LIBRARY='lib[$]1.so'
1.1072 - STATIC_LIBRARY='lib[$]1.a'
1.1073 - SHARED_LIBRARY_FLAGS="-shared"
1.1074 - SHARED_LIBRARY_SUFFIX='.so'
1.1075 - STATIC_LIBRARY_SUFFIX='.a'
1.1076 - OBJ_SUFFIX='.o'
1.1077 - EXE_SUFFIX=''
1.1078 - SET_SHARED_LIBRARY_NAME='-Xlinker -soname=[$]1'
1.1079 - SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=[$]1'
1.1080 - C_FLAG_REORDER=''
1.1081 - CXX_FLAG_REORDER=''
1.1082 - SET_SHARED_LIBRARY_ORIGIN='-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$$$ORIGIN[$]1'
1.1083 - SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker \$$$$ORIGIN[$]1'
1.1084 - LD="$CC"
1.1085 - LDEXE="$CC"
1.1086 - LDCXX="$CXX"
1.1087 - LDEXECXX="$CXX"
1.1088 - POST_STRIP_CMD="$STRIP -g"
1.1089 + # LDEXE is the linker to use, when creating executables. Not really used.
1.1090 + # FIXME: These should just be removed!
1.1091 + LDEXE="$LD"
1.1092 + LDEXECXX="$LDCXX"
1.1093 + AC_SUBST(LDEXE)
1.1094 + AC_SUBST(LDEXECXX)
1.1095 +])
1.1096
1.1097 - # Linking is different on MacOSX
1.1098 - if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.1099 - # Might change in the future to clang.
1.1100 - COMPILER_NAME=gcc
1.1101 - SHARED_LIBRARY='lib[$]1.dylib'
1.1102 - SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
1.1103 - SHARED_LIBRARY_SUFFIX='.dylib'
1.1104 - EXE_SUFFIX=''
1.1105 - SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1'
1.1106 - SET_SHARED_LIBRARY_MAPFILE=''
1.1107 - SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
1.1108 - SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
1.1109 - POST_STRIP_CMD="$STRIP -S"
1.1110 - fi
1.1111 - else
1.1112 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.1113 - # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
1.1114 - COMPILER_NAME=ossc
1.1115 - PICFLAG="-KPIC"
1.1116 - LIBRARY_PREFIX=lib
1.1117 - SHARED_LIBRARY='lib[$]1.so'
1.1118 - STATIC_LIBRARY='lib[$]1.a'
1.1119 - SHARED_LIBRARY_FLAGS="-G"
1.1120 - SHARED_LIBRARY_SUFFIX='.so'
1.1121 - STATIC_LIBRARY_SUFFIX='.a'
1.1122 - OBJ_SUFFIX='.o'
1.1123 - EXE_SUFFIX=''
1.1124 - SET_SHARED_LIBRARY_NAME=''
1.1125 - SET_SHARED_LIBRARY_MAPFILE='-M[$]1'
1.1126 - C_FLAG_REORDER='-xF'
1.1127 - CXX_FLAG_REORDER='-xF'
1.1128 - SET_SHARED_LIBRARY_ORIGIN='-R\$$$$ORIGIN[$]1'
1.1129 - SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
1.1130 - CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
1.1131 - CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
1.1132 - CFLAGS_JDKLIB_EXTRA='-xstrconst'
1.1133 - POST_STRIP_CMD="$STRIP -x"
1.1134 - POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
1.1135 - fi
1.1136 - if test "x$OPENJDK_TARGET_OS" = xaix; then
1.1137 - COMPILER_NAME=xlc
1.1138 - PICFLAG="-qpic=large"
1.1139 - LIBRARY_PREFIX=lib
1.1140 - SHARED_LIBRARY='lib[$]1.so'
1.1141 - STATIC_LIBRARY='lib[$]1.a'
1.1142 - SHARED_LIBRARY_FLAGS="-qmkshrobj"
1.1143 - SHARED_LIBRARY_SUFFIX='.so'
1.1144 - STATIC_LIBRARY_SUFFIX='.a'
1.1145 - OBJ_SUFFIX='.o'
1.1146 - EXE_SUFFIX=''
1.1147 - SET_SHARED_LIBRARY_NAME=''
1.1148 - SET_SHARED_LIBRARY_MAPFILE=''
1.1149 - C_FLAG_REORDER=''
1.1150 - CXX_FLAG_REORDER=''
1.1151 - SET_SHARED_LIBRARY_ORIGIN=''
1.1152 - SET_EXECUTABLE_ORIGIN=""
1.1153 - CFLAGS_JDK=""
1.1154 - CXXFLAGS_JDK=""
1.1155 - CFLAGS_JDKLIB_EXTRA=''
1.1156 - POST_STRIP_CMD="$STRIP -X32_64"
1.1157 - POST_MCS_CMD=""
1.1158 - fi
1.1159 - if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.1160 - # If it is not gcc, then assume it is the MS Visual Studio compiler
1.1161 - COMPILER_NAME=cl
1.1162 - PICFLAG=""
1.1163 - LIBRARY_PREFIX=
1.1164 - SHARED_LIBRARY='[$]1.dll'
1.1165 - STATIC_LIBRARY='[$]1.lib'
1.1166 - SHARED_LIBRARY_FLAGS="-LD"
1.1167 - SHARED_LIBRARY_SUFFIX='.dll'
1.1168 - STATIC_LIBRARY_SUFFIX='.lib'
1.1169 - OBJ_SUFFIX='.obj'
1.1170 - EXE_SUFFIX='.exe'
1.1171 - SET_SHARED_LIBRARY_NAME=''
1.1172 - SET_SHARED_LIBRARY_MAPFILE=''
1.1173 - SET_SHARED_LIBRARY_ORIGIN=''
1.1174 - SET_EXECUTABLE_ORIGIN=''
1.1175 +# Do some additional checks on the detected tools.
1.1176 +AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
1.1177 + [
1.1178 + # The package path is used only on macosx?
1.1179 + # FIXME: clean this up, and/or move it elsewhere.
1.1180 + PACKAGE_PATH=/opt/local
1.1181 + AC_SUBST(PACKAGE_PATH)
1.1182 +
1.1183 + # Check for extra potential brokenness.
1.1184 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.1185 + # On Windows, double-check that we got the right compiler.
1.1186 + CC_VERSION_OUTPUT=`$CC 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.1187 + COMPILER_CPU_TEST=`$ECHO $CC_VERSION_OUTPUT | $SED -n "s/^.* \(.*\)$/\1/p"`
1.1188 + if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
1.1189 + if test "x$COMPILER_CPU_TEST" != "x80x86"; then
1.1190 + AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86".])
1.1191 + fi
1.1192 + elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
1.1193 + if test "x$COMPILER_CPU_TEST" != "xx64"; then
1.1194 + AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "x64".])
1.1195 + fi
1.1196 fi
1.1197 fi
1.1198
1.1199 - AC_SUBST(COMPILER_NAME)
1.1200 - AC_SUBST(OBJ_SUFFIX)
1.1201 - AC_SUBST(SHARED_LIBRARY)
1.1202 - AC_SUBST(STATIC_LIBRARY)
1.1203 - AC_SUBST(LIBRARY_PREFIX)
1.1204 - AC_SUBST(SHARED_LIBRARY_SUFFIX)
1.1205 - AC_SUBST(STATIC_LIBRARY_SUFFIX)
1.1206 - AC_SUBST(EXE_SUFFIX)
1.1207 - AC_SUBST(SHARED_LIBRARY_FLAGS)
1.1208 - AC_SUBST(SET_SHARED_LIBRARY_NAME)
1.1209 - AC_SUBST(SET_SHARED_LIBRARY_MAPFILE)
1.1210 - AC_SUBST(C_FLAG_REORDER)
1.1211 - AC_SUBST(CXX_FLAG_REORDER)
1.1212 - AC_SUBST(SET_SHARED_LIBRARY_ORIGIN)
1.1213 - AC_SUBST(SET_EXECUTABLE_ORIGIN)
1.1214 - AC_SUBST(POST_STRIP_CMD)
1.1215 - AC_SUBST(POST_MCS_CMD)
1.1216 -
1.1217 - # The (cross) compiler is now configured, we can now test capabilities
1.1218 - # of the target platform.
1.1219 -])
1.1220 -
1.1221 -AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
1.1222 -[
1.1223 -
1.1224 - ###############################################################################
1.1225 - #
1.1226 - # Setup the opt flags for different compilers
1.1227 - # and different operating systems.
1.1228 - #
1.1229 -
1.1230 - #
1.1231 - # NOTE: check for -mstackrealign needs to be below potential addition of -m32
1.1232 - #
1.1233 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32 && test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.1234 - # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
1.1235 - # While waiting for a better solution, the current workaround is to use -mstackrealign.
1.1236 - CFLAGS="$CFLAGS -mstackrealign"
1.1237 - AC_MSG_CHECKING([if 32-bit compiler supports -mstackrealign])
1.1238 - AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
1.1239 - [
1.1240 - AC_MSG_RESULT([yes])
1.1241 - ],
1.1242 - [
1.1243 - AC_MSG_RESULT([no])
1.1244 - AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
1.1245 - ]
1.1246 - )
1.1247 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.1248 + # If this is a --hash-style=gnu system, use --hash-style=both, why?
1.1249 + HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
1.1250 + # This is later checked when setting flags.
1.1251 fi
1.1252
1.1253 - C_FLAG_DEPS="-MMD -MF"
1.1254 - CXX_FLAG_DEPS="-MMD -MF"
1.1255 -
1.1256 - case $COMPILER_TYPE in
1.1257 - CC )
1.1258 - case $COMPILER_NAME in
1.1259 - gcc )
1.1260 - case $OPENJDK_TARGET_OS in
1.1261 - macosx )
1.1262 - # On MacOSX we optimize for size, something
1.1263 - # we should do for all platforms?
1.1264 - C_O_FLAG_HI="-Os"
1.1265 - C_O_FLAG_NORM="-Os"
1.1266 - C_O_FLAG_NONE=""
1.1267 - ;;
1.1268 - *)
1.1269 - C_O_FLAG_HI="-O3"
1.1270 - C_O_FLAG_NORM="-O2"
1.1271 - C_O_FLAG_NONE="-O0"
1.1272 - ;;
1.1273 - esac
1.1274 - CXX_O_FLAG_HI="$C_O_FLAG_HI"
1.1275 - CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
1.1276 - CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
1.1277 - CFLAGS_DEBUG_SYMBOLS="-g"
1.1278 - CXXFLAGS_DEBUG_SYMBOLS="-g"
1.1279 - if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
1.1280 - CFLAGS_DEBUG_SYMBOLS="-g1"
1.1281 - CXXFLAGS_DEBUG_SYMBOLS="-g1"
1.1282 - fi
1.1283 - ;;
1.1284 - ossc )
1.1285 - #
1.1286 - # Forte has different names for this with their C++ compiler...
1.1287 - #
1.1288 - C_FLAG_DEPS="-xMMD -xMF"
1.1289 - CXX_FLAG_DEPS="-xMMD -xMF"
1.1290 -
1.1291 - # Extra options used with HIGHEST
1.1292 - #
1.1293 - # WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
1.1294 - # done with care, there are some assumptions below that need to
1.1295 - # be understood about the use of pointers, and IEEE behavior.
1.1296 - #
1.1297 - # Use non-standard floating point mode (not IEEE 754)
1.1298 - CC_HIGHEST="$CC_HIGHEST -fns"
1.1299 - # Do some simplification of floating point arithmetic (not IEEE 754)
1.1300 - CC_HIGHEST="$CC_HIGHEST -fsimple"
1.1301 - # Use single precision floating point with 'float'
1.1302 - CC_HIGHEST="$CC_HIGHEST -fsingle"
1.1303 - # Assume memory references via basic pointer types do not alias
1.1304 - # (Source with excessing pointer casting and data access with mixed
1.1305 - # pointer types are not recommended)
1.1306 - CC_HIGHEST="$CC_HIGHEST -xalias_level=basic"
1.1307 - # Use intrinsic or inline versions for math/std functions
1.1308 - # (If you expect perfect errno behavior, do not use this)
1.1309 - CC_HIGHEST="$CC_HIGHEST -xbuiltin=%all"
1.1310 - # Loop data dependency optimizations (need -xO3 or higher)
1.1311 - CC_HIGHEST="$CC_HIGHEST -xdepend"
1.1312 - # Pointer parameters to functions do not overlap
1.1313 - # (Similar to -xalias_level=basic usage, but less obvious sometimes.
1.1314 - # If you pass in multiple pointers to the same data, do not use this)
1.1315 - CC_HIGHEST="$CC_HIGHEST -xrestrict"
1.1316 - # Inline some library routines
1.1317 - # (If you expect perfect errno behavior, do not use this)
1.1318 - CC_HIGHEST="$CC_HIGHEST -xlibmil"
1.1319 - # Use optimized math routines
1.1320 - # (If you expect perfect errno behavior, do not use this)
1.1321 - # Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
1.1322 - #CC_HIGHEST="$CC_HIGHEST -xlibmopt"
1.1323 -
1.1324 - if test "x$OPENJDK_TARGET_CPU" = xsparc; then
1.1325 - CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
1.1326 - CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
1.1327 - fi
1.1328 -
1.1329 - case $OPENJDK_TARGET_CPU_ARCH in
1.1330 - x86)
1.1331 - C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xregs=no%frameptr"
1.1332 - C_O_FLAG_HI="-xO4 -Wu,-O4~yz -xregs=no%frameptr"
1.1333 - C_O_FLAG_NORM="-xO2 -Wu,-O2~yz -xregs=no%frameptr"
1.1334 - C_O_FLAG_NONE="-xregs=no%frameptr"
1.1335 - CXX_O_FLAG_HIGHEST="-xO4 -Qoption ube -O4~yz $CC_HIGHEST -xregs=no%frameptr"
1.1336 - CXX_O_FLAG_HI="-xO4 -Qoption ube -O4~yz -xregs=no%frameptr"
1.1337 - CXX_O_FLAG_NORM="-xO2 -Qoption ube -O2~yz -xregs=no%frameptr"
1.1338 - CXX_O_FLAG_NONE="-xregs=no%frameptr"
1.1339 - if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.1340 - C_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST -xchip=pentium"
1.1341 - CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HIGHEST -xchip=pentium"
1.1342 - fi
1.1343 - ;;
1.1344 - sparc)
1.1345 - CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
1.1346 - CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
1.1347 - C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
1.1348 - C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0"
1.1349 - C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0"
1.1350 - C_O_FLAG_NONE=""
1.1351 - CXX_O_FLAG_HIGHEST="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
1.1352 - CXX_O_FLAG_HI="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
1.1353 - CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
1.1354 - CXX_O_FLAG_NONE=""
1.1355 - ;;
1.1356 - esac
1.1357 -
1.1358 - CFLAGS_DEBUG_SYMBOLS="-g -xs"
1.1359 - CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
1.1360 - ;;
1.1361 - xlc )
1.1362 - C_FLAG_DEPS="-qmakedep=gcc -MF"
1.1363 - CXX_FLAG_DEPS="-qmakedep=gcc -MF"
1.1364 - C_O_FLAG_HIGHEST="-O3"
1.1365 - C_O_FLAG_HI="-O3 -qstrict"
1.1366 - C_O_FLAG_NORM="-O2"
1.1367 - C_O_FLAG_NONE=""
1.1368 - CXX_O_FLAG_HIGHEST="-O3"
1.1369 - CXX_O_FLAG_HI="-O3 -qstrict"
1.1370 - CXX_O_FLAG_NORM="-O2"
1.1371 - CXX_O_FLAG_NONE=""
1.1372 - CFLAGS_DEBUG_SYMBOLS="-g"
1.1373 - CXXFLAGS_DEBUG_SYMBOLS="-g"
1.1374 - LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall"
1.1375 - CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.1376 - CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.1377 - ;;
1.1378 - esac
1.1379 - ;;
1.1380 - CL )
1.1381 - C_O_FLAG_HIGHEST="-O2"
1.1382 - C_O_FLAG_HI="-O1"
1.1383 - C_O_FLAG_NORM="-O1"
1.1384 - C_O_FLAG_NONE="-Od"
1.1385 - CXX_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST"
1.1386 - CXX_O_FLAG_HI="$C_O_FLAG_HI"
1.1387 - CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
1.1388 - CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
1.1389 - ;;
1.1390 - esac
1.1391 -
1.1392 - if test -z "$C_O_FLAG_HIGHEST"; then
1.1393 - C_O_FLAG_HIGHEST="$C_O_FLAG_HI"
1.1394 - fi
1.1395 -
1.1396 - if test -z "$CXX_O_FLAG_HIGHEST"; then
1.1397 - CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HI"
1.1398 - fi
1.1399 -
1.1400 - AC_SUBST(C_O_FLAG_HIGHEST)
1.1401 - AC_SUBST(C_O_FLAG_HI)
1.1402 - AC_SUBST(C_O_FLAG_NORM)
1.1403 - AC_SUBST(C_O_FLAG_NONE)
1.1404 - AC_SUBST(CXX_O_FLAG_HIGHEST)
1.1405 - AC_SUBST(CXX_O_FLAG_HI)
1.1406 - AC_SUBST(CXX_O_FLAG_NORM)
1.1407 - AC_SUBST(CXX_O_FLAG_NONE)
1.1408 - AC_SUBST(C_FLAG_DEPS)
1.1409 - AC_SUBST(CXX_FLAG_DEPS)
1.1410 -])
1.1411 -
1.1412 -AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK],
1.1413 -[
1.1414 -
1.1415 - if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
1.1416 - AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
1.1417 - fi
1.1418 -
1.1419 - if test "x$CXXFLAGS" != "x${ADDED_CXXFLAGS}"; then
1.1420 - AC_MSG_WARN([Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags])
1.1421 - fi
1.1422 -
1.1423 - if test "x$LDFLAGS" != "x${ADDED_LDFLAGS}"; then
1.1424 - AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags])
1.1425 - fi
1.1426 -
1.1427 - AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags],
1.1428 - [extra flags to be used when compiling jdk c-files])])
1.1429 -
1.1430 - AC_ARG_WITH(extra-cxxflags, [AS_HELP_STRING([--with-extra-cxxflags],
1.1431 - [extra flags to be used when compiling jdk c++-files])])
1.1432 -
1.1433 - AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags],
1.1434 - [extra flags to be used when linking jdk])])
1.1435 -
1.1436 - CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
1.1437 - CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
1.1438 - LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
1.1439 -
1.1440 - # Hotspot needs these set in their legacy form
1.1441 - LEGACY_EXTRA_CFLAGS=$with_extra_cflags
1.1442 - LEGACY_EXTRA_CXXFLAGS=$with_extra_cxxflags
1.1443 - LEGACY_EXTRA_LDFLAGS=$with_extra_ldflags
1.1444 -
1.1445 - AC_SUBST(LEGACY_EXTRA_CFLAGS)
1.1446 - AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
1.1447 - AC_SUBST(LEGACY_EXTRA_LDFLAGS)
1.1448 -
1.1449 - ###############################################################################
1.1450 - #
1.1451 - # Now setup the CFLAGS and LDFLAGS for the JDK build.
1.1452 - # Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build.
1.1453 - # CFLAGS_JDK - C Compiler flags
1.1454 - # CXXFLAGS_JDK - C++ Compiler flags
1.1455 - # COMMON_CCXXFLAGS_JDK - common to C and C++
1.1456 - #
1.1457 - case $COMPILER_NAME in
1.1458 - gcc )
1.1459 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
1.1460 - -pipe \
1.1461 - -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
1.1462 - CXXSTD_CXXFLAG="-std=gnu++98"
1.1463 - TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS([$CXXSTD_CXXFLAG $CFLAGS_WARNINGS_ARE_ERRORS],
1.1464 - [], [CXXSTD_CXXFLAG=""])
1.1465 - CXXFLAGS_JDK="${CXXFLAGS_JDK} ${CXXSTD_CXXFLAG}"
1.1466 - AC_SUBST([CXXSTD_CXXFLAG])
1.1467 - case $OPENJDK_TARGET_CPU_ARCH in
1.1468 - arm )
1.1469 - # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
1.1470 - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
1.1471 - ;;
1.1472 - ppc )
1.1473 - # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
1.1474 - ;;
1.1475 - * )
1.1476 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer"
1.1477 - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
1.1478 - ;;
1.1479 - esac
1.1480 - TOOLCHAIN_CHECK_COMPILER_VERSION(6, TOOLCHAIN_SETUP_GCC6_COMPILER_FLAGS)
1.1481 - ;;
1.1482 - ossc )
1.1483 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS"
1.1484 - case $OPENJDK_TARGET_CPU_ARCH in
1.1485 - x86 )
1.1486 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DcpuIntel -Di586 -D$OPENJDK_TARGET_CPU_LEGACY_LIB"
1.1487 - CFLAGS_JDK="$CFLAGS_JDK -erroff=E_BAD_PRAGMA_PACK_VALUE"
1.1488 - ;;
1.1489 - esac
1.1490 -
1.1491 - CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -W0,-noglobal"
1.1492 - CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
1.1493 -
1.1494 - LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext"
1.1495 - LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib"
1.1496 - ;;
1.1497 - xlc )
1.1498 - CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
1.1499 - CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
1.1500 -
1.1501 - LDFLAGS_JDK="$LDFLAGS_JDK"
1.1502 - LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK"
1.1503 - ;;
1.1504 - cl )
1.1505 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
1.1506 - -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \
1.1507 - -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
1.1508 - -DWIN32 -DIAL"
1.1509 - case $OPENJDK_TARGET_CPU in
1.1510 - x86 )
1.1511 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_X86_ -Dx86"
1.1512 - ;;
1.1513 - x86_64 )
1.1514 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_AMD64_ -Damd64"
1.1515 - ;;
1.1516 - esac
1.1517 - ;;
1.1518 - esac
1.1519 -
1.1520 - ###############################################################################
1.1521 -
1.1522 - # Adjust flags according to debug level.
1.1523 - case $DEBUG_LEVEL in
1.1524 - fastdebug )
1.1525 - CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
1.1526 - CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
1.1527 - C_O_FLAG_HI="$C_O_FLAG_NORM"
1.1528 - C_O_FLAG_NORM="$C_O_FLAG_NORM"
1.1529 - CXX_O_FLAG_HI="$CXX_O_FLAG_NORM"
1.1530 - CXX_O_FLAG_NORM="$CXX_O_FLAG_NORM"
1.1531 - JAVAC_FLAGS="$JAVAC_FLAGS -g"
1.1532 - ;;
1.1533 - slowdebug )
1.1534 - CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
1.1535 - CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
1.1536 - C_O_FLAG_HI="$C_O_FLAG_NONE"
1.1537 - C_O_FLAG_NORM="$C_O_FLAG_NONE"
1.1538 - CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
1.1539 - CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
1.1540 - JAVAC_FLAGS="$JAVAC_FLAGS -g"
1.1541 - ;;
1.1542 - esac
1.1543 -
1.1544 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64"
1.1545 -
1.1546 - # The package path is used only on macosx?
1.1547 - PACKAGE_PATH=/opt/local
1.1548 - AC_SUBST(PACKAGE_PATH)
1.1549 -
1.1550 - if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
1.1551 - # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
1.1552 - # Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
1.1553 - # (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h).
1.1554 - # Note: -Dmacro is the same as #define macro 1
1.1555 - # -Dmacro= is the same as #define macro
1.1556 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.1557 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
1.1558 - else
1.1559 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
1.1560 - fi
1.1561 - else
1.1562 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
1.1563 - fi
1.1564 - if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.1565 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
1.1566 - fi
1.1567 - if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.1568 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DWINDOWS"
1.1569 - fi
1.1570 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.1571 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DSOLARIS"
1.1572 - fi
1.1573 - if test "x$OPENJDK_TARGET_OS" = xaix; then
1.1574 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DAIX -DPPC64"
1.1575 - fi
1.1576 - if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.1577 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
1.1578 - # Setting these parameters makes it an error to link to macosx APIs that are
1.1579 - # newer than the given OS version and makes the linked binaries compatible even
1.1580 - # if built on a newer version of the OS.
1.1581 - # The expected format is X.Y.Z
1.1582 - MACOSX_VERSION_MIN=10.7.0
1.1583 - AC_SUBST(MACOSX_VERSION_MIN)
1.1584 - # The macro takes the version with no dots, ex: 1070
1.1585 - # Let the flags variables get resolved in make for easier override on make
1.1586 - # command line.
1.1587 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1.1588 - LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1.1589 - fi
1.1590 - if test "x$OPENJDK_TARGET_OS" = xbsd; then
1.1591 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
1.1592 - fi
1.1593 - if test "x$DEBUG_LEVEL" = xrelease; then
1.1594 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG"
1.1595 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.1596 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DTRIMMED"
1.1597 - fi
1.1598 - else
1.1599 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DDEBUG"
1.1600 - fi
1.1601 -
1.1602 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
1.1603 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
1.1604 -
1.1605 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
1.1606 - -I${JDK_OUTPUTDIR}/include \
1.1607 - -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
1.1608 - -I${JDK_TOPDIR}/src/share/javavm/export \
1.1609 - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
1.1610 - -I${JDK_TOPDIR}/src/share/native/common \
1.1611 - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
1.1612 -
1.1613 - # The shared libraries are compiled using the picflag.
1.1614 - CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
1.1615 - CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
1.1616 -
1.1617 - # Executable flags
1.1618 - CFLAGS_JDKEXE="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK"
1.1619 - CXXFLAGS_JDKEXE="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK"
1.1620 -
1.1621 - # Now this is odd. The JDK native libraries have to link against libjvm.so
1.1622 - # On 32-bit machines there is normally two distinct libjvm.so:s, client and server.
1.1623 - # Which should we link to? Are we lucky enough that the binary api to the libjvm.so library
1.1624 - # is identical for client and server? Yes. Which is picked at runtime (client or server)?
1.1625 - # Neither, since the chosen libjvm.so has already been loaded by the launcher, all the following
1.1626 - # libraries will link to whatever is in memory. Yuck.
1.1627 - #
1.1628 - # Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
1.1629 - if test "x$COMPILER_NAME" = xcl; then
1.1630 - LDFLAGS_JDK="$LDFLAGS_JDK -nologo -opt:ref -incremental:no"
1.1631 - if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.1632 - LDFLAGS_JDK="$LDFLAGS_JDK -safeseh"
1.1633 - fi
1.1634 - # TODO: make -debug optional "--disable-full-debug-symbols"
1.1635 - LDFLAGS_JDK="$LDFLAGS_JDK -debug"
1.1636 - LDFLAGS_JDKLIB="${LDFLAGS_JDK} -dll -libpath:${JDK_OUTPUTDIR}/lib"
1.1637 - LDFLAGS_JDKLIB_SUFFIX=""
1.1638 - if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
1.1639 - LDFLAGS_STACK_SIZE=1048576
1.1640 - else
1.1641 - LDFLAGS_STACK_SIZE=327680
1.1642 - fi
1.1643 - LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
1.1644 - else
1.1645 - if test "x$COMPILER_NAME" = xgcc; then
1.1646 - # If this is a --hash-style=gnu system, use --hash-style=both, why?
1.1647 - HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
1.1648 - if test -n "$HAS_GNU_HASH"; then
1.1649 - LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
1.1650 - fi
1.1651 - if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.1652 - # And since we now know that the linker is gnu, then add:
1.1653 - # -z defs, to forbid undefined symbols in object files
1.1654 - # -z noexecstack, to mark stack regions as non-executable
1.1655 - LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs -Xlinker -z -Xlinker noexecstack"
1.1656 - if test "x$DEBUG_LEVEL" = "xrelease"; then
1.1657 - # When building release libraries, tell the linker optimize them.
1.1658 - # Should this be supplied to the OSS linker as well?
1.1659 - LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
1.1660 - fi
1.1661 - fi
1.1662 - fi
1.1663 - LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
1.1664 - -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}"
1.1665 -
1.1666 - # On some platforms (mac) the linker warns about non existing -L dirs.
1.1667 - # Add server first if available. Linking aginst client does not always produce the same results.
1.1668 - # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1.
1.1669 - # Default to server for other variants.
1.1670 - if test "x$JVM_VARIANT_SERVER" = xtrue; then
1.1671 - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
1.1672 - elif test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.1673 - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client"
1.1674 - elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
1.1675 - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal"
1.1676 - else
1.1677 - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
1.1678 - fi
1.1679 -
1.1680 - LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm"
1.1681 - if test "x$COMPILER_NAME" = xossc; then
1.1682 - LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"
1.1683 - fi
1.1684 -
1.1685 - LDFLAGS_JDKEXE="${LDFLAGS_JDK}"
1.1686 - if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.1687 - LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
1.1688 - fi
1.1689 - fi
1.1690 -
1.1691 - AC_SUBST(CFLAGS_JDKLIB)
1.1692 - AC_SUBST(CFLAGS_JDKEXE)
1.1693 -
1.1694 - AC_SUBST(CXXFLAGS_JDKLIB)
1.1695 - AC_SUBST(CXXFLAGS_JDKEXE)
1.1696 -
1.1697 - AC_SUBST(LDFLAGS_JDKLIB)
1.1698 - AC_SUBST(LDFLAGS_JDKEXE)
1.1699 - AC_SUBST(LDFLAGS_JDKLIB_SUFFIX)
1.1700 - AC_SUBST(LDFLAGS_JDKEXE_SUFFIX)
1.1701 - AC_SUBST(LDFLAGS_CXX_JDK)
1.1702 -])
1.1703 -
1.1704 -
1.1705 -# TOOLCHAIN_C_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
1.1706 -# [RUN-IF-FALSE])
1.1707 -# ------------------------------------------------------------
1.1708 -# Check that the C compiler supports an argument
1.1709 -AC_DEFUN([TOOLCHAIN_C_COMPILER_CHECK_ARGUMENTS],
1.1710 -[
1.1711 - AC_MSG_CHECKING([if the C compiler supports "$1"])
1.1712 - supports=yes
1.1713 -
1.1714 - saved_cflags="$CFLAGS"
1.1715 - CFLAGS="$CFLAGS $1"
1.1716 - AC_LANG_PUSH([C])
1.1717 - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
1.1718 - [supports=no])
1.1719 - AC_LANG_POP([C])
1.1720 - CFLAGS="$saved_cflags"
1.1721 -
1.1722 - AC_MSG_RESULT([$supports])
1.1723 - if test "x$supports" = "xyes" ; then
1.1724 - m4_ifval([$2], [$2], [:])
1.1725 - else
1.1726 - m4_ifval([$3], [$3], [:])
1.1727 - fi
1.1728 -])
1.1729 -
1.1730 -# TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
1.1731 -# [RUN-IF-FALSE])
1.1732 -# ------------------------------------------------------------
1.1733 -# Check that the C++ compiler supports an argument
1.1734 -AC_DEFUN([TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS],
1.1735 -[
1.1736 - AC_MSG_CHECKING([if the C++ compiler supports "$1"])
1.1737 - supports=yes
1.1738 -
1.1739 - saved_cxxflags="$CXXFLAGS"
1.1740 - CXXFLAGS="$CXXFLAG $1"
1.1741 - AC_LANG_PUSH([C++])
1.1742 - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
1.1743 - [supports=no])
1.1744 - AC_LANG_POP([C++])
1.1745 - CXXFLAGS="$saved_cxxflags"
1.1746 -
1.1747 - AC_MSG_RESULT([$supports])
1.1748 - if test "x$supports" = "xyes" ; then
1.1749 - m4_ifval([$2], [$2], [:])
1.1750 - else
1.1751 - m4_ifval([$3], [$3], [:])
1.1752 - fi
1.1753 -])
1.1754 -
1.1755 -# TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
1.1756 -# [RUN-IF-FALSE])
1.1757 -# ------------------------------------------------------------
1.1758 -# Check that the C and C++ compilers support an argument
1.1759 -AC_DEFUN([TOOLCHAIN_COMPILER_CHECK_ARGUMENTS],
1.1760 -[
1.1761 - TOOLCHAIN_C_COMPILER_CHECK_ARGUMENTS([$1],
1.1762 - [C_COMP_SUPPORTS="yes"],
1.1763 - [C_COMP_SUPPORTS="no"])
1.1764 - TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS([$1],
1.1765 - [CXX_COMP_SUPPORTS="yes"],
1.1766 - [CXX_COMP_SUPPORTS="no"])
1.1767 -
1.1768 - AC_MSG_CHECKING([if both compilers support "$1"])
1.1769 - supports=no
1.1770 - if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
1.1771 -
1.1772 - AC_MSG_RESULT([$supports])
1.1773 - if test "x$supports" = "xyes" ; then
1.1774 - m4_ifval([$2], [$2], [:])
1.1775 - else
1.1776 - m4_ifval([$3], [$3], [:])
1.1777 - fi
1.1778 -])
1.1779 -
1.1780 -AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_MISC],
1.1781 -[
1.1782 - # Some Zero and Shark settings.
1.1783 - # ZERO_ARCHFLAG tells the compiler which mode to build for
1.1784 - case "${OPENJDK_TARGET_CPU}" in
1.1785 - s390)
1.1786 - ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
1.1787 - ;;
1.1788 - *)
1.1789 - ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.1790 - esac
1.1791 - TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$ZERO_ARCHFLAG], [], [ZERO_ARCHFLAG=""])
1.1792 - AC_SUBST(ZERO_ARCHFLAG)
1.1793 -
1.1794 - # Check that the compiler supports -mX (or -qX on AIX) flags
1.1795 - # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
1.1796 - TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}],
1.1797 - [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true],
1.1798 - [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
1.1799 - AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
1.1800 -
1.1801 -
1.1802 - # Check for broken SuSE 'ld' for which 'Only anonymous version tag is allowed in executable.'
1.1803 + # Check for broken SuSE 'ld' for which 'Only anonymous version tag is allowed
1.1804 + # in executable.'
1.1805 USING_BROKEN_SUSE_LD=no
1.1806 - if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$GCC" = xyes; then
1.1807 + if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$TOOLCHAIN_TYPE" = xgcc; then
1.1808 AC_MSG_CHECKING([for broken SuSE 'ld' which only understands anonymous version tags in executables])
1.1809 echo "SUNWprivate_1.1 { local: *; };" > version-script.map
1.1810 echo "int main() { }" > main.c
1.1811 @@ -1379,7 +844,7 @@
1.1812 AC_SUBST(USING_BROKEN_SUSE_LD)
1.1813 ])
1.1814
1.1815 -# Setup the JTREG paths
1.1816 +# Setup the JTReg Regression Test Harness.
1.1817 AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
1.1818 [
1.1819 AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg],
1.1820 @@ -1422,19 +887,3 @@
1.1821 AC_SUBST(JTREGEXE)
1.1822 ])
1.1823
1.1824 -AC_DEFUN_ONCE([TOOLCHAIN_SETUP_GCC6_COMPILER_FLAGS],
1.1825 -[
1.1826 - # These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code
1.1827 - # runs afoul of the more aggressive versions of these optimisations.
1.1828 - # Notably, value range propagation now assumes that the this pointer of C++
1.1829 - # member functions is non-null.
1.1830 - NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
1.1831 - TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror],
1.1832 - [], [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""])
1.1833 - AC_SUBST([NO_DELETE_NULL_POINTER_CHECKS_CFLAG])
1.1834 - NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse"
1.1835 - TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$NO_LIFETIME_DSE_CFLAG -Werror],
1.1836 - [], [NO_LIFETIME_DSE_CFLAG=""])
1.1837 - CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
1.1838 - AC_SUBST([NO_LIFETIME_DSE_CFLAG])
1.1839 -])
