make/autoconf/hotspot.m4
author apetcher
Tue, 22 May 2018 13:44:02 -0400
branchJDK-8171279-XDH-TLS-branch
changeset 56589 bafd8be2f970
parent 50113 caf115bb98ad
child 50216 f4fd580dd7d1
child 56578 e8414c8ead61
permissions -rw-r--r--
Initial working XDH support in TLS. I should try to refactor the code a bit.
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
#
49120
c04d813140dc 8198724: Refactor FLAGS handling in configure
ihse
parents: 47871
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
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    26
# All valid JVM features, regardless of platform
47687
fb290fd1f9d4 8171853: Remove Shark compiler
rkennke
parents: 47217
diff changeset
    27
VALID_JVM_FEATURES="compiler1 compiler2 zero minimal dtrace jvmti jvmci \
49982
9042ffe5b7fe 8200729: Conditional compilation of GCs
stefank
parents: 49707
diff changeset
    28
    graal vm-structs jni-check services management cmsgc g1gc parallelgc serialgc nmt cds \
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50104
diff changeset
    29
    static-build link-time-opt aot jfr"
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    30
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    31
# All valid JVM variants
47687
fb290fd1f9d4 8171853: Remove Shark compiler
rkennke
parents: 47217
diff changeset
    32
VALID_JVM_VARIANTS="server client minimal core zero custom"
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    33
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    34
###############################################################################
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    35
# 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
    36
# constructs, like this:
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    37
# if HOTSPOT_CHECK_JVM_VARIANT(server); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    38
#
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    39
# 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
    40
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    41
# Definition kept in one line to allow inlining in if statements.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    42
# Additional [] needed to keep m4 from mangling shell constructs.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    43
AC_DEFUN([HOTSPOT_CHECK_JVM_VARIANT],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    44
[ [ [[ " $JVM_VARIANTS " =~ " $1 " ]] ] ])
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    45
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34495
diff changeset
    46
###############################################################################
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    47
# 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
    48
# shell if constructs, like this:
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    49
# if HOTSPOT_CHECK_JVM_FEATURE(jvmti); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    50
#
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    51
# Only valid to use after HOTSPOT_SETUP_JVM_FEATURES has setup features.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    52
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    53
# Definition kept in one line to allow inlining in if statements.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    54
# Additional [] needed to keep m4 from mangling shell constructs.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    55
AC_DEFUN([HOTSPOT_CHECK_JVM_FEATURE],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    56
[ [ [[ " $JVM_FEATURES " =~ " $1 " ]] ] ])
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
###############################################################################
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    59
# 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
    60
#   server: normal interpreter, and a tiered C1/C2 compiler
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    61
#   client: normal interpreter, and C1 (no C2 compiler)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    62
#   minimal: reduced form of client with optional features stripped out
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    63
#   core: normal interpreter only, no compiler
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    64
#   zero: C++ based interpreter only, no 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],
47687
fb290fd1f9d4 8171853: Remove Shark compiler
rkennke
parents: 47217
diff changeset
    70
      [JVM variants (separated by commas) to build (server,client,minimal,core,zero,custom) @<:@server@:>@])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    71
