make/autoconf/toolchain.m4
author dchuyko
Tue, 19 Jun 2018 18:18:46 +0300
changeset 50642 fff48b02d4a6
parent 49534 210cf224b690
child 51605 2ca553d34949
permissions -rw-r--r--
8198719: MethodHandleHelper.linkToStatic should drop MH arg Reviewed-by: vlivanov, dlong
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     1
#
49357
aaedb8343784 8198243: Add build time check for global operator new/delete in object files
erikj
parents: 48678
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
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    26
########################################################################
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
    27
# This file is responsible for detecting, verifying and setting up the
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
    28
# toolchain, i.e. the compiler, linker and related utilities. It will setup
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    29
# proper paths to the binaries, but it will not setup any flags.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    30
#
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
    31
# The binaries used is determined by the toolchain type, which is the family of
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    32
# compilers and related tools that are used.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    33
########################################################################
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    34
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    35
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    36
# All valid toolchains, regardless of platform (used by help.m4)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    37
VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    38
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    39
# These toolchains are valid on different platforms
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    40
VALID_TOOLCHAINS_linux="gcc clang"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    41
VALID_TOOLCHAINS_solaris="solstudio"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    42
VALID_TOOLCHAINS_macosx="gcc clang"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    43
VALID_TOOLCHAINS_aix="xlc"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    44
VALID_TOOLCHAINS_windows="microsoft"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    45
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    46
# Toolchain descriptions
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    47
TOOLCHAIN_DESCRIPTION_clang="clang/LLVM"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    48
TOOLCHAIN_DESCRIPTION_gcc="GNU Compiler Collection"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    49
TOOLCHAIN_DESCRIPTION_microsoft="Microsoft Visual Studio"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    50
TOOLCHAIN_DESCRIPTION_solstudio="Oracle Solaris Studio"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    51
TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    52
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    53
# Minimum supported versions, empty means unspecified
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    54
TOOLCHAIN_MINIMUM_VERSION_clang="3.2"
49200
a19a6228cdb2 8199405: Bump lowest supported gcc to 4.8
ihse
parents: 49199
diff changeset
    55
TOOLCHAIN_MINIMUM_VERSION_gcc="4.8"
42297
ebbd32ba8997 8170666: Test for microsoft compiler minimum version
ihse
parents: 42296
diff changeset
    56
TOOLCHAIN_MINIMUM_VERSION_microsoft="16.00.30319.01" # VS2010
39948
cfb05dbae510 8160825: Update minimum Solaris Studio compiler version to 5.13
sanzinger
parents: 39115
diff changeset
    57
TOOLCHAIN_MINIMUM_VERSION_solstudio="5.13"
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    58
TOOLCHAIN_MINIMUM_VERSION_xlc=""
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    59
49199
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
    60
# Minimum supported linker versions, empty means unspecified
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
    61
TOOLCHAIN_MINIMUM_LD_VERSION_gcc="2.18"
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
    62
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    63
# Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be called.
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    64
# Must have CC_VERSION_NUMBER and CXX_VERSION_NUMBER.
37864
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
    65
# $1 - optional variable prefix for compiler and version variables (BUILD_)
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
    66
