common/autoconf/hotspot.m4
author simonis
Tue, 19 Apr 2016 13:19:41 +0200
changeset 37953 195cce402934
parent 37402 62b5f067032e
child 37960 191954418adf
permissions -rw-r--r--
8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11 Reviewed-by: erikj
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
#
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35365
diff changeset
     2
# Copyright (c) 2011, 2016, 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
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    26
# All valid JVM features, regardless of platform
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    27
VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    28
    fprof vm-structs jni-check services management all-gcs nmt cds static-build"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    29
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    30
# All valid JVM variants
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    31
VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    32
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    33
###############################################################################
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    34
# Check if the specified JVM variant should be built. To be used in shell if
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    35
# constructs, like this:
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    36
# if HOTSPOT_CHECK_JVM_VARIANT(server); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    37
#
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    38
# Only valid to use after HOTSPOT_SETUP_JVM_VARIANTS has setup variants.
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    39
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    40
# Definition kept in one line to allow inlining in if statements.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    41
# Additional [] needed to keep m4 from mangling shell constructs.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    42
AC_DEFUN([HOTSPOT_CHECK_JVM_VARIANT],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    43
[ [ [[ " $JVM_VARIANTS " =~ " $1 " ]] ] ])
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    44
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34495
diff changeset
    45
###############################################################################
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    46
# Check if the specified JVM features are explicitly enabled. To be used in
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    47
# shell if constructs, like this:
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    48
# if HOTSPOT_CHECK_JVM_FEATURE(jvmti); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    49
#
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    50
# Only valid to use after HOTSPOT_SETUP_JVM_FEATURES has setup features.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    51
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    52
# Definition kept in one line to allow inlining in if statements.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    53
# Additional [] needed to keep m4 from mangling shell constructs.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    54
AC_DEFUN([HOTSPOT_CHECK_JVM_FEATURE],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    55
[ [ [[ " $JVM_FEATURES " =~ " $1 " ]] ] ])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    56
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    57
###############################################################################
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    58
# Check which variants of the JVM that we want to build. Available variants are:
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    59
#   server: normal interpreter, and a tiered C1/C2 compiler
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    60
#   client: normal interpreter, and C1 (no C2 compiler)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    61
#   minimal: reduced form of client with optional features stripped out
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    62
#   core: normal interpreter only, no compiler
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    63
#   zero: C++ based interpreter only, no compiler
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    64
#   zeroshark: C++ based interpreter, and a llvm-based compiler
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    65
#   custom: baseline JVM with no default features
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    66
#
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34495
diff changeset
    67
AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    68
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    69
  AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    70
      [JVM variants (separated by commas) to build (server,client,minimal,core,zero,zeroshark,custom) @<:@server@:>@])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    71
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    72
  if test "x$with_jvm_variants" = x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    73
    with_jvm_variants="server"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    74
  fi
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    75
  JVM_VARIANTS_OPT="$with_jvm_variants"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    76
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    77
  # Has the user listed more than one variant?
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    78
  # Additional [] needed to keep m4 from mangling shell constructs.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    79
  if [ [[ "$JVM_VARIANTS_OPT" =~ "," ]] ]; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    80
    BUILDING_MULTIPLE_JVM_VARIANTS=true
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    81
  else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    82
    BUILDING_MULTIPLE_JVM_VARIANTS=false
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    83
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    84
  # Replace the commas with AND for use in the build directory name.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    85
  JVM_VARIANTS_WITH_AND=`$ECHO "$JVM_VARIANTS_OPT" | $SED -e 's/,/AND/g'`
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    86
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    87
  AC_MSG_CHECKING([which variants of the JVM to build])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    88
  # JVM_VARIANTS is a space-separated list.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    89
  # Also use minimal, not minimal1 (which is kept for backwards compatibility).
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    90
  JVM_VARIANTS=`$ECHO $JVM_VARIANTS_OPT | $SED -e 's/,/ /g' -e 's/minimal1/minimal/'`
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    91
  AC_MSG_RESULT([$JVM_VARIANTS])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    92
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    93
  # Check that the selected variants are valid
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    94
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    95
  # grep filter function inspired by a comment to http://stackoverflow.com/a/1617326
37953
195cce402934 8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents: 37402
diff changeset
    96
  # Notice that the original variant failes on SLES 10 and 11