42538
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
    72
  SETUP_HOTSPOT_TARGET_CPU_PORT
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
    73
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    74
  if test "x$with_jvm_variants" = x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    75
    with_jvm_variants="server"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    76
  fi
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    77
  JVM_VARIANTS_OPT="$with_jvm_variants"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    78
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    79
  # Has the user listed more than one variant?
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    80
  # Additional [] needed to keep m4 from mangling shell constructs.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    81
  if [ [[ "$JVM_VARIANTS_OPT" =~ "," ]] ]; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    82
    BUILDING_MULTIPLE_JVM_VARIANTS=true
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    83
  else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    84
    BUILDING_MULTIPLE_JVM_VARIANTS=false
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    85
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    86
  # Replace the commas with AND for use in the build directory name.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    87
  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
    88
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    89
  AC_MSG_CHECKING([which variants of the JVM to build])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    90
  # JVM_VARIANTS is a space-separated list.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    91
  # Also use minimal, not minimal1 (which is kept for backwards compatibility).
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    92
  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
    93
  AC_MSG_RESULT([$JVM_VARIANTS])
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
  # Check that the selected variants are valid
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
    96
  BASIC_GET_NON_MATCHING_VALUES(INVALID_VARIANTS, $JVM_VARIANTS, $VALID_JVM_VARIANTS)
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
    97
  if test "x$INVALID_VARIANTS" != x; then
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
    98
    AC_MSG_NOTICE([Unknown variant(s) specified: "$INVALID_VARIANTS"])
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
    99
    AC_MSG_NOTICE([The available JVM variants are: "$VALID_JVM_VARIANTS"])
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   100
    AC_MSG_ERROR([Cannot continue])
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   101
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   102
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   103
  # All "special" variants share the same output directory ("server")
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   104
  VALID_MULTIPLE_JVM_VARIANTS="server client minimal"
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   105
  BASIC_GET_NON_MATCHING_VALUES(INVALID_MULTIPLE_VARIANTS, $JVM_VARIANTS, $VALID_MULTIPLE_JVM_VARIANTS)
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   106
  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
   107
    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
   108
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   109
42510
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   110
  # The "main" variant is the one used by other libs to link against during the
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   111
  # build.
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   112
  if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   113
    MAIN_VARIANT_PRIO_ORDER="server client minimal"
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   114
    for variant in $MAIN_VARIANT_PRIO_ORDER; do
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   115
      if HOTSPOT_CHECK_JVM_VARIANT($variant); then
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   116
        JVM_VARIANT_MAIN="$variant"
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   117
        break
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   118
      fi
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   119
    done
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   120
  else
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   121
    JVM_VARIANT_MAIN="$JVM_VARIANTS"
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   122
  fi
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   123
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   124
  AC_SUBST(JVM_VARIANTS)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   125
  AC_SUBST(VALID_JVM_VARIANTS)
42510
406dfb60de57 8170284: Move fine granular hotspot make targets to top level
erikj
parents: 39947
diff changeset
   126
  AC_SUBST(JVM_VARIANT_MAIN)
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   127
47687
fb290fd1f9d4 8171853: Remove Shark compiler
rkennke
parents: 47217
diff changeset
   128
  if HOTSPOT_CHECK_JVM_VARIANT(zero); then
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   129
    # 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
   130
    # 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
   131
    HOTSPOT_TARGET_CPU=zero
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   132
    HOTSPOT_TARGET_CPU_ARCH=zero
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   133
  fi