# $2 - optional variable prefix for comparable variable (OPENJDK_BUILD_)
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    67
AC_DEFUN([TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS],
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    68
[
37864
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
    69
  if test "x[$]$1CC_VERSION_NUMBER" != "x[$]$1CXX_VERSION_NUMBER"; then
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
    70
    AC_MSG_WARN([C and C++ compiler have different version numbers, [$]$1CC_VERSION_NUMBER vs [$]$1CXX_VERSION_NUMBER.])
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    71
    AC_MSG_WARN([This typically indicates a broken setup, and is not supported])
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    72
  fi
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    73
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    74
  # We only check CC_VERSION_NUMBER since we assume CXX_VERSION_NUMBER is equal.
42297
ebbd32ba8997 8170666: Test for microsoft compiler minimum version
ihse
parents: 42296
diff changeset
    75
  if [ [[ "[$]$1CC_VERSION_NUMBER" =~ (.*\.){4} ]] ]; then
ebbd32ba8997 8170666: Test for microsoft compiler minimum version
ihse
parents: 42296
diff changeset
    76
    AC_MSG_WARN([C compiler version number has more than four parts (W.X.Y.Z): [$]$1CC_VERSION_NUMBER. Comparisons might be wrong.])
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    77
  fi
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    78
37864
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
    79
  if [ [[  "[$]$1CC_VERSION_NUMBER" =~ [0-9]{6} ]] ]; then
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
    80
    AC_MSG_WARN([C compiler version number has a part larger than 99999: [$]$1CC_VERSION_NUMBER. Comparisons might be wrong.])
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    81
  fi
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    82
42297
ebbd32ba8997 8170666: Test for microsoft compiler minimum version
ihse
parents: 42296
diff changeset
    83
  $2COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "[$]$1CC_VERSION_NUMBER"`
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    84
])
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    85
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    86
# Check if the configured compiler (C and C++) is of a specific version or
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    87
# newer. TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS must have been called before.
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    88
#
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    89
# Arguments:
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    90
#   VERSION:   The version string to check against the found version
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    91
#   IF_AT_LEAST:   block to run if the compiler is at least this version (>=)
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    92
#   IF_OLDER_THAN:   block to run if the compiler is older than this version (<)
37864
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
    93
#   PREFIX:   Optional variable prefix for compiler to compare version for (OPENJDK_BUILD_)
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    94
BASIC_DEFUN_NAMED([TOOLCHAIN_CHECK_COMPILER_VERSION],
37864
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
    95
    [*VERSION PREFIX IF_AT_LEAST IF_OLDER_THAN], [$@],
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    96
[
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    97
  # Need to assign to a variable since m4 is blocked from modifying parts in [].
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    98
  REFERENCE_VERSION=ARG_VERSION
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
    99
42297
ebbd32ba8997 8170666: Test for microsoft compiler minimum version
ihse
parents: 42296
diff changeset
   100
  if [ [[ "$REFERENCE_VERSION" =~ (.*\.){4} ]] ]; then
ebbd32ba8997 8170666: Test for microsoft compiler minimum version
ihse
parents: 42296
diff changeset
   101
    AC_MSG_ERROR([Internal error: Cannot compare to ARG_VERSION, only four parts (W.X.Y.Z) is supported])
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   102
  fi
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   103
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   104
  if [ [[ "$REFERENCE_VERSION" =~ [0-9]{6} ]] ]; then
36535
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 35747
diff changeset
   105
    AC_MSG_ERROR([Internal error: Cannot compare to ARG_VERSION, only parts < 99999 is supported])
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   106
  fi
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   107
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   108
  # Version comparison method inspired by http://stackoverflow.com/a/24067243
42297
ebbd32ba8997 8170666: Test for microsoft compiler minimum version
ihse
parents: 42296
diff changeset
   109
  COMPARABLE_REFERENCE_VERSION=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$REFERENCE_VERSION"`
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   110
37864
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
   111
  if test [$]ARG_PREFIX[COMPARABLE_ACTUAL_VERSION] -ge $COMPARABLE_REFERENCE_VERSION ; then
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   112
    :
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   113
    ARG_IF_AT_LEAST
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   114
  else
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   115
    :
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   116
    ARG_IF_OLDER_THAN
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   117
  fi
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   118
])
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   119
49199
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   120
# Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be called.
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   121
# Must have LD_VERSION_NUMBER.
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   122
# $1 - optional variable prefix for compiler and version variables (BUILD_)
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   123
# $2 - optional variable prefix for comparable variable (OPENJDK_BUILD_)
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   124
AC_DEFUN([TOOLCHAIN_PREPARE_FOR_LD_VERSION_COMPARISONS],
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   125
[
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   126
  if [ [[ "[$]$1LD_VERSION_NUMBER" =~ (.*\.){4} ]] ]; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   127
    AC_MSG_WARN([Linker version number has more than four parts (W.X.Y.Z): [$]$1LD_VERSION_NUMBER. Comparisons might be wrong.])
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   128
  fi
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   129
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   130
  if [ [[  "[$]$1LD_VERSION_NUMBER" =~ [0-9]{6} ]] ]; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   131
    AC_MSG_WARN([Linker version number has a part larger than 99999: [$]$1LD_VERSION_NUMBER. Comparisons might be wrong.])
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   132
  fi
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   133
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   134
  $2COMPARABLE_ACTUAL_LD_VERSION=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "[$]$1LD_VERSION_NUMBER"`
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   135
])
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   136
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   137
# Check if the configured linker is of a specific version or
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   138
# newer. TOOLCHAIN_PREPARE_FOR_LD_VERSION_COMPARISONS must have been called before.
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   139
#
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   140
# Arguments:
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   141
#   VERSION:   The version string to check against the found version
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   142
#   IF_AT_LEAST:   block to run if the compiler is at least this version (>=)
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   143
#   IF_OLDER_THAN:   block to run if the compiler is older than this version (<)
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   144
#   PREFIX:   Optional variable prefix for compiler to compare version for (OPENJDK_BUILD_)
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   145
BASIC_DEFUN_NAMED([TOOLCHAIN_CHECK_LINKER_VERSION],
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   146
    [*VERSION PREFIX IF_AT_LEAST IF_OLDER_THAN], [$@],
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   147
[
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   148
  # Need to assign to a variable since m4 is blocked from modifying parts in [].
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   149
  REFERENCE_VERSION=ARG_VERSION
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   150
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   151
  if [ [[ "$REFERENCE_VERSION" =~ (.*\.){4} ]] ]; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   152
    AC_MSG_ERROR([Internal error: Cannot compare to ARG_VERSION, only four parts (W.X.Y.Z) is supported])
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   153
  fi
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   154
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   155
  if [ [[ "$REFERENCE_VERSION" =~ [0-9]{6} ]] ]; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   156
    AC_MSG_ERROR([Internal error: Cannot compare to ARG_VERSION, only parts < 99999 is supported])
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   157
  fi
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   158
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   159
  # Version comparison method inspired by http://stackoverflow.com/a/24067243
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   160
  COMPARABLE_REFERENCE_VERSION=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$REFERENCE_VERSION"`
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   161
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   162
  if test [$]ARG_PREFIX[COMPARABLE_ACTUAL_LD_VERSION] -ge $COMPARABLE_REFERENCE_VERSION ; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   163
    :
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   164
    ARG_IF_AT_LEAST
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   165
  else
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   166
    :
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   167
    ARG_IF_OLDER_THAN
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   168
  fi
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   169
])
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   170
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   171
# Setup a number of variables describing how native output files are
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   172
# named on this platform/toolchain.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   173
AC_DEFUN([TOOLCHAIN_SETUP_FILENAME_PATTERNS],
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   174
[
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   175
  # Define filename patterns
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   176
  if test "x$OPENJDK_TARGET_OS" = xwindows; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   177
    LIBRARY_PREFIX=
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   178
    SHARED_LIBRARY_SUFFIX='.dll'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   179
    STATIC_LIBRARY_SUFFIX='.lib'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   180
    SHARED_LIBRARY='[$]1.dll'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   181
    STATIC_LIBRARY='[$]1.lib'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   182
    OBJ_SUFFIX='.obj'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   183
    EXE_SUFFIX='.exe'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   184
  else
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   185
    LIBRARY_PREFIX=lib
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   186
    SHARED_LIBRARY_SUFFIX='.so'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   187
    STATIC_LIBRARY_SUFFIX='.a'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   188
    SHARED_LIBRARY='lib[$]1.so'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   189
    STATIC_LIBRARY='lib[$]1.a'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   190
    OBJ_SUFFIX='.o'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   191
    EXE_SUFFIX=''
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   192
    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
33562
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 32810
diff changeset
   193
      # For full static builds, we're overloading the SHARED_LIBRARY
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 32810
diff changeset
   194
      # variables in order to limit the amount of changes required.
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 32810
diff changeset
   195
      # It would be better to remove SHARED and just use LIBRARY and
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34596
diff changeset
   196
      # LIBRARY_SUFFIX for libraries that can be built either
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34596
diff changeset
   197
      # shared or static and use STATIC_* for libraries that are
33562
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 32810
diff changeset
   198
      # always built statically.
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 32810
diff changeset
   199
      if test "x$STATIC_BUILD" = xtrue; then
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 32810
diff changeset
   200
        SHARED_LIBRARY='lib[$]1.a'
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 32810
diff changeset
   201
        SHARED_LIBRARY_SUFFIX='.a'
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 32810
diff changeset
   202
      else
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 32810
diff changeset
   203
        SHARED_LIBRARY='lib[$]1.dylib'
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 32810
diff changeset
   204
        SHARED_LIBRARY_SUFFIX='.dylib'
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents: 32810
diff changeset
   205
      fi
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   206
    fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   207
  fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   208
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   209
  AC_SUBST(LIBRARY_PREFIX)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   210
  AC_SUBST(SHARED_LIBRARY_SUFFIX)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   211
  AC_SUBST(STATIC_LIBRARY_SUFFIX)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   212
  AC_SUBST(SHARED_LIBRARY)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   213
  AC_SUBST(STATIC_LIBRARY)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   214
  AC_SUBST(OBJ_SUFFIX)
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   215
  AC_SUBST(EXE_SUFFIX)
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   216
])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   217
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   218
# Determine which toolchain type to use, and make sure it is valid for this
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   219
# platform. Setup various information about the selected toolchain.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   220
AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   221
[
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   222
  AC_ARG_WITH(toolchain-type, [AS_HELP_STRING([--with-toolchain-type],
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   223
      [the toolchain type (or family) to use, use '--help' to show possible values @<:@platform dependent@:>@])])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   224
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   225
  # Use indirect variable referencing
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   226
  toolchain_var_name=VALID_TOOLCHAINS_$OPENJDK_BUILD_OS
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   227
  VALID_TOOLCHAINS=${!toolchain_var_name}
23161
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22724
diff changeset
   228
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22724
diff changeset
   229
  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   230
    if test -n "$XCODEBUILD"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   231
      # On Mac OS X, default toolchain to clang after Xcode 5
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   232
      XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version 2>&1 | $HEAD -n 1`
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   233
      $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   234
      if test $? -ne 0; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   235
        AC_MSG_ERROR([Failed to determine Xcode version.])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   236
      fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   237
      XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   238
          $SED -e 's/^Xcode \(@<:@1-9@:>@@<:@0-9.@:>@*\)/\1/' | \
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   239
          $CUT -f 1 -d .`
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   240
      AC_MSG_NOTICE([Xcode major version: $XCODE_MAJOR_VERSION])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   241
      if test $XCODE_MAJOR_VERSION -ge 5; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   242
          DEFAULT_TOOLCHAIN="clang"
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   243
      else
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   244
          DEFAULT_TOOLCHAIN="gcc"
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   245
      fi
23161
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22724
diff changeset
   246
    else
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   247
      # If Xcode is not installed, but the command line tools are
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   248
      # then we can't run xcodebuild. On these systems we should
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   249
      # default to clang
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 24911
diff changeset
   250
      DEFAULT_TOOLCHAIN="clang"
23161
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22724
diff changeset
   251
    fi
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22724
diff changeset
   252
  else
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22724
diff changeset
   253
    # First toolchain type in the list is the default
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22724
diff changeset
   254
    DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22724
diff changeset
   255
  fi
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   256
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   257
  if test "x$with_toolchain_type" = xlist; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   258
    # List all toolchains
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   259
    AC_MSG_NOTICE([The following toolchains are valid on this platform:])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   260
    for toolchain in $VALID_TOOLCHAINS; do
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   261
      toolchain_var_name=TOOLCHAIN_DESCRIPTION_$toolchain
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   262
      TOOLCHAIN_DESCRIPTION=${!toolchain_var_name}
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   263
      $PRINTF "  %-10s  %s\n" $toolchain "$TOOLCHAIN_DESCRIPTION"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   264
    done
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   265
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   266
    exit 0
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   267
  elif test "x$with_toolchain_type" != x; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   268
    # User override; check that it is valid
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   269
    if test "x${VALID_TOOLCHAINS/$with_toolchain_type/}" = "x${VALID_TOOLCHAINS}"; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   270
      AC_MSG_NOTICE([Toolchain type $with_toolchain_type is not valid on this platform.])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   271
      AC_MSG_NOTICE([Valid toolchains: $VALID_TOOLCHAINS.])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   272
      AC_MSG_ERROR([Cannot continue.])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   273
    fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   274
    TOOLCHAIN_TYPE=$with_toolchain_type
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   275
  else
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   276
    # No flag given, use default
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   277
    TOOLCHAIN_TYPE=$DEFAULT_TOOLCHAIN
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   278
  fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   279
  AC_SUBST(TOOLCHAIN_TYPE)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   280
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   281
  TOOLCHAIN_CC_BINARY_clang="clang"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   282
  TOOLCHAIN_CC_BINARY_gcc="gcc"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   283
  TOOLCHAIN_CC_BINARY_microsoft="cl"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   284
  TOOLCHAIN_CC_BINARY_solstudio="cc"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   285
  TOOLCHAIN_CC_BINARY_xlc="xlc_r"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   286
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   287
  TOOLCHAIN_CXX_BINARY_clang="clang++"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   288
  TOOLCHAIN_CXX_BINARY_gcc="g++"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   289
  TOOLCHAIN_CXX_BINARY_microsoft="cl"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   290
  TOOLCHAIN_CXX_BINARY_solstudio="CC"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   291
  TOOLCHAIN_CXX_BINARY_xlc="xlC_r"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   292
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   293
  # Use indirect variable referencing
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   294
  toolchain_var_name=TOOLCHAIN_DESCRIPTION_$TOOLCHAIN_TYPE
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   295
  TOOLCHAIN_DESCRIPTION=${!toolchain_var_name}
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   296
  toolchain_var_name=TOOLCHAIN_MINIMUM_VERSION_$TOOLCHAIN_TYPE
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   297
  TOOLCHAIN_MINIMUM_VERSION=${!toolchain_var_name}
49199
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   298
  toolchain_var_name=TOOLCHAIN_MINIMUM_LD_VERSION_$TOOLCHAIN_TYPE
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   299
  TOOLCHAIN_MINIMUM_LD_VERSION=${!toolchain_var_name}
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   300
  toolchain_var_name=TOOLCHAIN_CC_BINARY_$TOOLCHAIN_TYPE
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   301
  TOOLCHAIN_CC_BINARY=${!toolchain_var_name}
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   302
  toolchain_var_name=TOOLCHAIN_CXX_BINARY_$TOOLCHAIN_TYPE
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   303
  TOOLCHAIN_CXX_BINARY=${!toolchain_var_name}
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   304
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   305
  TOOLCHAIN_SETUP_FILENAME_PATTERNS
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   306
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   307
  if test "x$TOOLCHAIN_TYPE" = "x$DEFAULT_TOOLCHAIN"; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   308
    AC_MSG_NOTICE([Using default toolchain $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION)])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   309
  else
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   310
    AC_MSG_NOTICE([Using user selected toolchain $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION). Default toolchain is $DEFAULT_TOOLCHAIN.])
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   311
  fi
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   312
])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   313
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   314
# Before we start detecting the toolchain executables, we might need some
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   315
# special setup, e.g. additional paths etc.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   316
AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   317
[
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   318
  # FIXME: Is this needed?
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   319
  AC_LANG(C++)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   320
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   321
  # Store the CFLAGS etc passed to the configure script.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   322
  ORG_CFLAGS="$CFLAGS"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   323
  ORG_CXXFLAGS="$CXXFLAGS"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   324
30022
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29866
diff changeset
   325
  # autoconf magic only relies on PATH, so update it if tools dir is specified
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29866
diff changeset
   326
  OLD_PATH="$PATH"
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29866
diff changeset
   327
22724
072f729936a9 8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents: 22721
diff changeset
   328
  # On Windows, we need to detect the visual studio installation first.
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   329
  # This will change the PATH, but we need to keep that new PATH even
22724
072f729936a9 8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents: 22721
diff changeset
   330
  # after toolchain detection is done, since the compiler (on x86) uses
072f729936a9 8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents: 22721
diff changeset
   331
  # it for DLL resolution in runtime.
30022
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29866
diff changeset
   332
  if test "x$OPENJDK_BUILD_OS" = "xwindows" \
362d77fbf008 8078437: Enable use of devkits for Windows
erikj
parents: 29866
diff changeset
   333
      && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
22724
072f729936a9 8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents: 22721
diff changeset
   334
    TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
23429
fe4f0848a307 8035751: Clean up Visual Studio detection logic
ihse
parents: 23428
diff changeset
   335
    # Reset path to VS_PATH. It will include everything that was on PATH at the time we
fe4f0848a307 8035751: Clean up Visual Studio detection logic
ihse
parents: 23428
diff changeset
   336
    # ran TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV.
fe4f0848a307 8035751: Clean up Visual Studio detection logic
ihse
parents: 23428
diff changeset
   337
    PATH="$VS_PATH"
fe4f0848a307 8035751: Clean up Visual Studio detection logic
ihse
parents: 23428
diff changeset
   338
    # The microsoft toolchain also requires INCLUDE and LIB to be set.
fe4f0848a307 8035751: Clean up Visual Studio detection logic
ihse
parents: 23428
diff changeset
   339
    export INCLUDE="$VS_INCLUDE"
fe4f0848a307 8035751: Clean up Visual Studio detection logic
ihse
parents: 23428
diff changeset
   340
    export LIB="$VS_LIB"
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34102
diff changeset
   341
  else
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   342
    if test "x$XCODE_VERSION_OUTPUT" != x; then
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   343
      # For Xcode, we set the Xcode version as TOOLCHAIN_VERSION
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   344
      TOOLCHAIN_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | $CUT -f 2 -d ' '`
48678
bcce1fa183e7 8196108: Add build support for VS 2015/2017
erikj
parents: 48032
diff changeset
   345
      TOOLCHAIN_DESCRIPTION="$TOOLCHAIN_DESCRIPTION from Xcode $TOOLCHAIN_VERSION"
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   346
    else
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   347
      # Currently we do not define this for other toolchains. This might change as the need arise.
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   348
      TOOLCHAIN_VERSION=
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   349
    fi
22724
072f729936a9 8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents: 22721
diff changeset
   350
  fi
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34102
diff changeset
   351
  AC_SUBST(TOOLCHAIN_VERSION)
22724
072f729936a9 8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents: 22721
diff changeset
   352
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   353
  # Finally add TOOLCHAIN_PATH at the beginning, to allow --with-tools-dir to
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   354
  # override all other locations.
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23161
diff changeset
   355
  if test "x$TOOLCHAIN_PATH" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23161
diff changeset
   356
    PATH=$TOOLCHAIN_PATH:$PATH
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   357
  fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   358
])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   359
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   360
# Restore path, etc
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   361
AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   362
[
39928
8448cfeb0f1d 8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents: 39115
diff changeset
   363
  # Restore old path, except for the microsoft toolchain, which requires VS_PATH
8448cfeb0f1d 8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents: 39115
diff changeset
   364
  # to remain in place. Otherwise the compiler will not work in some siutations
8448cfeb0f1d 8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents: 39115
diff changeset
   365
  # in later configure checks.
8448cfeb0f1d 8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents: 39115
diff changeset
   366
  if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then
8448cfeb0f1d 8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents: 39115
diff changeset
   367
    PATH="$OLD_PATH"
8448cfeb0f1d 8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents: 39115
diff changeset
   368
  fi
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   369
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   370
  # Restore the flags to the user specified values.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   371
  # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   372
  CFLAGS="$ORG_CFLAGS"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   373
  CXXFLAGS="$ORG_CXXFLAGS"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   374
])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   375
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   376
# Check if a compiler is of the toolchain type we expect, and save the version
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   377
# information from it. If the compiler does not match the expected type,
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   378
# this function will abort using AC_MSG_ERROR. If it matches, the version will
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   379
# be stored in CC_VERSION_NUMBER/CXX_VERSION_NUMBER (as a dotted number), and
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   380
# the full version string in CC_VERSION_STRING/CXX_VERSION_STRING.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   381
#
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   382
# $1 = compiler to test (CC or CXX)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   383
# $2 = human readable name of compiler (C or C++)
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   384
AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   385
[
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   386
  COMPILER=[$]$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   387
  COMPILER_NAME=$2
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   388
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   389
  if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   390
    # cc -V output typically looks like
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   391
    #     cc: Sun C 5.12 Linux_i386 2011/11/16
42294
d8c997ec29fe 8164304: JDK should build with Oracle Developer Studio
erikj
parents: 41040
diff changeset
   392
    # or
d8c997ec29fe 8164304: JDK should build with Oracle Developer Studio
erikj
parents: 41040
diff changeset
   393
    #     cc: Studio 12.5 Sun C 5.14 SunOS_sparc 2016/05/31
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   394
    COMPILER_VERSION_OUTPUT=`$COMPILER -V 2>&1`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   395
    # Check that this is likely to be the Solaris Studio cc.
42294
d8c997ec29fe 8164304: JDK should build with Oracle Developer Studio
erikj
parents: 41040
diff changeset
   396
    $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.* Sun $COMPILER_NAME" > /dev/null
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   397
    if test $? -ne 0; then
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   398
      ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   399
      AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   400
      AC_MSG_NOTICE([The result from running with -V was: "$COMPILER_VERSION_OUTPUT"])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   401
      AC_MSG_NOTICE([The result from running with --version was: "$ALT_VERSION_OUTPUT"])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   402
      AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   403
    fi
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   404
    # Remove usage instructions (if present), and
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   405
    # collapse compiler output into a single line
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   406
    COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   407
        $SED -e 's/ *@<:@Uu@:>@sage:.*//'`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   408
    COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   409
        $SED -e "s/^.*@<:@ ,\t@:>@$COMPILER_NAME@<:@ ,\t@:>@\(@<:@1-9@:>@\.@<:@0-9@:>@@<:@0-9@:>@*\).*/\1/"`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   410
  elif test  "x$TOOLCHAIN_TYPE" = xxlc; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   411
    # xlc -qversion output typically looks like
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   412
    #     IBM XL C/C++ for AIX, V11.1 (5724-X13)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   413
    #     Version: 11.01.0000.0015
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   414
    COMPILER_VERSION_OUTPUT=`$COMPILER -qversion 2>&1`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   415
    # Check that this is likely to be the IBM XL C compiler.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   416
    $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "IBM XL C" > /dev/null
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   417
    if test $? -ne 0; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   418
      ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   419
      AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   420
      AC_MSG_NOTICE([The result from running with -qversion was: "$COMPILER_VERSION_OUTPUT"])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   421
      AC_MSG_NOTICE([The result from running with --version was: "$ALT_VERSION_OUTPUT"])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   422
      AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   423
    fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   424
    # Collapse compiler output into a single line
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   425
    COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   426
    COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   427
        $SED -e 's/^.*, V\(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   428
  elif test  "x$TOOLCHAIN_TYPE" = xmicrosoft; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   429
    # There is no specific version flag, but all output starts with a version string.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   430
    # First line typically looks something like:
20362
5f8289bfda3e 8023611: Win32 and win64: Remove all the WARNINGS in JDK 8 builds for Windows 2008 and MSVS 2010 SP1
tbell
parents: 19763
diff changeset
   431
    # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   432
    COMPILER_VERSION_OUTPUT=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   433
    # Check that this is likely to be Microsoft CL.EXE.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   434
    $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Microsoft.*Compiler" > /dev/null
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   435
    if test $? -ne 0; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   436
      AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   437
      AC_MSG_NOTICE([The result from running it was: "$COMPILER_VERSION_OUTPUT"])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   438
      AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   439
    fi
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   440
    # Collapse compiler output into a single line
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   441
    COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   442
    COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   443
        $SED -e 's/^.*ersion.\(@<:@1-9@:>@@<:@0-9.@:>@*\) .*$/\1/'`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   444
  elif test  "x$TOOLCHAIN_TYPE" = xgcc; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   445
    # gcc --version output typically looks like
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   446
    #     gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   447
    #     Copyright (C) 2013 Free Software Foundation, Inc.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   448
    #     This is free software; see the source for copying conditions.  There is NO
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   449
    #     warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   450
    COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   451
    # Check that this is likely to be GCC.
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   452
    $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Free Software Foundation" > /dev/null
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   453
    if test $? -ne 0; then
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   454
      AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   455
      AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION"])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   456
      AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   457
    fi
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   458
    # Remove Copyright and legalese from version string, and
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   459
    # collapse into a single line
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   460
    COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   461
        $SED -e 's/ *Copyright .*//'`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   462
    COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
36535
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 35747
diff changeset
   463
        $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'`
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   464
  elif test  "x$TOOLCHAIN_TYPE" = xclang; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   465
    # clang --version output typically looks like
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   466
    #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   467
    #    clang version 3.3 (tags/RELEASE_33/final)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   468
    # or
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   469
    #    Debian clang version 3.2-7ubuntu1 (tags/RELEASE_32/final) (based on LLVM 3.2)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   470
    #    Target: x86_64-pc-linux-gnu
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   471
    #    Thread model: posix
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   472
    COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   473
    # Check that this is likely to be clang
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   474
    $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "clang" > /dev/null
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   475
    if test $? -ne 0; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   476
      AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   477
      AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_OUTPUT"])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   478
      AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   479
    fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   480
    # Collapse compiler output into a single line
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   481
    COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   482
    COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   483
        $SED -e 's/^.* version \(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'`
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   484
  else
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   485
      AC_MSG_ERROR([Unknown toolchain type $TOOLCHAIN_TYPE.])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   486
  fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   487
  # This sets CC_VERSION_NUMBER or CXX_VERSION_NUMBER. (This comment is a grep marker)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   488
  $1_VERSION_NUMBER="$COMPILER_VERSION_NUMBER"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   489
  # This sets CC_VERSION_STRING or CXX_VERSION_STRING. (This comment is a grep marker)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   490
  $1_VERSION_STRING="$COMPILER_VERSION_STRING"
17664
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
   491
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   492
  AC_MSG_NOTICE([Using $TOOLCHAIN_TYPE $COMPILER_NAME compiler version $COMPILER_VERSION_NUMBER @<:@$COMPILER_VERSION_STRING@:>@])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   493
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   494
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   495
# Try to locate the given C or C++ compiler in the path, or otherwise.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   496
#
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   497
# $1 = compiler to test (CC or CXX)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   498
# $2 = human readable name of compiler (C or C++)
43918
6d31a727d6c1 8077113: Configure script do not properly detect cross-compilation gcc
erikj
parents: 42297
diff changeset
   499
# $3 = compiler name to search for
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   500
AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   501
[
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   502
  COMPILER_NAME=$2
22458
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   503
  SEARCH_LIST="$3"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   504
22458
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   505
  if test "x[$]$1" != x; then
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   506
    # User has supplied compiler name already, always let that override.
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   507
    AC_MSG_NOTICE([Will use user supplied compiler $1=[$]$1])
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   508
    if test "x`basename [$]$1`" = "x[$]$1"; then
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   509
      # A command without a complete path is provided, search $PATH.
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   510
22458
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   511
      AC_PATH_PROGS(POTENTIAL_$1, [$]$1)
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   512
      if test "x$POTENTIAL_$1" != x; then
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   513
        $1=$POTENTIAL_$1
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   514
      else
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   515
        AC_MSG_ERROR([User supplied compiler $1=[$]$1 could not be found])
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   516
      fi
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   517
    else
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   518
      # Otherwise it might already be a complete path
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   519
      if test ! -x "[$]$1"; then
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   520
        AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist])
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   521
      fi
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   522
    fi
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   523
  else
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   524
    # No user supplied value. Locate compiler ourselves.
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   525
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   526
    # If we are cross compiling, assume cross compilation tools follows the
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   527
    # cross compilation standard where they are prefixed with the autoconf
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   528
    # standard name for the target. For example the binary
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   529
    # i686-sun-solaris2.10-gcc will cross compile for i686-sun-solaris2.10.
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   530
    # If we are not cross compiling, then the default compiler name will be
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   531
    # used.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   532
22458
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   533
    $1=
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23161
diff changeset
   534
    # If TOOLCHAIN_PATH is set, check for all compiler names in there first
22458
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   535
    # before checking the rest of the PATH.
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   536
    # FIXME: Now that we prefix the TOOLS_DIR to the PATH in the PRE_DETECTION
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   537
    # step, this should not be necessary.
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23161
diff changeset
   538
    if test -n "$TOOLCHAIN_PATH"; then
22458
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   539
      PATH_save="$PATH"
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23161
diff changeset
   540
      PATH="$TOOLCHAIN_PATH"
43918
6d31a727d6c1 8077113: Configure script do not properly detect cross-compilation gcc
erikj
parents: 42297
diff changeset
   541
      AC_PATH_TOOL(TOOLCHAIN_PATH_$1, $SEARCH_LIST)
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23161
diff changeset
   542
      $1=$TOOLCHAIN_PATH_$1
22458
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   543
      PATH="$PATH_save"
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   544
    fi
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   545
43918
6d31a727d6c1 8077113: Configure script do not properly detect cross-compilation gcc
erikj
parents: 42297
diff changeset
   546
    # AC_PATH_TOOL can't be run multiple times with the same variable,
22458
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   547
    # so create a new name for this run.
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   548
    if test "x[$]$1" = x; then
43918
6d31a727d6c1 8077113: Configure script do not properly detect cross-compilation gcc
erikj
parents: 42297
diff changeset
   549
      AC_PATH_TOOL(POTENTIAL_$1, $SEARCH_LIST)
22458
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   550
      $1=$POTENTIAL_$1
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   551
    fi
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   552
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   553
    if test "x[$]$1" = x; then
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   554
      HELP_MSG_MISSING_DEPENDENCY([devkit])
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   555
      AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG])
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   556
    fi
14614
3bb0a6b81bb9 8003945: build-infra: problems finding compiler when using --with-dev-kit
erikj
parents: 14467
diff changeset
   557
  fi
3bb0a6b81bb9 8003945: build-infra: problems finding compiler when using --with-dev-kit
erikj
parents: 14467
diff changeset
   558
22458
6a74da13c52f 8022411: Allow overriding of CXX and CC with absolute path
ihse
parents: 22179
diff changeset
   559
  # Now we have a compiler binary in $1. Make sure it's okay.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   560
  BASIC_FIXUP_EXECUTABLE($1)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   561
  TEST_COMPILER="[$]$1"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   562
35371
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   563
  AC_MSG_CHECKING([resolved symbolic links for $1])
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   564
  SYMLINK_ORIGINAL="$TEST_COMPILER"
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   565
  BASIC_REMOVE_SYMBOLIC_LINKS(SYMLINK_ORIGINAL)
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   566
  if test "x$TEST_COMPILER" = "x$SYMLINK_ORIGINAL"; then
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   567
    AC_MSG_RESULT([no symlink])
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   568
  else
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   569
    AC_MSG_RESULT([$SYMLINK_ORIGINAL])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   570
35371
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   571
    # We can't handle ccache by gcc wrappers, since we need to know if we're
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   572
    # using ccache. Instead ccache usage must be controlled by a configure option.
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   573
    COMPILER_BASENAME=`$BASENAME "$SYMLINK_ORIGINAL"`
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   574
    if test "x$COMPILER_BASENAME" = "xccache"; then
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   575
      AC_MSG_NOTICE([Please use --enable-ccache instead of providing a wrapped compiler.])
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   576
      AC_MSG_ERROR([$TEST_COMPILER is a symbolic link to ccache. This is not supported.])
7deccee1f94e 8148351: Only display resolved symlink for compiler, do not change path
ihse
parents: 34923
diff changeset
   577
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   578
  fi
22179
59d2bd4620b0 8031668: TOOLCHAIN_FIND_COMPILER unexpectedly resolves symbolic links
mduigou
parents: 22035
diff changeset
   579
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   580
  TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   581
])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   582
49199
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   583
# Retrieve the linker version number and store it in LD_VERSION_NUMBER
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   584
# (as a dotted number), and
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   585
# the full version string in LD_VERSION_STRING.
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   586
#
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   587
# $1 = linker to test (LD or BUILD_LD)
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   588
# $2 = human readable name of linker (Linker or BuildLinker)
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   589
AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   590
[
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   591
  LINKER=[$]$1
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   592
  LINKER_NAME=$2
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   593
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   594
  if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   595
    # cc -Wl,-V output typically looks like
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   596
    #   ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.2329
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   597
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   598
    # solstudio cc requires us to have an existing file to pass as argument,
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   599
    # but it need not be a syntactically correct C file, so just use
49514
25695fce1601 8200267: a.out created at top dir by Solaris build
ihse
parents: 49412
diff changeset
   600
    # ourself. :) The intermediate 'cat' is needed to stop ld from leaving
25695fce1601 8200267: a.out created at top dir by Solaris build
ihse
parents: 49412
diff changeset
   601
    # a lingering a.out (!).
25695fce1601 8200267: a.out created at top dir by Solaris build
ihse
parents: 49412
diff changeset
   602
    LINKER_VERSION_STRING=`$LD -Wl,-V $TOPDIR/configure 2>&1 | $CAT | $HEAD -n 1 | $SED -e 's/ld: //'`
49199
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   603
    # Extract version number
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   604
    [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   605
        $SED -e 's/.* \([0-9][0-9]*\.[0-9][0-9]*\)-\([0-9][0-9]*\.[0-9][0-9]*\)/\1.\2/'` ]
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   606
  elif test  "x$TOOLCHAIN_TYPE" = xxlc; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   607
    LINKER_VERSION_STRING="Unknown"
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   608
    LINKER_VERSION_NUMBER="0.0"
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   609
  elif test  "x$TOOLCHAIN_TYPE" = xmicrosoft; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   610
    # There is no specific version flag, but all output starts with a version string.
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   611
    # First line typically looks something like:
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   612
    #   Microsoft (R) Incremental Linker Version 12.00.31101.0
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   613
    LINKER_VERSION_STRING=`$LD 2>&1 | $HEAD -n 1 | $TR -d '\r'`
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   614
    # Extract version number
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   615
    [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   616
        $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*/\1/'` ]
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   617
  elif test  "x$TOOLCHAIN_TYPE" = xgcc; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   618
    # gcc -Wl,-version output typically looks like
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   619
    #   GNU ld (GNU Binutils for Ubuntu) 2.26.1
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   620
    #   Copyright (C) 2015 Free Software Foundation, Inc.
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   621
    #   This program is free software; [...]
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   622
    LINKER_VERSION_STRING=`$LD -Wl,-version 2>&1 | $HEAD -n 1`
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   623
    # Extract version number
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   624
    [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   625
        $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*/\1/'` ]
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   626
  elif test  "x$TOOLCHAIN_TYPE" = xclang; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   627
    # clang -Wl,-v output typically looks like
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   628
    #   @(#)PROGRAM:ld  PROJECT:ld64-305
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   629
    #   configured to support archs: armv6 armv7 armv7s arm64 i386 x86_64 x86_64h armv6m armv7k armv7m armv7em (tvOS)
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   630
    #   Library search paths: [...]
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   631
    # or
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   632
    #   GNU ld (GNU Binutils for Ubuntu) 2.26.1
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   633
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   634
    LINKER_VERSION_STRING=`$LD -Wl,-v 2>&1 | $HEAD -n 1`
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   635
    # Check if we're using the GNU ld
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   636
    $ECHO "$LINKER_VERSION_STRING" | $GREP "GNU" > /dev/null
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   637
    if test $? -eq 0; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   638
      # Extract version number
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   639
      [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   640
          $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*/\1/'` ]
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   641
    else
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   642
      # Extract version number
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   643
      [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   644
          $SED -e 's/.*-\([0-9][0-9]*\)/\1/'` ]
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   645
    fi
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   646
  fi
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   647
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   648
  $1_VERSION_NUMBER="$LINKER_VERSION_NUMBER"
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   649
  $1_VERSION_STRING="$LINKER_VERSION_STRING"
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   650
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   651
  AC_MSG_NOTICE([Using $TOOLCHAIN_TYPE $LINKER_NAME version $LINKER_VERSION_NUMBER @<:@$LINKER_VERSION_STRING@:>@])
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   652
])
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   653
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   654
# Detect the core components of the toolchain, i.e. the compilers (CC and CXX),
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   655
# preprocessor (CPP and CXXCPP), the linker (LD), the assembler (AS) and the
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   656
# archiver (AR). Verify that the compilers are correct according to the
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   657
# toolchain type.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   658
AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   659
[
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   660
  #
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   661
  # Setup the compilers (CC and CXX)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   662
  #
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   663
  TOOLCHAIN_FIND_COMPILER([CC], [C], $TOOLCHAIN_CC_BINARY)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   664
  # Now that we have resolved CC ourself, let autoconf have its go at it
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   665
  AC_PROG_CC([$CC])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   666
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   667
  TOOLCHAIN_FIND_COMPILER([CXX], [C++], $TOOLCHAIN_CXX_BINARY)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   668
  # Now that we have resolved CXX ourself, let autoconf have its go at it
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   669
  AC_PROG_CXX([$CXX])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   670
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   671
  # This is the compiler version number on the form X.Y[.Z]
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   672
  AC_SUBST(CC_VERSION_NUMBER)
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   673
  AC_SUBST(CXX_VERSION_NUMBER)
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   674
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   675
  TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   676
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   677
  if test "x$TOOLCHAIN_MINIMUM_VERSION" != x; then
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   678
    TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: $TOOLCHAIN_MINIMUM_VERSION,
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   679
        IF_OLDER_THAN: [
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   680
          AC_MSG_WARN([You are using $TOOLCHAIN_TYPE older than $TOOLCHAIN_MINIMUM_VERSION. This is not a supported configuration.])
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   681
        ]
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   682
    )
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   683
  fi
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35371
diff changeset
   684
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   685
  #
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   686
  # Setup the preprocessor (CPP and CXXCPP)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   687
  #
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   688
  AC_PROG_CPP
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   689
  BASIC_FIXUP_EXECUTABLE(CPP)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   690
  AC_PROG_CXXCPP
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   691
  BASIC_FIXUP_EXECUTABLE(CXXCPP)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   692
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   693
  #
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   694
  # Setup the linker (LD)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   695
  #
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   696
  if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   697
    # In the Microsoft toolchain we have a separate LD command "link".
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   698
    # Make sure we reject /usr/bin/link (as determined in CYGWIN_LINK), which is
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   699
    # a cygwin program for something completely different.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   700
    AC_CHECK_PROG([LD], [link],[link],,, [$CYGWIN_LINK])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   701
    BASIC_FIXUP_EXECUTABLE(LD)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   702
    # Verify that we indeed succeeded with this trick.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   703
    AC_MSG_CHECKING([if the found link.exe is actually the Visual Studio linker])
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   704
    "$LD" --version > /dev/null
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   705
    if test $? -eq 0 ; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   706
      AC_MSG_RESULT([no])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   707
      AC_MSG_ERROR([This is the Cygwin link tool. Please check your PATH and rerun configure.])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   708
    else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   709
      AC_MSG_RESULT([yes])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   710
    fi
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   711
    LDCXX="$LD"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   712
  else
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   713
    # All other toolchains use the compiler to link.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   714
    LD="$CC"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   715
    LDCXX="$CXX"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   716
  fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   717
  AC_SUBST(LD)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   718
  # FIXME: it should be CXXLD, according to standard (cf CXXCPP)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   719
  AC_SUBST(LDCXX)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   720
49199
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   721
  TOOLCHAIN_EXTRACT_LD_VERSION([LD], [linker])
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   722
  TOOLCHAIN_PREPARE_FOR_LD_VERSION_COMPARISONS
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   723
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   724
  if test "x$TOOLCHAIN_MINIMUM_LD_VERSION" != x; then
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   725
    TOOLCHAIN_CHECK_LINKER_VERSION(VERSION: $TOOLCHAIN_MINIMUM_LD_VERSION,
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   726
        IF_OLDER_THAN: [
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   727
          AC_MSG_WARN([You are using a linker older than $TOOLCHAIN_MINIMUM_LD_VERSION. This is not a supported configuration.])
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   728
        ]
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   729
    )
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   730
  fi
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   731
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   732
  #
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   733
  # Setup the assembler (AS)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   734
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   735
  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22473
diff changeset
   736
    BASIC_PATH_PROGS(AS, as)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   737
    BASIC_FIXUP_EXECUTABLE(AS)
39115
1f71a5d2b20b 8081676: Verify that configure detects AS on Solaris and print help otherwise
tbell
parents: 38843
diff changeset
   738
    if test "x$AS" = x; then
1f71a5d2b20b 8081676: Verify that configure detects AS on Solaris and print help otherwise
tbell
parents: 38843
diff changeset
   739
      AC_MSG_ERROR([Solaris assembler (as) is required. Please install via "pkg install pkg:/developer/assembler".])
1f71a5d2b20b 8081676: Verify that configure detects AS on Solaris and print help otherwise
tbell
parents: 38843
diff changeset
   740
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   741
  else
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   742
    # FIXME: is this correct for microsoft?
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   743
    AS="$CC -c"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   744
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   745
  AC_SUBST(AS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   746
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   747
  #
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   748
  # Setup the archiver (AR)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   749
  #
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   750
  if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   751
    # The corresponding ar tool is lib.exe (used to create static libraries)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   752
    AC_CHECK_PROG([AR], [lib],[lib],,,)
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   753
  elif test "x$TOOLCHAIN_TYPE" = xgcc; then
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   754
    BASIC_CHECK_TOOLS(AR, ar gcc-ar)
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   755
  else
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   756
    BASIC_CHECK_TOOLS(AR, ar)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   757
  fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   758
  BASIC_FIXUP_EXECUTABLE(AR)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   759
])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   760
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   761
# Setup additional tools that is considered a part of the toolchain, but not the
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   762
# core part. Many of these are highly platform-specific and do not exist,
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   763
# and/or are not needed on all platforms.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   764
AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   765
[
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   766
  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   767
    BASIC_PATH_PROGS(LIPO, lipo)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   768
    BASIC_FIXUP_EXECUTABLE(LIPO)
48032
9240097e2821 8139653: Freetype bundled on macosx, but not correctly linked
erikj
parents: 47258
diff changeset
   769
    BASIC_REQUIRE_PROGS(OTOOL, otool)
9240097e2821 8139653: Freetype bundled on macosx, but not correctly linked
erikj
parents: 47258
diff changeset
   770
    BASIC_FIXUP_EXECUTABLE(OTOOL)
9240097e2821 8139653: Freetype bundled on macosx, but not correctly linked
erikj
parents: 47258
diff changeset
   771
    BASIC_REQUIRE_PROGS(INSTALL_NAME_TOOL, install_name_tool)
9240097e2821 8139653: Freetype bundled on macosx, but not correctly linked
erikj
parents: 47258
diff changeset
   772
    BASIC_FIXUP_EXECUTABLE(INSTALL_NAME_TOOL)
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   773
  fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   774
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   775
  if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   776
    AC_CHECK_PROG([MT], [mt], [mt],,, [/usr/bin/mt])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   777
    BASIC_FIXUP_EXECUTABLE(MT)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   778
    # Setup the resource compiler (RC)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   779
    AC_CHECK_PROG([RC], [rc], [rc],,, [/usr/bin/rc])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   780
    BASIC_FIXUP_EXECUTABLE(RC)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   781
    AC_CHECK_PROG([DUMPBIN], [dumpbin], [dumpbin],,,)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   782
    BASIC_FIXUP_EXECUTABLE(DUMPBIN)
26400
4d6c6f2df610 8057538: Build the freetype library during configure on Windows
simonis
parents: 25034
diff changeset
   783
    # We need to check for 'msbuild.exe' because at the place where we expect to
4d6c6f2df610 8057538: Build the freetype library during configure on Windows
simonis
parents: 25034
diff changeset
   784
    # find 'msbuild.exe' there's also a directory called 'msbuild' and configure
4d6c6f2df610 8057538: Build the freetype library during configure on Windows
simonis
parents: 25034
diff changeset
   785
    # won't find the 'msbuild.exe' executable in that case (and the
4d6c6f2df610 8057538: Build the freetype library during configure on Windows
simonis
parents: 25034
diff changeset
   786
    # 'ac_executable_extensions' is unusable due to performance reasons).
4d6c6f2df610 8057538: Build the freetype library during configure on Windows
simonis
parents: 25034
diff changeset
   787
    # Notice that we intentionally don't fix up the path to MSBUILD because we
4d6c6f2df610 8057538: Build the freetype library during configure on Windows
simonis
parents: 25034
diff changeset
   788
    # will call it in a DOS shell during freetype detection on Windows (see
4d6c6f2df610 8057538: Build the freetype library during configure on Windows
simonis
parents: 25034
diff changeset
   789
    # 'LIB_SETUP_FREETYPE' in "libraries.m4"
4d6c6f2df610 8057538: Build the freetype library during configure on Windows
simonis
parents: 25034
diff changeset
   790
    AC_CHECK_PROG([MSBUILD], [msbuild.exe], [msbuild.exe],,,)
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   791
  fi
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   792
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   793
  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   794
    BASIC_PATH_PROGS(STRIP, strip)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   795
    BASIC_FIXUP_EXECUTABLE(STRIP)
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22473
diff changeset
   796
    BASIC_PATH_PROGS(NM, nm)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   797
    BASIC_FIXUP_EXECUTABLE(NM)
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22473
diff changeset
   798
    BASIC_PATH_PROGS(GNM, gnm)
16582
61f0b8f48036 8006288: build-infra: Use solaris nm and not gnm on solaris
erikj
parents: 15912
diff changeset
   799
    BASIC_FIXUP_EXECUTABLE(GNM)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   800
  elif test "x$OPENJDK_TARGET_OS" != xwindows; then
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   801
    # FIXME: we should unify this with the solaris case above.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   802
    BASIC_CHECK_TOOLS(STRIP, strip)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   803
    BASIC_FIXUP_EXECUTABLE(STRIP)
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   804
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   805
      BASIC_CHECK_TOOLS(NM, nm gcc-nm)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   806
    else
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   807
      BASIC_CHECK_TOOLS(NM, nm)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   808
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   809
    BASIC_FIXUP_EXECUTABLE(NM)
16582
61f0b8f48036 8006288: build-infra: Use solaris nm and not gnm on solaris
erikj
parents: 15912
diff changeset
   810
    GNM="$NM"
61f0b8f48036 8006288: build-infra: Use solaris nm and not gnm on solaris
erikj
parents: 15912
diff changeset
   811
    AC_SUBST(GNM)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   812
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   813
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   814
  # objcopy is used for moving debug symbols to separate files when
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   815
  # full debug symbols are enabled.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   816
  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22473
diff changeset
   817
    BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
14464
b82a851468d0 8003300: build-infra: fails on solaris when objcopy is not found
tbell
parents: 14112
diff changeset
   818
    # Only call fixup if objcopy was found.
b82a851468d0 8003300: build-infra: fails on solaris when objcopy is not found
tbell
parents: 14112
diff changeset
   819
    if test -n "$OBJCOPY"; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   820
      BASIC_FIXUP_EXECUTABLE(OBJCOPY)
32462
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   821
      if test "x$OPENJDK_BUILD_OS" = xsolaris; then
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   822
        # objcopy prior to 2.21.1 on solaris is broken and is not usable.
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   823
        # Rewrite objcopy version output to VALID_VERSION or BAD_VERSION.
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   824
        # - version number is last blank separate word on first line
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   825
        # - version number formats that have been seen:
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   826
        #   - <major>.<minor>
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   827
        #   - <major>.<minor>.<micro>
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   828
        OBJCOPY_VERSION=`$OBJCOPY --version | $HEAD -n 1`
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   829
        # The outer [ ] is to prevent m4 from eating the [] in the sed expression.
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   830
        [ OBJCOPY_VERSION_CHECK=`$ECHO $OBJCOPY_VERSION | $SED -n \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   831
              -e 's/.* //' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   832
              -e '/^[01]\./b bad' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   833
              -e '/^2\./{' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   834
              -e '  s/^2\.//' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   835
              -e '  /^[0-9]$/b bad' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   836
              -e '  /^[0-9]\./b bad' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   837
              -e '  /^1[0-9]$/b bad' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   838
              -e '  /^1[0-9]\./b bad' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   839
              -e '  /^20\./b bad' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   840
              -e '  /^21\.0$/b bad' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   841
              -e '  /^21\.0\./b bad' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   842
              -e '}' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   843
              -e ':good' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   844
              -e 's/.*/VALID_VERSION/p' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   845
              -e 'q' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   846
              -e ':bad' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   847
              -e 's/.*/BAD_VERSION/p' \
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   848
              -e 'q'` ]
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   849
        if test "x$OBJCOPY_VERSION_CHECK" = xBAD_VERSION; then
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   850
          OBJCOPY=
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   851
          AC_MSG_WARN([Ignoring found objcopy since it is broken (prior to 2.21.1). No debug symbols will be generated.])
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   852
          AC_MSG_NOTICE([objcopy reports version $OBJCOPY_VERSION])
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   853
          AC_MSG_NOTICE([Note: patch 149063-01 or newer contains the correct Solaris 10 SPARC version])
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   854
          AC_MSG_NOTICE([Note: patch 149064-01 or newer contains the correct Solaris 10 X86 version])
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   855
          AC_MSG_NOTICE([Note: Solaris 11 Update 1 contains the correct version])
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   856
        fi
f236112ab3d0 8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents: 30096
diff changeset
   857
      fi
14464
b82a851468d0 8003300: build-infra: fails on solaris when objcopy is not found
tbell
parents: 14112
diff changeset
   858
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   859
  fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   860
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22473
diff changeset
   861
  BASIC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   862
  if test "x$OBJDUMP" != x; then
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   863
    # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   864
    # bails if argument is missing.
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   865
    BASIC_FIXUP_EXECUTABLE(OBJDUMP)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   866
  fi
49357
aaedb8343784 8198243: Add build time check for global operator new/delete in object files
erikj
parents: 48678
diff changeset
   867
aaedb8343784 8198243: Add build time check for global operator new/delete in object files
erikj
parents: 48678
diff changeset
   868
  case $TOOLCHAIN_TYPE in
aaedb8343784 8198243: Add build time check for global operator new/delete in object files
erikj
parents: 48678
diff changeset
   869
    gcc|clang|solstudio)
aaedb8343784 8198243: Add build time check for global operator new/delete in object files
erikj
parents: 48678
diff changeset
   870
      BASIC_CHECK_TOOLS(CXXFILT, [c++filt])
aaedb8343784 8198243: Add build time check for global operator new/delete in object files
erikj
parents: 48678
diff changeset
   871
      BASIC_CHECK_NONEMPTY(CXXFILT)
aaedb8343784 8198243: Add build time check for global operator new/delete in object files
erikj
parents: 48678
diff changeset
   872
      BASIC_FIXUP_EXECUTABLE(CXXFILT)
aaedb8343784 8198243: Add build time check for global operator new/delete in object files
erikj
parents: 48678
diff changeset
   873
      ;;
aaedb8343784 8198243: Add build time check for global operator new/delete in object files
erikj
parents: 48678
diff changeset
   874
  esac
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   875
])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   876
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   877
# Setup the build tools (i.e, the compiler and linker used to build programs
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   878
# that should be run on the build platform, not the target platform, as a build
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   879
# helper). Since the non-cross-compile case uses the normal, target compilers
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   880
# for this, we can only do this after these have been setup.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   881
AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   882
[
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   883
  if test "x$COMPILE_TYPE" = "xcross"; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   884
    # Now we need to find a C/C++ compiler that can build executables for the
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   885
    # build platform. We can't use the AC_PROG_CC macro, since it can only be
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   886
    # used once. Also, we need to do this without adding a tools dir to the
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   887
    # path, otherwise we might pick up cross-compilers which don't use standard
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   888
    # naming.
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23429
diff changeset
   889
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   890
    OLDPATH="$PATH"
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   891
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   892
    AC_ARG_WITH(build-devkit, [AS_HELP_STRING([--with-build-devkit],
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   893
        [Devkit to use for the build platform toolchain])])
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   894
    if test "x$with_build_devkit" = "xyes"; then
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   895
      AC_MSG_ERROR([--with-build-devkit must have a value])
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   896
    elif test -n "$with_build_devkit"; then
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   897
      if test ! -d "$with_build_devkit"; then
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   898
        AC_MSG_ERROR([--with-build-devkit points to non existing dir: $with_build_devkit])
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   899
      else
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   900
        BASIC_FIXUP_PATH([with_build_devkit])
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   901
        BUILD_DEVKIT_ROOT="$with_build_devkit"
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   902
        # Check for a meta data info file in the root of the devkit
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   903
        if test -f "$BUILD_DEVKIT_ROOT/devkit.info"; then
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   904
          # Process devkit.info so that existing devkit variables are not
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   905
          # modified by this
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   906
          $SED -e "s/^DEVKIT_/BUILD_DEVKIT_/g" \
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   907
              -e "s/\$DEVKIT_ROOT/\$BUILD_DEVKIT_ROOT/g" \
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   908
              -e "s/\$host/\$build/g" \
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   909
              $BUILD_DEVKIT_ROOT/devkit.info \
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   910
              > $CONFIGURESUPPORT_OUTPUTDIR/build-devkit.info
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   911
          . $CONFIGURESUPPORT_OUTPUTDIR/build-devkit.info
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   912
          # This potentially sets the following:
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   913
          # A descriptive name of the devkit
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   914
          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_NAME])
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   915
          # Corresponds to --with-extra-path
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   916
          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_EXTRA_PATH])
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   917
          # Corresponds to --with-toolchain-path
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   918
          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_TOOLCHAIN_PATH])
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   919
          # Corresponds to --with-sysroot
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   920
          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_SYSROOT])
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   921
          # Skip the Window specific parts
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   922
        fi
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   923
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   924
        AC_MSG_CHECKING([for build platform devkit])
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   925
        if test "x$BUILD_DEVKIT_NAME" != x; then
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   926
          AC_MSG_RESULT([$BUILD_DEVKIT_NAME in $BUILD_DEVKIT_ROOT])
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   927
        else
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   928
          AC_MSG_RESULT([$BUILD_DEVKIT_ROOT])
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   929
        fi
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   930
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   931
        BUILD_SYSROOT="$BUILD_DEVKIT_SYSROOT"
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   932
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   933
         # Fallback default of just /bin if DEVKIT_PATH is not defined
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   934
        if test "x$BUILD_DEVKIT_TOOLCHAIN_PATH" = x; then
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   935
          BUILD_DEVKIT_TOOLCHAIN_PATH="$BUILD_DEVKIT_ROOT/bin"
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   936
        fi
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   937
        PATH="$BUILD_DEVKIT_TOOLCHAIN_PATH:$BUILD_DEVKIT_EXTRA_PATH"
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   938
      fi
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   939
    fi
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   940
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   941
    # FIXME: we should list the discovered compilers as an exclude pattern!
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   942
    # If we do that, we can do this detection before POST_DETECTION, and still
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   943
    # find the build compilers in the tools dir, if needed.
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   944
    BASIC_REQUIRE_PROGS(BUILD_CC, [cl cc gcc])
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   945
    BASIC_FIXUP_EXECUTABLE(BUILD_CC)
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   946
    BASIC_REQUIRE_PROGS(BUILD_CXX, [cl CC g++])
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   947
    BASIC_FIXUP_EXECUTABLE(BUILD_CXX)
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   948
    BASIC_PATH_PROGS(BUILD_NM, nm gcc-nm)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   949
    BASIC_FIXUP_EXECUTABLE(BUILD_NM)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   950
    BASIC_PATH_PROGS(BUILD_AR, ar gcc-ar)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   951
    BASIC_FIXUP_EXECUTABLE(BUILD_AR)
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35747
diff changeset
   952
    BASIC_PATH_PROGS(BUILD_OBJCOPY, objcopy)
17612cee3530 8142968: Module System implementation
alanb
parents: 35747
diff changeset
   953
    BASIC_FIXUP_EXECUTABLE(BUILD_OBJCOPY)
17612cee3530 8142968: Module System implementation
alanb
parents: 35747
diff changeset
   954
    BASIC_PATH_PROGS(BUILD_STRIP, strip)
17612cee3530 8142968: Module System implementation
alanb
parents: 35747
diff changeset
   955
    BASIC_FIXUP_EXECUTABLE(BUILD_STRIP)
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   956
    # Assume the C compiler is the assembler
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   957
    BUILD_AS="$BUILD_CC -c"
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   958
    # Just like for the target compiler, use the compiler as linker
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   959
    BUILD_LD="$BUILD_CC"
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34102
diff changeset
   960
    BUILD_LDCXX="$BUILD_CXX"
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   961
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 32810
diff changeset
   962
    PATH="$OLDPATH"
37864
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
   963
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
   964
    TOOLCHAIN_EXTRACT_COMPILER_VERSION(BUILD_CC, [BuildC])
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
   965
    TOOLCHAIN_EXTRACT_COMPILER_VERSION(BUILD_CXX, [BuildC++])
5284b5a9fdc7 8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents: 37402
diff changeset
   966
    TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS([BUILD_], [OPENJDK_BUILD_])
49199
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   967
    TOOLCHAIN_EXTRACT_LD_VERSION(BUILD_LD, [build linker])
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   968
    TOOLCHAIN_PREPARE_FOR_LD_VERSION_COMPARISONS([BUILD_], [OPENJDK_BUILD_])
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   969
  else
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   970
    # If we are not cross compiling, use the normal target compilers for
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   971
    # building the build platform executables.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   972
    BUILD_CC="$CC"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   973
    BUILD_CXX="$CXX"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   974
    BUILD_LD="$LD"
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34102
diff changeset
   975
    BUILD_LDCXX="$LDCXX"
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   976
    BUILD_NM="$NM"
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   977
    BUILD_AS="$AS"
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35747
diff changeset
   978
    BUILD_OBJCOPY="$OBJCOPY"
17612cee3530 8142968: Module System implementation
alanb
parents: 35747
diff changeset
   979
    BUILD_STRIP="$STRIP"
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   980
    BUILD_AR="$AR"
42296
671fe155ec14 8170651: Remove legacy hotspot compiler setup
ihse
parents: 42294
diff changeset
   981
39936
552923792fd8 8156980: Hotspot build doesn't have -std=gnu++98 gcc option
andrew
parents: 39115
diff changeset
   982
    TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS([], [OPENJDK_BUILD_])
49199
986249df86ce 8199403: Require binutils 2.18 or newer
ihse
parents: 49120
diff changeset
   983
    TOOLCHAIN_PREPARE_FOR_LD_VERSION_COMPARISONS([BUILD_], [OPENJDK_BUILD_])
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   984
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   985
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   986
  AC_SUBST(BUILD_CC)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   987
  AC_SUBST(BUILD_CXX)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   988
  AC_SUBST(BUILD_LD)
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34102
diff changeset
   989
  AC_SUBST(BUILD_LDCXX)
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   990
  AC_SUBST(BUILD_NM)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   991
  AC_SUBST(BUILD_AS)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33568
diff changeset
   992
  AC_SUBST(BUILD_AR)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   993
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   994
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   995
# Do some additional checks on the detected tools.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   996
AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   997
[
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   998
  # The package path is used only on macosx?
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   999
  # FIXME: clean this up, and/or move it elsewhere.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1000
  PACKAGE_PATH=/opt/local
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1001
  AC_SUBST(PACKAGE_PATH)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1002
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1003
  # Check for extra potential brokenness.
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1004
  if test  "x$TOOLCHAIN_TYPE" = xmicrosoft; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1005
    # On Windows, double-check that we got the right compiler.
22724
072f729936a9 8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents: 22721
diff changeset
  1006
    CC_VERSION_OUTPUT=`$CC 2>&1 | $HEAD -n 1 | $TR -d '\r'`
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1007
    COMPILER_CPU_TEST=`$ECHO $CC_VERSION_OUTPUT | $SED -n "s/^.* \(.*\)$/\1/p"`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1008
    if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
28901
5acc0ec03d06 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27594
diff changeset
  1009
      if test "x$COMPILER_CPU_TEST" != "x80x86" -a "x$COMPILER_CPU_TEST" != "xx86"; then
5acc0ec03d06 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27594
diff changeset
  1010
        AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86" or "x86".])
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1011
      fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1012
    elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1013
      if test "x$COMPILER_CPU_TEST" != "xx64"; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1014
        AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "x64".])
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1015
      fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1016
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
  1017
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1018
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1019
  if test "x$TOOLCHAIN_TYPE" = xgcc; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1020
    # If this is a --hash-style=gnu system, use --hash-style=both, why?
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1021
    HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1022
    # This is later checked when setting flags.
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
  1023
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
  1024
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
  1025
  # Setup hotspot lecagy names for toolchains
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
  1026
  HOTSPOT_TOOLCHAIN_TYPE=$TOOLCHAIN_TYPE
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
  1027
  if test "x$TOOLCHAIN_TYPE" = xclang; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
  1028
    HOTSPOT_TOOLCHAIN_TYPE=gcc
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
  1029
  elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
  1030
    HOTSPOT_TOOLCHAIN_TYPE=sparcWorks
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
  1031
  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
  1032
    HOTSPOT_TOOLCHAIN_TYPE=visCPP
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
  1033
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
  1034
  AC_SUBST(HOTSPOT_TOOLCHAIN_TYPE)
16987
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
  1035
])
17593
de6741d8a142 8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents: 16988
diff changeset
  1036
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
  1037
# Setup the JTReg Regression Test Harness.
17664
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1038
AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1039
[
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1040
  AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg],
45104
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1041
      [Regression Test Harness @<:@probed@:>@])])
17664
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1042
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1043
  if test "x$with_jtreg" = xno; then
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1044
    # jtreg disabled
45104
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1045
    AC_MSG_CHECKING([for jtreg test harness])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1046
    AC_MSG_RESULT([no, disabled])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1047
  elif test "x$with_jtreg" != xyes && test "x$with_jtreg" != x; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1048
    # An explicit path is specified, use it.
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1049
    JT_HOME="$with_jtreg"
47258
4bfce39946ba 8180897: Explicit --with-jtreg path not expanded
ihse
parents: 47216
diff changeset
  1050
    BASIC_FIXUP_PATH([JT_HOME])
45104
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1051
    if test ! -d "$JT_HOME"; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1052
      AC_MSG_ERROR([jtreg home directory from --with-jtreg=$with_jtreg does not exist])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1053
    fi
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1054
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1055
    if test ! -e "$JT_HOME/lib/jtreg.jar"; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1056
      AC_MSG_ERROR([jtreg home directory from --with-jtreg=$with_jtreg is not a valid jtreg home])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1057
    fi
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1058
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1059
    JTREGEXE="$JT_HOME/bin/jtreg"
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1060
    if test ! -x "$JTREGEXE"; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1061
      AC_MSG_ERROR([jtreg home directory from --with-jtreg=$with_jtreg does not contain valid jtreg executable])
17593
de6741d8a142 8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents: 16988
diff changeset
  1062
    fi
17664
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1063
45104
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1064
    AC_MSG_CHECKING([for jtreg test harness])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1065
    AC_MSG_RESULT([$JT_HOME])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1066
  else
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1067
    # Try to locate jtreg
17664
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1068
    if test "x$JT_HOME" != x; then
45104
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1069
      # JT_HOME set in environment, use it
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1070
      if test ! -d "$JT_HOME"; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1071
        AC_MSG_WARN([Ignoring JT_HOME pointing to invalid directory: $JT_HOME])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1072
        JT_HOME=
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1073
      else
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1074
        if test ! -e "$JT_HOME/lib/jtreg.jar"; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1075
          AC_MSG_WARN([Ignoring JT_HOME which is not a valid jtreg home: $JT_HOME])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1076
          JT_HOME=
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1077
        elif test ! -x "$JT_HOME/bin/jtreg"; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1078
          AC_MSG_WARN([Ignoring JT_HOME which does not contain valid jtreg executable: $JT_HOME])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1079
          JT_HOME=
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1080
        else
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1081
          JTREGEXE="$JT_HOME/bin/jtreg"
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1082
          AC_MSG_NOTICE([Located jtreg using JT_HOME from environment])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1083
        fi
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1084
      fi
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1085
    fi
17664
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1086
45104
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1087
    if test "x$JT_HOME" = x; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1088
      # JT_HOME is not set in environment, or was deemed invalid.
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1089
      # Try to find jtreg on path
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1090
      BASIC_PATH_PROGS(JTREGEXE, jtreg)
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1091
      if test "x$JTREGEXE" != x; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1092
        # That's good, now try to derive JT_HOME
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1093
        JT_HOME=`(cd $($DIRNAME $JTREGEXE)/.. && pwd)`
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1094
        if test ! -e "$JT_HOME/lib/jtreg.jar"; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1095
          AC_MSG_WARN([Ignoring jtreg from path since a valid jtreg home cannot be found])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1096
          JT_HOME=
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1097
          JTREGEXE=
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1098
        else
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1099
          AC_MSG_NOTICE([Located jtreg using jtreg executable in path])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1100
        fi
17664
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1101
      fi
45104
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1102
    fi
17664
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1103
45104
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1104
    AC_MSG_CHECKING([for jtreg test harness])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1105
    if test "x$JT_HOME" != x; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1106
      AC_MSG_RESULT([$JT_HOME])
17664
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1107
    else
45104
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1108
      AC_MSG_RESULT([no, not found])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1109
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1110
      if test "x$with_jtreg" = xyes; then
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1111
        AC_MSG_ERROR([--with-jtreg was specified, but no jtreg found.])
b8a6cd8674d1 8180281: --with-jtreg is broken for many use cases
ihse
parents: 43918
diff changeset
  1112
      fi
17664
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1113
    fi
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1114
  fi
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1115
45106
c74e98882464 8180342: Fixup path for jtreg
ihse
parents: 45104
diff changeset
  1116
  BASIC_FIXUP_EXECUTABLE(JTREGEXE)
c74e98882464 8180342: Fixup path for jtreg
ihse
parents: 45104
diff changeset
  1117
  BASIC_FIXUP_PATH(JT_HOME)
17664
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1118
  AC_SUBST(JT_HOME)
2cb42641740b 8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents: 17593
diff changeset
  1119
  AC_SUBST(JTREGEXE)
17593
de6741d8a142 8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents: 16988
diff changeset
  1120
])
46196
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1121
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1122
# Setup the JIB dependency resolver
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1123
AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JIB],
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1124
[
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1125
  AC_ARG_WITH(jib, [AS_HELP_STRING([--with-jib],
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1126
      [Jib dependency management tool @<:@not used@:>@])])
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1127
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1128
  if test "x$with_jib" = xno || test "x$with_jib" = x; then
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1129
    # jib disabled
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1130
    AC_MSG_CHECKING([for jib])
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1131
    AC_MSG_RESULT(no)
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1132
  elif test "x$with_jib" = xyes; then
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1133
    AC_MSG_ERROR([Must supply a value to --with-jib])
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1134
  else
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1135
    JIB_HOME="${with_jib}"
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1136
    AC_MSG_CHECKING([for jib])
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1137
    AC_MSG_RESULT(${JIB_HOME})
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1138
    if test ! -d "${JIB_HOME}"; then
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1139
      AC_MSG_ERROR([--with-jib must be a directory])
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1140
    fi
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1141
    JIB_JAR=$(ls ${JIB_HOME}/lib/jib-*.jar)
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1142
    if test ! -f "${JIB_JAR}"; then
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1143
      AC_MSG_ERROR([Could not find jib jar file in ${JIB_HOME}])
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1144
    fi
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1145
  fi
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1146
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1147
  AC_SUBST(JIB_JAR)
822ca950ddaa 8175300: Enable artifact resolution for jtreg tests
ctornqvi
parents: 42297
diff changeset
  1148
])