195cce402934 8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents: 37402
diff changeset
    97
  NEEDLE=${VALID_JVM_VARIANTS// /$'\n'}
195cce402934 8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents: 37402
diff changeset
    98
  STACK=${JVM_VARIANTS// /$'\n'}
195cce402934 8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents: 37402
diff changeset
    99
  INVALID_VARIANTS=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"`
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   100
  if test "x$INVALID_VARIANTS" != x; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   101
    AC_MSG_NOTICE([Unknown variant(s) specified: $INVALID_VARIANTS])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   102
    AC_MSG_ERROR([The available JVM variants are: $VALID_JVM_VARIANTS])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   103
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   104
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   105
  # All "special" variants share the same output directory ("server")
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   106
  VALID_MULTIPLE_JVM_VARIANTS="server client minimal"
37953
195cce402934 8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents: 37402
diff changeset
   107
  NEEDLE=${VALID_MULTIPLE_JVM_VARIANTS// /$'\n'}
195cce402934 8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents: 37402
diff changeset
   108
  STACK=${JVM_VARIANTS// /$'\n'}
195cce402934 8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents: 37402
diff changeset
   109
  INVALID_MULTIPLE_VARIANTS=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"`
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   110
  if  test "x$INVALID_MULTIPLE_VARIANTS" != x && test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = xtrue; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   111
    AC_MSG_ERROR([You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS.])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   112
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   113
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   114
  AC_SUBST(JVM_VARIANTS)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   115
  AC_SUBST(VALID_JVM_VARIANTS)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   116
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   117
  if HOTSPOT_CHECK_JVM_VARIANT(zero) || HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   118
    # zero behaves as a platform and rewrites these values. This is really weird. :(
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   119
    # We are guaranteed that we do not build any other variants when building zero.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   120
    HOTSPOT_TARGET_CPU=zero
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   121
    HOTSPOT_TARGET_CPU_ARCH=zero
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   122
  fi
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   123
])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   124
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   125
###############################################################################
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   126
# Check if dtrace should be enabled and has all prerequisites present.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   127
#
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   128
AC_DEFUN_ONCE([HOTSPOT_SETUP_DTRACE],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   129
[
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   130
  # Test for dtrace dependencies
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   131
  AC_ARG_ENABLE([dtrace], [AS_HELP_STRING([--enable-dtrace@<:@=yes/no/auto@:>@],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   132
      [enable dtrace. Default is auto, where dtrace is enabled if all dependencies
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   133
      are present.])])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   134
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   135
  DTRACE_DEP_MISSING=false
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   136
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   137
  AC_MSG_CHECKING([for dtrace tool])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   138
  if test "x$DTRACE" != "x" && test -x "$DTRACE"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   139
    AC_MSG_RESULT([$DTRACE])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   140
  else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   141
    AC_MSG_RESULT([not found, cannot build dtrace])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   142
    DTRACE_DEP_MISSING=true
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   143
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   144
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   145
  AC_CHECK_HEADERS([sys/sdt.h], [DTRACE_HEADERS_OK=yes],[DTRACE_HEADERS_OK=no])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   146
  if test "x$DTRACE_HEADERS_OK" != "xyes"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   147
    DTRACE_DEP_MISSING=true
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   148
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   149
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   150
  AC_MSG_CHECKING([if dtrace should be built])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   151
  if test "x$enable_dtrace" = "xyes"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   152
    if test "x$DTRACE_DEP_MISSING" = "xtrue"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   153
      AC_MSG_RESULT([no, missing dependencies])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   154
      HELP_MSG_MISSING_DEPENDENCY([dtrace])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   155
      AC_MSG_ERROR([Cannot enable dtrace with missing dependencies. See above. $HELP_MSG])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   156
    else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   157
      INCLUDE_DTRACE=true
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   158
      AC_MSG_RESULT([yes, forced])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   159
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   160
  elif test "x$enable_dtrace" = "xno"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   161
    INCLUDE_DTRACE=false
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   162
    AC_MSG_RESULT([no, forced])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   163
  elif test "x$enable_dtrace" = "xauto" || test "x$enable_dtrace" = "x"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   164
    if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK" != "xtrue"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   165
      INCLUDE_DTRACE=false
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   166
      AC_MSG_RESULT([no, non-open linux build])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   167
    elif test "x$DTRACE_DEP_MISSING" = "xtrue"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   168
      INCLUDE_DTRACE=false
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   169
      AC_MSG_RESULT([no, missing dependencies])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   170
    else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   171
      INCLUDE_DTRACE=true
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   172
      AC_MSG_RESULT([yes, dependencies present])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   173
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   174
  else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   175
    AC_MSG_ERROR([Invalid value for --enable-dtrace: $enable_dtrace])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   176
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   177
  AC_SUBST(INCLUDE_DTRACE)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   178
])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   179
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   180
###############################################################################
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   181
# Set up all JVM features for each JVM variant.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   182
#
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   183
AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   184
[
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   185
  # The user can in some cases supply additional jvm features. For the custom
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   186
  # variant, this defines the entire variant.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   187
  AC_ARG_WITH([jvm-features], [AS_HELP_STRING([--with-jvm-features],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   188
      [additional JVM features to enable (separated by comma),  use '--help' to show possible values @<:@none@:>@])])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   189
  if test "x$with_jvm_features" != x; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   190
    AC_MSG_CHECKING([additional JVM features])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   191
    JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   192
    AC_MSG_RESULT([$JVM_FEATURES])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   193
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   194
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   195
  # Verify that dependencies are met for explicitly set features.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   196
  if HOTSPOT_CHECK_JVM_FEATURE(jvmti) && ! HOTSPOT_CHECK_JVM_FEATURE(services); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   197
    AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services'])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   198
  fi
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   199
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   200
  if HOTSPOT_CHECK_JVM_FEATURE(management) && ! HOTSPOT_CHECK_JVM_FEATURE(nmt); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   201
    AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt'])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   202
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   203
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   204
  if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! HOTSPOT_CHECK_JVM_FEATURE(compiler2); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   205
    AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2'])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   206
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   207
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   208
  if HOTSPOT_CHECK_JVM_FEATURE(compiler2) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   209
    AC_MSG_ERROR([Specified JVM feature 'compiler2' requires feature 'all-gcs'])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   210
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   211
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   212
  if HOTSPOT_CHECK_JVM_FEATURE(vm-structs) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   213
    AC_MSG_ERROR([Specified JVM feature 'vm-structs' requires feature 'all-gcs'])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   214
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   215
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   216
  # Turn on additional features based on other parts of configure
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   217
  if test "x$INCLUDE_DTRACE" = "xtrue"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   218
    JVM_FEATURES="$JVM_FEATURES dtrace"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   219
  else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   220
    if HOTSPOT_CHECK_JVM_FEATURE(dtrace); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   221
      AC_MSG_ERROR([To enable dtrace, you must use --enable-dtrace])
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   222
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   223
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   224
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   225
  if test "x$STATIC_BUILD" = "xtrue"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   226
    JVM_FEATURES="$JVM_FEATURES static-build"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   227
  else
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   228
    if HOTSPOT_CHECK_JVM_FEATURE(static-build); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   229
      AC_MSG_ERROR([To enable static-build, you must use --enable-static-build])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   230
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   231
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   232
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   233
  if ! HOTSPOT_CHECK_JVM_VARIANT(zero) && ! HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   234
    if HOTSPOT_CHECK_JVM_FEATURE(zero); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   235
      AC_MSG_ERROR([To enable zero/zeroshark, you must use --with-jvm-variants=zero/zeroshark])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   236
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   237
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   238
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   239
  if ! HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   240
    if HOTSPOT_CHECK_JVM_FEATURE(shark); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   241
      AC_MSG_ERROR([To enable shark, you must use --with-jvm-variants=zeroshark])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   242
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   243
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   244
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   245
  # Only enable jvmci on x86_64, sparcv9 and aarch64, and only on server.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   246
  if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   247
      test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   248
      test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   249
    JVM_FEATURES_jvmci="jvmci"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   250
  else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   251
    JVM_FEATURES_jvmci=""
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   252
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   253
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   254
  # All variants but minimal (and custom) get these features
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   255
  NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   256
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   257
  # Enable features depending on variant.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   258
  JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   259
  JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   260
  JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   261
  JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   262
  JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   263
  JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   264
  JVM_FEATURES_custom="$JVM_FEATURES"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   265
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   266
  AC_SUBST(JVM_FEATURES_server)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   267
  AC_SUBST(JVM_FEATURES_client)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   268
  AC_SUBST(JVM_FEATURES_core)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   269
  AC_SUBST(JVM_FEATURES_minimal)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   270
  AC_SUBST(JVM_FEATURES_zero)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   271
  AC_SUBST(JVM_FEATURES_zeroshark)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   272
  AC_SUBST(JVM_FEATURES_custom)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   273
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   274
  # Used for verification of Makefiles by check-jvm-feature
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   275
  AC_SUBST(VALID_JVM_FEATURES)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   276
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   277
  # We don't support --with-jvm-interpreter anymore, use zero instead.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   278
  BASIC_DEPRECATED_ARG_WITH(jvm-interpreter)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   279
])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   280
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   281
###############################################################################
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   282
# Validate JVM features once all setup is complete, including custom setup.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   283
#
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   284
AC_DEFUN_ONCE([HOTSPOT_VALIDATE_JVM_FEATURES],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   285
[
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   286
  # Keep feature lists sorted and free of duplicates
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   287
  JVM_FEATURES_server="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_server | $SORT -u))"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   288
  JVM_FEATURES_client="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_client | $SORT -u))"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   289
  JVM_FEATURES_core="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_core | $SORT -u))"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   290
  JVM_FEATURES_minimal="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_minimal | $SORT -u))"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   291
  JVM_FEATURES_zero="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_zero | $SORT -u))"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   292
  JVM_FEATURES_zeroshark="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_zeroshark | $SORT -u))"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   293
  JVM_FEATURES_custom="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_custom | $SORT -u))"
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34495
diff changeset
   294
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   295
  # Validate features
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   296
  for variant in $JVM_VARIANTS; do
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   297
    AC_MSG_CHECKING([JVM features for JVM variant '$variant'])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   298
    features_var_name=JVM_FEATURES_$variant
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   299
    JVM_FEATURES_TO_TEST=${!features_var_name}
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   300
    AC_MSG_RESULT([$JVM_FEATURES_TO_TEST])
37953
195cce402934 8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents: 37402
diff changeset
   301
    NEEDLE=${VALID_JVM_FEATURES// /$'\n'}
195cce402934 8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents: 37402
diff changeset
   302
    STACK=${JVM_FEATURES_TO_TEST// /$'\n'}
195cce402934 8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents: 37402
diff changeset
   303
    INVALID_FEATURES=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"`
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   304
    if test "x$INVALID_FEATURES" != x; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   305
      AC_MSG_ERROR([Invalid JVM feature(s): $INVALID_FEATURES])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   306
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   307
  done
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   308
])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   309
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   310
###############################################################################
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   311
# Support for old hotspot build. Remove once new hotspot build has proven
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   312
# to work satisfactory.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   313
#
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   314
AC_DEFUN_ONCE([HOTSPOT_SETUP_LEGACY_BUILD],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   315
[
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   316
  AC_ARG_ENABLE(new-hotspot-build, [AS_HELP_STRING([--disable-new-hotspot-build],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   317
      [disable the new hotspot build system (use the old) @<:@enabled@:>@])])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   318
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   319
   if test "x$enable_new_hotspot_build" = "x" || test "x$enable_new_hotspot_build" = "xyes"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   320
     USE_NEW_HOTSPOT_BUILD=true
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   321
   else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   322
     USE_NEW_HOTSPOT_BUILD=false
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   323
   fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   324
  AC_SUBST(USE_NEW_HOTSPOT_BUILD)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   325
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   326
  case $HOTSPOT_DEBUG_LEVEL in
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   327
    product )
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   328
      VARIANT="OPT"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   329
      FASTDEBUG="false"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   330
      DEBUG_CLASSFILES="false"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   331
      ;;
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   332
    fastdebug )
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   333
      VARIANT="DBG"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   334
      FASTDEBUG="true"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   335
      DEBUG_CLASSFILES="true"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   336
      ;;
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   337
    debug )
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   338
      VARIANT="DBG"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   339
      FASTDEBUG="false"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   340
      DEBUG_CLASSFILES="true"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   341
      ;;
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   342
    optimized )
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   343
      VARIANT="OPT"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   344
      FASTDEBUG="false"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   345
      DEBUG_CLASSFILES="false"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   346
      ;;
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   347
  esac
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   348
  AC_SUBST(VARIANT)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   349
  AC_SUBST(FASTDEBUG)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   350
  AC_SUBST(DEBUG_CLASSFILES)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   351
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   352
  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   353
    MACOSX_UNIVERSAL="true"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   354
  fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   355
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   356
  AC_SUBST(MACOSX_UNIVERSAL)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   357
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   358
  # Make sure JVM_VARIANTS_COMMA use minimal1 for backwards compatibility
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   359
  JVM_VARIANTS_COMMA=`$ECHO ,$JVM_VARIANTS_OPT, | $SED -e 's/,minimal,/,minimal1,/'`
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34495
diff changeset
   360
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   361
  JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   362
  JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   363
  JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,minimal1\?,/!s/.*/false/g' -e '/,minimal1\?,/s/.*/true/g'`
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   364
  JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   365
  JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   366
  JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   367
  JVM_VARIANT_CUSTOM=`$ECHO "$JVM_VARIANTS_COMMA" | $SED -e '/,custom,/!s/.*/false/g' -e '/,custom,/s/.*/true/g'`
23424
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   368
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   369
  #####
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   370
  # Generate the legacy makefile targets for hotspot.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   371
  HOTSPOT_TARGET=""
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   372
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   373
  if test "x$JVM_VARIANT_SERVER" = xtrue; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   374
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   375
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   376
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   377
  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   378
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   379
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   380
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   381
  if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   382
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   383
  fi
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   384
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   385
  if test "x$JVM_VARIANT_ZERO" = xtrue; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   386
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   387
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   388
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   389
  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   390
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   391
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   392
22467
kvn
parents: 22460 21057
diff changeset
   393
  if test "x$JVM_VARIANT_CORE" = xtrue; then
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
   394
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
22467
kvn
parents: 22460 21057
diff changeset
   395
  fi
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
   396
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   397
  HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_DEBUG_LEVEL"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   398
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   399
  # On Macosx universal binaries are produced, but they only contain
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   400
  # 64 bit intel. This invalidates control of which jvms are built
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   401
  # from configure, but only server is valid anyway. Fix this
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   402
  # when hotspot makefiles are rewritten.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   403
  if test "x$MACOSX_UNIVERSAL" = xtrue; then
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   404
    HOTSPOT_TARGET=universal_${HOTSPOT_DEBUG_LEVEL}
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   405
  fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   406
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   407
  HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   408
  AC_SUBST(HOTSPOT_MAKE_ARGS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   409
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   410
  # Control wether Hotspot runs Queens test after build.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   411
  AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   412
      [run the Queens test after Hotspot build @<:@disabled@:>@])],,
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   413
      [enable_hotspot_test_in_build=no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   414
  if test "x$enable_hotspot_test_in_build" = "xyes"; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   415
    TEST_IN_BUILD=true
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   416
  else
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   417
    TEST_IN_BUILD=false
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   418
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   419
  AC_SUBST(TEST_IN_BUILD)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   420
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   421
  if test "x$USE_NEW_HOTSPOT_BUILD" = xfalse; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   422
    if test "x$JVM_VARIANT_CLIENT" = xtrue; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   423
      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   424
        AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   425
      fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   426
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   427
    if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   428
      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   429
        AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   430
      fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   431
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   432
    if test "x$JVM_VARIANT_CUSTOM" = xtrue; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   433
        AC_MSG_ERROR([You cannot build a custom JVM using the old hotspot build system.])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   434
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   435
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   436
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   437
  AC_SUBST(JVM_VARIANTS_COMMA)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   438
  AC_SUBST(JVM_VARIANT_SERVER)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   439
  AC_SUBST(JVM_VARIANT_CLIENT)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   440
  AC_SUBST(JVM_VARIANT_MINIMAL1)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   441
  AC_SUBST(JVM_VARIANT_HOTSPOT)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   442
  AC_SUBST(JVM_VARIANT_ZERO)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   443
  AC_SUBST(JVM_VARIANT_ZEROSHARK)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   444
  AC_SUBST(JVM_VARIANT_CORE)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   445
])