37402
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
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
# Check if dtrace should be enabled and has all prerequisites present.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   138
#
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   139
AC_DEFUN_ONCE([HOTSPOT_SETUP_DTRACE],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   140
[
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   141
  # Test for dtrace dependencies
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   142
  AC_ARG_ENABLE([dtrace], [AS_HELP_STRING([--enable-dtrace@<:@=yes/no/auto@:>@],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   143
      [enable dtrace. Default is auto, where dtrace is enabled if all dependencies
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   144
      are present.])])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   145
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   146
  DTRACE_DEP_MISSING=false
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   147
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   148
  AC_MSG_CHECKING([for dtrace tool])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   149
  if test "x$DTRACE" != "x" && test -x "$DTRACE"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   150
    AC_MSG_RESULT([$DTRACE])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   151
  else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   152
    AC_MSG_RESULT([not found, cannot build dtrace])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   153
    DTRACE_DEP_MISSING=true
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   154
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   155
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   156
  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
   157
  if test "x$DTRACE_HEADERS_OK" != "xyes"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   158
    DTRACE_DEP_MISSING=true
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   159
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   160
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   161
  AC_MSG_CHECKING([if dtrace should be built])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   162
  if test "x$enable_dtrace" = "xyes"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   163
    if test "x$DTRACE_DEP_MISSING" = "xtrue"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   164
      AC_MSG_RESULT([no, missing dependencies])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   165
      HELP_MSG_MISSING_DEPENDENCY([dtrace])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   166
      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
   167
    else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   168
      INCLUDE_DTRACE=true
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   169
      AC_MSG_RESULT([yes, forced])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   170
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   171
  elif test "x$enable_dtrace" = "xno"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   172
    INCLUDE_DTRACE=false
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   173
    AC_MSG_RESULT([no, forced])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   174
  elif test "x$enable_dtrace" = "xauto" || test "x$enable_dtrace" = "x"; then
39384
adde8cb7d01b 8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed
erikj
parents: 39191
diff changeset
   175
    if test "x$DTRACE_DEP_MISSING" = "xtrue"; then
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   176
      INCLUDE_DTRACE=false
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   177
      AC_MSG_RESULT([no, missing dependencies])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   178
    else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   179
      INCLUDE_DTRACE=true
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   180
      AC_MSG_RESULT([yes, dependencies present])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   181
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   182
  else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   183
    AC_MSG_ERROR([Invalid value for --enable-dtrace: $enable_dtrace])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   184
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   185
])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   186
42532
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   187
################################################################################
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   188
# Check if AOT should be enabled
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   189
#
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   190
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   191
[
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   192
  AC_ARG_ENABLE([aot], [AS_HELP_STRING([--enable-aot@<:@=yes/no/auto@:>@],
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   193
      [enable ahead of time compilation feature. Default is auto, where aot is enabled if all dependencies are present.])])
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   194
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   195
  if test "x$enable_aot" = "x" || test "x$enable_aot" = "xauto"; then
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   196
    ENABLE_AOT="true"
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   197
  elif test "x$enable_aot" = "xyes"; then
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   198
    ENABLE_AOT="true"
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   199
  elif test "x$enable_aot" = "xno"; then
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   200
    ENABLE_AOT="false"
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   201
    AC_MSG_CHECKING([if aot should be enabled])
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   202
    AC_MSG_RESULT([no, forced])
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   203
  else
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   204
    AC_MSG_ERROR([Invalid value for --enable-aot: $enable_aot])
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   205
  fi
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   206
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   207
  if test "x$ENABLE_AOT" = "xtrue"; then
46191
7ec14435e850 8172670: AOT Platform Support for Windows and Mac OS X x64
bobv
parents: 42856
diff changeset
   208
    # Only enable AOT on X64 platforms.
50104
4ea7917929b9 8185505: AArch64: Port AOT to AArch64
aph
parents: 49982
diff changeset
   209
    if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   210
      if test -e "${TOPDIR}/src/jdk.aot"; then
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   211
        if test -e "${TOPDIR}/src/jdk.internal.vm.compiler"; then
42532
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   212
          ENABLE_AOT="true"
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   213
        else
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   214
          ENABLE_AOT="false"
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   215
          if test "x$enable_aot" = "xyes"; then
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   216
            AC_MSG_ERROR([Cannot build AOT without src/jdk.internal.vm.compiler sources. Remove --enable-aot.])
42532
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   217
          fi
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   218
        fi
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   219
      else
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   220
        ENABLE_AOT="false"
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   221
        if test "x$enable_aot" = "xyes"; then
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   222
          AC_MSG_ERROR([Cannot build AOT without src/jdk.aot sources. Remove --enable-aot.])
42532
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   223
        fi
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   224
      fi
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   225
    else
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   226
      ENABLE_AOT="false"
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   227
      if test "x$enable_aot" = "xyes"; then
46218
kvn
parents: 46197
diff changeset
   228
        AC_MSG_ERROR([AOT is currently only supported on x86_64. Remove --enable-aot.])
42532
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   229
      fi
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   230
    fi
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   231
  fi
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   232
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   233
  AC_SUBST(ENABLE_AOT)
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   234
])
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   235
47060
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   236
################################################################################
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   237
# Allow to disable CDS
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   238
#
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   239
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_CDS],
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   240
[
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   241
  AC_ARG_ENABLE([cds], [AS_HELP_STRING([--enable-cds@<:@=yes/no@:>@],
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   242
      [enable class data sharing feature in non-minimal VM. Default is yes.])])
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   243
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   244
  if test "x$enable_cds" = "x" || test "x$enable_cds" = "xyes"; then
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   245
    ENABLE_CDS="true"
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   246
  elif test "x$enable_cds" = "xno"; then
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   247
    ENABLE_CDS="false"
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   248
  else
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   249
    AC_MSG_ERROR([Invalid value for --enable-cds: $enable_cds])
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   250
  fi
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   251
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   252
  AC_SUBST(ENABLE_CDS)
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   253
])
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   254
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   255
###############################################################################
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   256
# Set up all JVM features for each JVM variant.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   257
#
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   258
AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   259
[
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   260
  # Prettify the VALID_JVM_FEATURES string
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   261
  BASIC_SORT_LIST(VALID_JVM_FEATURES, $VALID_JVM_FEATURES)
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   262
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   263
  # 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
   264
  # variant, this defines the entire variant.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   265
  AC_ARG_WITH([jvm-features], [AS_HELP_STRING([--with-jvm-features],
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   266
      [JVM features to enable (foo) or disable (-foo), separated by comma. Use '--help' to show possible values @<:@none@:>@])])
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   267
  if test "x$with_jvm_features" != x; then
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   268
    AC_MSG_CHECKING([user specified JVM feature list])
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   269
    USER_JVM_FEATURE_LIST=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   270
    AC_MSG_RESULT([$user_jvm_feature_list])
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   271
    # These features will be added to all variant defaults
49707
f7fd051519ac 8201591: JVM features with "-" in name is not correctly handled
ihse
parents: 49705
diff changeset
   272
    JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (!match($i, /^-.*/)) print $i }'`
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   273
    # These features will be removed from all variant defaults
49707
f7fd051519ac 8201591: JVM features with "-" in name is not correctly handled
ihse
parents: 49705
diff changeset
   274
    DISABLED_JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (match($i, /^-.*/)) print substr($i, 2) }'`
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   275
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   276
    # Verify that the user has provided valid features
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   277
    BASIC_GET_NON_MATCHING_VALUES(INVALID_FEATURES, $JVM_FEATURES $DISABLED_JVM_FEATURES, $VALID_JVM_FEATURES)
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   278
    if test "x$INVALID_FEATURES" != x; then
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   279
      AC_MSG_NOTICE([Unknown JVM features specified: "$INVALID_FEATURES"])
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   280
      AC_MSG_NOTICE([The available JVM features are: "$VALID_JVM_FEATURES"])
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   281
      AC_MSG_ERROR([Cannot continue])
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   282
    fi
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   283
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   284
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   285
42538
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   286
  # Override hotspot cpu definitions for ARM platforms
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   287
  if test "x$OPENJDK_TARGET_CPU" = xarm; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   288
    HOTSPOT_TARGET_CPU=arm_32
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   289
    HOTSPOT_TARGET_CPU_DEFINE="ARM32"
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   290
  elif test "x$OPENJDK_TARGET_CPU" = xaarch64 && test "x$HOTSPOT_TARGET_CPU_PORT" = xarm64; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   291
    HOTSPOT_TARGET_CPU=arm_64
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   292
    HOTSPOT_TARGET_CPU_ARCH=arm
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   293
  fi
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   294
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   295
  # Verify that dependencies are met for explicitly set features.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   296
  if HOTSPOT_CHECK_JVM_FEATURE(jvmti) && ! HOTSPOT_CHECK_JVM_FEATURE(services); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   297
    AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services'])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   298
  fi
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   299
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   300
  if HOTSPOT_CHECK_JVM_FEATURE(management) && ! HOTSPOT_CHECK_JVM_FEATURE(nmt); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   301
    AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt'])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   302
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   303
39946
c82f919f4454 8159888: [JVMCI] the client VM build is broken when INCLUDE_JVMCI is defined
dnsimon
parents: 39191
diff changeset
   304
  if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! (HOTSPOT_CHECK_JVM_FEATURE(compiler1) || HOTSPOT_CHECK_JVM_FEATURE(compiler2)); then
c82f919f4454 8159888: [JVMCI] the client VM build is broken when INCLUDE_JVMCI is defined
dnsimon
parents: 39191
diff changeset
   305
    AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1'])
37402
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
49982
9042ffe5b7fe 8200729: Conditional compilation of GCs
stefank
parents: 49707
diff changeset
   308
  if HOTSPOT_CHECK_JVM_FEATURE(cmsgc) && ! HOTSPOT_CHECK_JVM_FEATURE(serialgc); then
9042ffe5b7fe 8200729: Conditional compilation of GCs
stefank
parents: 49707
diff changeset
   309
    AC_MSG_ERROR([Specified JVM feature 'cmsgc' requires feature 'serialgc'])
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   310
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   311
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50104
diff changeset
   312
  # Enable JFR by default, except on linux-sparcv9 and on minimal.
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50104
diff changeset
   313
  if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50104
diff changeset
   314
    NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50104
diff changeset
   315
  fi
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50104
diff changeset
   316
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   317
  # Turn on additional features based on other parts of configure
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   318
  if test "x$INCLUDE_DTRACE" = "xtrue"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   319
    JVM_FEATURES="$JVM_FEATURES dtrace"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   320
  else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   321
    if HOTSPOT_CHECK_JVM_FEATURE(dtrace); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   322
      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
   323
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   324
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   325
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   326
  if test "x$STATIC_BUILD" = "xtrue"; then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   327
    JVM_FEATURES="$JVM_FEATURES static-build"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   328
  else
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   329
    if HOTSPOT_CHECK_JVM_FEATURE(static-build); then
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   330
      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
   331
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   332
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   333
47687
fb290fd1f9d4 8171853: Remove Shark compiler
rkennke
parents: 47217
diff changeset
   334
  if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   335
    if HOTSPOT_CHECK_JVM_FEATURE(zero); then
47687
fb290fd1f9d4 8171853: Remove Shark compiler
rkennke
parents: 47217
diff changeset
   336
      AC_MSG_ERROR([To enable zero, you must use --with-jvm-variants=zero])
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   337
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   338
  fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   339
39946
c82f919f4454 8159888: [JVMCI] the client VM build is broken when INCLUDE_JVMCI is defined
dnsimon
parents: 39191
diff changeset
   340
  # Only enable jvmci on x86_64, sparcv9 and aarch64.
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   341
  if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   342
     test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   343
     test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   344
    JVM_FEATURES_jvmci="jvmci"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   345
  else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   346
    JVM_FEATURES_jvmci=""
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   347
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   348
43925
3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents: 43383
diff changeset
   349
  AC_MSG_CHECKING([if jdk.internal.vm.compiler should be built])
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   350
  if HOTSPOT_CHECK_JVM_FEATURE(graal); then
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   351
    AC_MSG_RESULT([yes, forced])
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   352
    if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   353
      AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci'])
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   354
    fi
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   355
    INCLUDE_GRAAL="true"
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   356
  else
49485
dcdbb98f4086 8199896: [Graal] build Graal on all x86 platforms
kvn
parents: 47871
diff changeset
   357
    # By default enable graal build on x64 or where AOT is available.
47056
a78c08ee61c5 8186462: [Graal] build Graal regardless AOT build
kvn
parents: 46233
diff changeset
   358
    # graal build requires jvmci.
a78c08ee61c5 8186462: [Graal] build Graal regardless AOT build
kvn
parents: 46233
diff changeset
   359
    if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \
49485
dcdbb98f4086 8199896: [Graal] build Graal on all x86 platforms
kvn
parents: 47871
diff changeset
   360
        (test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
47056
a78c08ee61c5 8186462: [Graal] build Graal regardless AOT build
kvn
parents: 46233
diff changeset
   361
         test "x$ENABLE_AOT" = "xtrue") ; then
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   362
      AC_MSG_RESULT([yes])
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   363
      JVM_FEATURES_graal="graal"
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   364
      INCLUDE_GRAAL="true"
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   365
    else
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   366
      AC_MSG_RESULT([no])
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   367
      JVM_FEATURES_graal=""
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   368
      INCLUDE_GRAAL="false"
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   369
    fi
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   370
  fi
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   371
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   372
  AC_SUBST(INCLUDE_GRAAL)
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42510
diff changeset
   373
42532
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   374
  AC_MSG_CHECKING([if aot should be enabled])
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   375
  if test "x$ENABLE_AOT" = "xtrue"; then
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   376
    if test "x$enable_aot" = "xyes"; then
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   377
      AC_MSG_RESULT([yes, forced])
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   378
    else
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   379
      AC_MSG_RESULT([yes])
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   380
    fi
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   381
    JVM_FEATURES_aot="aot"
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   382
  else
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   383
    if test "x$enable_aot" = "xno"; then
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   384
      AC_MSG_RESULT([no, forced])
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   385
    else
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   386
      AC_MSG_RESULT([no])
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   387
    fi
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   388
    JVM_FEATURES_aot=""
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   389
  fi
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   390
42538
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   391
  if test "x$OPENJDK_TARGET_CPU" = xarm ; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   392
    # Default to use link time optimizations on minimal on arm
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   393
    JVM_FEATURES_link_time_opt="link-time-opt"
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   394
  else
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   395
    JVM_FEATURES_link_time_opt=""
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   396
  fi
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   397
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   398
  # All variants but minimal (and custom) get these features
49982
9042ffe5b7fe 8200729: Conditional compilation of GCs
stefank
parents: 49707
diff changeset
   399
  NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc jni-check jvmti management nmt services vm-structs"
47060
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   400
  if test "x$ENABLE_CDS" = "xtrue"; then
1deb34f59d8e 8186978: Introduce configure argument enable-cds
goetz
parents: 47056
diff changeset
   401
    NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds"
47871
5ab3961d20dd 8191204: Post-consolidation cleaning up of the build system
ihse
parents: 47687
diff changeset
   402
  fi
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   403
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 50104
diff changeset
   404
  # Enable features depending on variant.
42532
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   405
  JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
39946
c82f919f4454 8159888: [JVMCI] the client VM build is broken when INCLUDE_JVMCI is defined
dnsimon
parents: 39191
diff changeset
   406
  JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   407
  JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
49982
9042ffe5b7fe 8200729: Conditional compilation of GCs
stefank
parents: 49707
diff changeset
   408
  JVM_FEATURES_minimal="compiler1 minimal serialgc $JVM_FEATURES $JVM_FEATURES_link_time_opt"
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   409
  JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   410
  JVM_FEATURES_custom="$JVM_FEATURES"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   411
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   412
  AC_SUBST(JVM_FEATURES_server)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   413
  AC_SUBST(JVM_FEATURES_client)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   414
  AC_SUBST(JVM_FEATURES_core)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   415
  AC_SUBST(JVM_FEATURES_minimal)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   416
  AC_SUBST(JVM_FEATURES_zero)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   417
  AC_SUBST(JVM_FEATURES_custom)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   418
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   419
  # Used for verification of Makefiles by check-jvm-feature
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   420
  AC_SUBST(VALID_JVM_FEATURES)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   421
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   422
  # We don't support --with-jvm-interpreter anymore, use zero instead.
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   423
  BASIC_DEPRECATED_ARG_WITH(jvm-interpreter)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   424
])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   425
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   426
###############################################################################
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   427
# Finalize JVM features once all setup is complete, including custom setup.
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   428
#
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   429
AC_DEFUN_ONCE([HOTSPOT_FINALIZE_JVM_FEATURES],
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   430
[
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   431
  for variant in $JVM_VARIANTS; do
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   432
    AC_MSG_CHECKING([JVM features for JVM variant '$variant'])
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   433
    features_var_name=JVM_FEATURES_$variant
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   434
    JVM_FEATURES_FOR_VARIANT=${!features_var_name}
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   435
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   436
    # Filter out user-requested disabled features
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   437
    BASIC_GET_NON_MATCHING_VALUES(JVM_FEATURES_FOR_VARIANT, $JVM_FEATURES_FOR_VARIANT, $DISABLED_JVM_FEATURES)
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   438
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   439
    # Keep feature lists sorted and free of duplicates
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   440
    BASIC_SORT_LIST(JVM_FEATURES_FOR_VARIANT, $JVM_FEATURES_FOR_VARIANT)
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   441
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   442
    # Update real feature set variable
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   443
    eval $features_var_name='"'$JVM_FEATURES_FOR_VARIANT'"'
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   444
    AC_MSG_RESULT(["$JVM_FEATURES_FOR_VARIANT"])
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   445
49982
9042ffe5b7fe 8200729: Conditional compilation of GCs
stefank
parents: 49707
diff changeset
   446
    # Verify that we have at least one gc selected
9042ffe5b7fe 8200729: Conditional compilation of GCs
stefank
parents: 49707
diff changeset
   447
    GC_FEATURES=`$ECHO $JVM_FEATURES_FOR_VARIANT | $GREP gc`
9042ffe5b7fe 8200729: Conditional compilation of GCs
stefank
parents: 49707
diff changeset
   448
    if test "x$GC_FEATURES" = x; then
9042ffe5b7fe 8200729: Conditional compilation of GCs
stefank
parents: 49707
diff changeset
   449
      AC_MSG_WARN([Invalid JVM features: No gc selected for variant $variant.])
9042ffe5b7fe 8200729: Conditional compilation of GCs
stefank
parents: 49707
diff changeset
   450
    fi
9042ffe5b7fe 8200729: Conditional compilation of GCs
stefank
parents: 49707
diff changeset
   451
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   452
    # Validate features (for configure script errors, not user errors)
49705
68ac1caf3d7e 8201584: Fix configure on SLES 11 after 8201483
goetz
parents: 49582
diff changeset
   453
    BASIC_GET_NON_MATCHING_VALUES(INVALID_FEATURES, $JVM_FEATURES_FOR_VARIANT, $VALID_JVM_FEATURES)
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   454
    if test "x$INVALID_FEATURES" != x; then
49582
f29aeb8bb44f 8201483: Make it possible to disable JVM features
ihse
parents: 49488
diff changeset
   455
      AC_MSG_ERROR([Internal configure script error. Invalid JVM feature(s): $INVALID_FEATURES])
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   456
    fi
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   457
  done
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 35747
diff changeset
   458
])
37978
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   459
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   460
################################################################################
42538
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   461
#
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   462
# Specify which sources will be used to build the 64-bit ARM port
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   463
#
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   464
# --with-cpu-port=arm64   will use hotspot/src/cpu/arm
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   465
# --with-cpu-port=aarch64 will use hotspot/src/cpu/aarch64
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   466
#
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   467
AC_DEFUN([SETUP_HOTSPOT_TARGET_CPU_PORT],
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   468
[
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   469
  AC_ARG_WITH(cpu-port, [AS_HELP_STRING([--with-cpu-port],
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   470
      [specify sources to use for Hotspot 64-bit ARM port (arm64,aarch64) @<:@aarch64@:>@ ])])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   471
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   472
  if test "x$with_cpu_port" != x; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   473
    if test "x$OPENJDK_TARGET_CPU" != xaarch64; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   474
      AC_MSG_ERROR([--with-cpu-port only available on aarch64])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   475
    fi
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   476
    if test "x$with_cpu_port" != xarm64 && \
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   477
        test "x$with_cpu_port" != xaarch64; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   478
      AC_MSG_ERROR([--with-cpu-port must specify arm64 or aarch64])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   479
    fi
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   480
    HOTSPOT_TARGET_CPU_PORT="$with_cpu_port"
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   481
  fi
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   482
])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   483
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   484
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42532
diff changeset
   485
################################################################################
37978
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   486
# Check if gtest should be built
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   487
#
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   488
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_GTEST],
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   489
[
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   490
  AC_ARG_ENABLE([hotspot-gtest], [AS_HELP_STRING([--disable-hotspot-gtest],
47871
5ab3961d20dd 8191204: Post-consolidation cleaning up of the build system
ihse
parents: 47687
diff changeset
   491
      [Disables building of the Hotspot unit tests @<:@enabled@:>@])])
37978
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   492
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   493
  if test -e "${TOPDIR}/test/hotspot/gtest"; then
37978
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   494
    GTEST_DIR_EXISTS="true"
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   495
  else
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   496
    GTEST_DIR_EXISTS="false"
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   497
  fi
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   498
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   499
  AC_MSG_CHECKING([if Hotspot gtest unit tests should be built])
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   500
  if test "x$enable_hotspot_gtest" = "xyes"; then
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   501
    if test "x$GTEST_DIR_EXISTS" = "xtrue"; then
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   502
      AC_MSG_RESULT([yes, forced])
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   503
      BUILD_GTEST="true"
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   504
    else
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   505
      AC_MSG_ERROR([Cannot build gtest without the test source])
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   506
    fi
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   507
  elif test "x$enable_hotspot_gtest" = "xno"; then
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   508
    AC_MSG_RESULT([no, forced])
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   509
    BUILD_GTEST="false"
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   510
  elif test "x$enable_hotspot_gtest" = "x"; then
42855
012fe082a0b2 8171433: [aix] switch on gtest AIX build
stuefe
parents: 42532
diff changeset
   511
    if test "x$GTEST_DIR_EXISTS" = "xtrue"; then
37978
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   512
      AC_MSG_RESULT([yes])
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   513
      BUILD_GTEST="true"
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   514
    else
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   515
      AC_MSG_RESULT([no])
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   516
      BUILD_GTEST="false"
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   517
    fi
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   518
  else
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   519
    AC_MSG_ERROR([--enable-gtest must be either yes or no])
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   520
  fi
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   521
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   522
  AC_SUBST(BUILD_GTEST)
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37960
diff changeset
   523
])