common/autoconf/jdk-options.m4
author iris
Tue, 29 Sep 2015 17:56:41 -0700
changeset 33944 e1e20245e153
parent 32554 c8b77b422f5b
parent 33926 3a19edba4808
child 33954 6185394cbd60
permissions -rw-r--r--
Merge
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
#
33926
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
     2
# Copyright (c) 2011, 2015, 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
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    26
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VARIANT],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    27
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    28
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    29
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    30
  # Check which variant of the JDK that we want to build.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    31
  # Currently we have:
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    32
  #    normal:   standard edition
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    33
  # but the custom make system may add other variants
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    34
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    35
  # Effectively the JDK variant gives a name to a specific set of
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    36
  # modules to compile into the JDK. In the future, these modules
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    37
  # might even be Jigsaw modules.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    38
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    39
  AC_MSG_CHECKING([which variant of the JDK to build])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    40
  AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    41
      [JDK variant to build (normal) @<:@normal@:>@])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    42
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    43
  if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    44
    JDK_VARIANT="normal"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    45
  else
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    46
    AC_MSG_ERROR([The available JDK variants are: normal])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    47
  fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    48
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    49
  AC_SUBST(JDK_VARIANT)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    50
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    51
  AC_MSG_RESULT([$JDK_VARIANT])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    52
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    53
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    54
AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_INTERPRETER],
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    55
[
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    56
###############################################################################
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    57
#
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    58
# Check which interpreter of the JVM we want to build.
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    59
# Currently we have:
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    60
#    template: Template interpreter (the default)
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    61
#    cpp     : C++ interpreter
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    62
AC_MSG_CHECKING([which interpreter of the JVM to build])
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    63
AC_ARG_WITH([jvm-interpreter], [AS_HELP_STRING([--with-jvm-interpreter],
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    64
	[JVM interpreter to build (template, cpp) @<:@template@:>@])])
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    65
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    66
if test "x$with_jvm_interpreter" = x; then
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    67
     with_jvm_interpreter="template"
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    68
fi
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    69
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    70
JVM_INTERPRETER="$with_jvm_interpreter"
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    71
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    72
if test "x$JVM_INTERPRETER" != xtemplate && test "x$JVM_INTERPRETER" != xcpp; then
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    73
   AC_MSG_ERROR([The available JVM interpreters are: template, cpp])
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    74
fi
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    75
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    76
AC_SUBST(JVM_INTERPRETER)
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    77
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    78
AC_MSG_RESULT([$with_jvm_interpreter])
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    79
])
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    80
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    81
AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    82
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    83
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    84
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    85
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    86
  # Check which variants of the JVM that we want to build.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    87
  # Currently we have:
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    88
  #    server: normal interpreter and a tiered C1/C2 compiler
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    89
  #    client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    90
  #    minimal1: reduced form of client with optional VM services and features stripped out
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    91
  #    kernel: kernel footprint JVM that passes the TCK without major performance problems,
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    92
  #             ie normal interpreter and C1, only the serial GC, kernel jvmti etc
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    93
  #    zero: no machine code interpreter, no compiler
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    94
  #    zeroshark: zero interpreter and shark/llvm compiler backend
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    95
#    core: interpreter only, no compiler (only works on some platforms)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    96
  AC_MSG_CHECKING([which variants of the JVM to build])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
    97
  AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
    98
	[JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark, core) @<:@server@:>@])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    99
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   100
  if test "x$with_jvm_variants" = x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   101
    with_jvm_variants="server"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   102
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   103
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   104
  JVM_VARIANTS=",$with_jvm_variants,"
22467
kvn
parents: 22460 21057
diff changeset
   105
  TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//'  -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//' -e 's/core,//'`
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   106
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   107
  if test "x$TEST_VARIANTS" != "x,"; then
22467
kvn
parents: 22460 21057
diff changeset
   108
     AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   109
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   110
  AC_MSG_RESULT([$with_jvm_variants])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   111
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   112
  JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   113
  JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   114
  JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   115
  JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   116
  JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   117
  JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
22467
kvn
parents: 22460 21057
diff changeset
   118
  JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   119
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   120
  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   121
    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   122
      AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   123
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   124
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   125
  if test "x$JVM_VARIANT_KERNEL" = xtrue; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   126
    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   127
      AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   128
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   129
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   130
  if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   131
    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   132
      AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.])
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   133
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   134
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   135
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   136
  # Replace the commas with AND for use in the build directory name.
22181
0fc1d3eb4358 8031709: Configure --with-jvm-variants=client, server, x produces default outputdir containing comma
erikj
parents: 22176
diff changeset
   137
  ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/g'`
22467
kvn
parents: 22460 21057
diff changeset
   138
  COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/' -e 's/core,/1/'`
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   139
  if test "x$COUNT_VARIANTS" != "x,1"; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   140
    BUILDING_MULTIPLE_JVM_VARIANTS=yes
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   141
  else
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   142
    BUILDING_MULTIPLE_JVM_VARIANTS=no
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   143
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   144
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   145
  AC_SUBST(JVM_VARIANTS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   146
  AC_SUBST(JVM_VARIANT_SERVER)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   147
  AC_SUBST(JVM_VARIANT_CLIENT)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   148
  AC_SUBST(JVM_VARIANT_MINIMAL1)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   149
  AC_SUBST(JVM_VARIANT_KERNEL)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   150
  AC_SUBST(JVM_VARIANT_ZERO)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   151
  AC_SUBST(JVM_VARIANT_ZEROSHARK)
22467
kvn
parents: 22460 21057
diff changeset
   152
  AC_SUBST(JVM_VARIANT_CORE)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   153
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   154
  INCLUDE_SA=true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   155
  if test "x$JVM_VARIANT_ZERO" = xtrue ; then
16581
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   156
    INCLUDE_SA=false
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   157
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   158
  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
16581
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   159
    INCLUDE_SA=false
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   160
  fi
25616
5730ea123552 8049715: PPC64: First steps to enable SA on Linux/PPC64
simonis
parents: 23424
diff changeset
   161
  if test "x$OPENJDK_TARGET_OS" = xaix ; then
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
   162
    INCLUDE_SA=false
22467
kvn
parents: 22460 21057
diff changeset
   163
  fi
29161
11faf16b91c8 8064357: AARCH64: Top-level JDK changes
aph
parents: 27133
diff changeset
   164
  if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
11faf16b91c8 8064357: AARCH64: Top-level JDK changes
aph
parents: 27133
diff changeset
   165
    INCLUDE_SA=false
11faf16b91c8 8064357: AARCH64: Top-level JDK changes
aph
parents: 27133
diff changeset
   166
  fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   167
  AC_SUBST(INCLUDE_SA)
16581
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   168
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   169
  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   170
    MACOSX_UNIVERSAL="true"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   171
  fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   172
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   173
  AC_SUBST(MACOSX_UNIVERSAL)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   174
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   175
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   176
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_LEVEL],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   177
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   178
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   179
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   180
  # Set the debug level
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   181
  #    release: no debug information, all optimizations, no asserts.
23424
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   182
  #    optimized: no debug information, all optimizations, no asserts, HotSpot target is 'optimized'.
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   183
  #    fastdebug: debug information (-g), all optimizations, all asserts
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   184
  #    slowdebug: debug information (-g), no optimizations, all asserts
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   185
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   186
  DEBUG_LEVEL="release"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   187
  AC_MSG_CHECKING([which debug level to use])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   188
  AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   189
      [set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   190
      [
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   191
        ENABLE_DEBUG="${enableval}"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   192
        DEBUG_LEVEL="fastdebug"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   193
      ], [ENABLE_DEBUG="no"])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   194
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   195
  AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level],
23424
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   196
      [set the debug level (release, fastdebug, slowdebug, optimized (HotSpot build only)) @<:@release@:>@])],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   197
      [
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   198
        DEBUG_LEVEL="${withval}"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   199
        if test "x$ENABLE_DEBUG" = xyes; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   200
          AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   201
        fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   202
      ])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   203
  AC_MSG_RESULT([$DEBUG_LEVEL])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   204
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   205
  if test "x$DEBUG_LEVEL" != xrelease && \
23424
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   206
      test "x$DEBUG_LEVEL" != xoptimized && \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   207
      test "x$DEBUG_LEVEL" != xfastdebug && \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   208
      test "x$DEBUG_LEVEL" != xslowdebug; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   209
    AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   210
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   211
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   212
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   213
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   214
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   215
  # Setup legacy vars/targets and new vars to deal with different debug levels.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   216
  #
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   217
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   218
  case $DEBUG_LEVEL in
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   219
    release )
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   220
      VARIANT="OPT"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   221
      FASTDEBUG="false"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   222
      DEBUG_CLASSFILES="false"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   223
      BUILD_VARIANT_RELEASE=""
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   224
      HOTSPOT_DEBUG_LEVEL="product"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   225
      HOTSPOT_EXPORT="product"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   226
      ;;
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   227
    fastdebug )
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   228
      VARIANT="DBG"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   229
      FASTDEBUG="true"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   230
      DEBUG_CLASSFILES="true"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   231
      BUILD_VARIANT_RELEASE="-fastdebug"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   232
      HOTSPOT_DEBUG_LEVEL="fastdebug"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   233
      HOTSPOT_EXPORT="fastdebug"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   234
      ;;
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   235
    slowdebug )
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   236
      VARIANT="DBG"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   237
      FASTDEBUG="false"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   238
      DEBUG_CLASSFILES="true"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   239
      BUILD_VARIANT_RELEASE="-debug"
26546
2ea705d15f8c 8058317: Top-level Makefiles uses deprecated target jvmg in HotSpot Makefiles
ehelin
parents: 25854
diff changeset
   240
      HOTSPOT_DEBUG_LEVEL="debug"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   241
      HOTSPOT_EXPORT="debug"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   242
      ;;
23424
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   243
    optimized )
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   244
      VARIANT="OPT"
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   245
      FASTDEBUG="false"
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   246
      DEBUG_CLASSFILES="false"
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   247
      BUILD_VARIANT_RELEASE="-optimized"
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   248
      HOTSPOT_DEBUG_LEVEL="optimized"
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   249
      HOTSPOT_EXPORT="optimized"
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   250
      ;;
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   251
  esac
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   252
23424
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   253
  # The debug level 'optimized' is a little special because it is currently only
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   254
  # applicable to the HotSpot build where it means to build a completely
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   255
  # optimized version of the VM without any debugging code (like for the
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   256
  # 'release' debug level which is called 'product' in the HotSpot build) but
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   257
  # with the exception that it can contain additional code which is otherwise
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   258
  # protected by '#ifndef PRODUCT' macros. These 'optimized' builds are used to
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   259
  # test new and/or experimental features which are not intended for customer
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   260
  # shipment. Because these new features need to be tested and benchmarked in
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   261
  # real world scenarios, we want to build the containing JDK at the 'release'
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   262
  # debug level.
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   263
  if test "x$DEBUG_LEVEL" = xoptimized; then
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   264
    DEBUG_LEVEL="release"
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   265
  fi
65039fb99fda 8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents: 22721
diff changeset
   266
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   267
  #####
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   268
  # Generate the legacy makefile targets for hotspot.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   269
  # The hotspot api for selecting the build artifacts, really, needs to be improved.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   270
  # JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   271
  # determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   272
  # But until then ...
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   273
  HOTSPOT_TARGET=""
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   274
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   275
  if test "x$JVM_VARIANT_SERVER" = xtrue; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   276
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   277
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   278
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   279
  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   280
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   281
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   282
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   283
  if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   284
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   285
  fi
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   286
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   287
  if test "x$JVM_VARIANT_KERNEL" = xtrue; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   288
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   289
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   290
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   291
  if test "x$JVM_VARIANT_ZERO" = xtrue; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   292
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   293
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   294
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   295
  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   296
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   297
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   298
22467
kvn
parents: 22460 21057
diff changeset
   299
  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
   300
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
22467
kvn
parents: 22460 21057
diff changeset
   301
  fi
22460
0273c023680c 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17819
diff changeset
   302
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   303
  HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   304
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   305
  # On Macosx universal binaries are produced, but they only contain
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   306
  # 64 bit intel. This invalidates control of which jvms are built
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   307
  # from configure, but only server is valid anyway. Fix this
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   308
  # when hotspot makefiles are rewritten.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   309
  if test "x$MACOSX_UNIVERSAL" = xtrue; then
15054
e649ff651503 8004490: build-infra: mac: hotspot is always built in product, regardless of --with-debug-level setting
erikj
parents: 14810
diff changeset
   310
    HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   311
  fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   312
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   313
  #####
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   314
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   315
  AC_SUBST(DEBUG_LEVEL)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   316
  AC_SUBST(VARIANT)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   317
  AC_SUBST(FASTDEBUG)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   318
  AC_SUBST(DEBUG_CLASSFILES)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   319
  AC_SUBST(BUILD_VARIANT_RELEASE)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   320
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   321
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   322
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   323
###############################################################################
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   324
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   325
# Should we build only OpenJDK even if closed sources are present?
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   326
#
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   327
AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   328
[
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   329
  AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   330
      [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   331
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   332
  AC_MSG_CHECKING([for presence of closed sources])
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   333
  if test -d "$SRC_ROOT/jdk/src/closed"; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   334
    CLOSED_SOURCE_PRESENT=yes
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   335
  else
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   336
    CLOSED_SOURCE_PRESENT=no
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   337
  fi
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   338
  AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   339
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   340
  AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)])
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   341
  SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   342
  AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   343
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   344
  if test "x$CLOSED_SOURCE_PRESENT" = xno; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   345
    OPENJDK=true
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   346
    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   347
      AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   348
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   349
  else
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   350
    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   351
      OPENJDK=true
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   352
    else
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   353
      OPENJDK=false
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   354
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   355
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   356
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   357
  if test "x$OPENJDK" = "xtrue"; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   358
    SET_OPENJDK="OPENJDK=true"
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   359
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   360
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   361
  AC_SUBST(SET_OPENJDK)
22714
a752920c4317 8034191: Move relevant parts of build system to new closed repo
ihse
parents: 22709
diff changeset
   362
a752920c4317 8034191: Move relevant parts of build system to new closed repo
ihse
parents: 22709
diff changeset
   363
  # custom-make-dir is deprecated. Please use your custom-hook.m4 to override
a752920c4317 8034191: Move relevant parts of build system to new closed repo
ihse
parents: 22709
diff changeset
   364
  # the IncludeCustomExtension macro.
a752920c4317 8034191: Move relevant parts of build system to new closed repo
ihse
parents: 22709
diff changeset
   365
  BASIC_DEPRECATED_ARG_WITH(custom-make-dir)
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   366
])
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   367
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   368
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   369
[
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   370
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   371
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   372
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   373
  # Should we build a JDK/JVM with headful support (ie a graphical ui)?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   374
  # We always build headless support.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   375
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   376
  AC_MSG_CHECKING([headful support])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   377
  AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   378
      [disable building headful support (graphical UI support) @<:@enabled@:>@])],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   379
      [SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes])
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
  SUPPORT_HEADLESS=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   382
  BUILD_HEADLESS="BUILD_HEADLESS:=true"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   383
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   384
  if test "x$SUPPORT_HEADFUL" = xyes; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   385
    # We are building both headful and headless.
20273
126644dde85d 8008944: Correct typos
ihse
parents: 19764
diff changeset
   386
    headful_msg="include support for both headful and headless"
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$SUPPORT_HEADFUL" = xno; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   390
    # Thus we are building headless only.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   391
    BUILD_HEADLESS="BUILD_HEADLESS:=true"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   392
    headful_msg="headless only"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   393
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   394
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   395
  AC_MSG_RESULT([$headful_msg])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   396
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   397
  AC_SUBST(SUPPORT_HEADLESS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   398
  AC_SUBST(SUPPORT_HEADFUL)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   399
  AC_SUBST(BUILD_HEADLESS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   400
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   401
  # Control wether Hotspot runs Queens test after build.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   402
  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
   403
      [run the Queens test after Hotspot build @<:@disabled@:>@])],,
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   404
      [enable_hotspot_test_in_build=no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   405
  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
   406
    TEST_IN_BUILD=true
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   407
  else
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   408
    TEST_IN_BUILD=false
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   409
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   410
  AC_SUBST(TEST_IN_BUILD)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   411
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   412
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   413
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   414
  # Choose cacerts source file
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   415
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   416
  AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   417
      [specify alternative cacerts file])])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   418
  if test "x$with_cacerts_file" != x; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   419
    CACERTS_FILE=$with_cacerts_file
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   420
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   421
  AC_SUBST(CACERTS_FILE)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   422
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   423
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   424
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   425
  # Enable or disable unlimited crypto
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   426
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   427
  AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   428
      [Enable unlimited crypto policy @<:@disabled@:>@])],,
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   429
      [enable_unlimited_crypto=no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   430
  if test "x$enable_unlimited_crypto" = "xyes"; then
14112
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   431
    UNLIMITED_CRYPTO=true
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   432
  else
14112
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   433
    UNLIMITED_CRYPTO=false
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   434
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   435
  AC_SUBST(UNLIMITED_CRYPTO)
14112
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   436
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   437
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   438
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   439
  # Compress jars
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   440
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   441
  COMPRESS_JARS=false
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   442
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   443
  AC_SUBST(COMPRESS_JARS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   444
33926
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   445
  # Setup default copyright year. Mostly overridden when building close to a new year.
27584
01a719b65d1e 8065183: Add --with-copyright-year option to configure
erikj
parents: 27133
diff changeset
   446
  AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year],
01a719b65d1e 8065183: Add --with-copyright-year option to configure
erikj
parents: 27133
diff changeset
   447
      [Set copyright year value for build @<:@current year@:>@])])
01a719b65d1e 8065183: Add --with-copyright-year option to configure
erikj
parents: 27133
diff changeset
   448
  if test "x$with_copyright_year" = xyes; then
01a719b65d1e 8065183: Add --with-copyright-year option to configure
erikj
parents: 27133
diff changeset
   449
    AC_MSG_ERROR([Copyright year must have a value])
01a719b65d1e 8065183: Add --with-copyright-year option to configure
erikj
parents: 27133
diff changeset
   450
  elif test "x$with_copyright_year" != x; then
01a719b65d1e 8065183: Add --with-copyright-year option to configure
erikj
parents: 27133
diff changeset
   451
    COPYRIGHT_YEAR="$with_copyright_year"
01a719b65d1e 8065183: Add --with-copyright-year option to configure
erikj
parents: 27133
diff changeset
   452
  else
01a719b65d1e 8065183: Add --with-copyright-year option to configure
erikj
parents: 27133
diff changeset
   453
    COPYRIGHT_YEAR=`date +'%Y'`
01a719b65d1e 8065183: Add --with-copyright-year option to configure
erikj
parents: 27133
diff changeset
   454
  fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   455
  AC_SUBST(COPYRIGHT_YEAR)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   456
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   457
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   458
AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   459
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   460
  HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   461
  AC_SUBST(HOTSPOT_MAKE_ARGS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   462
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   463
  # The name of the Service Agent jar.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   464
  SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   465
  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   466
    SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   467
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   468
  AC_SUBST(SALIB_NAME)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   469
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   470
33926
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   471
###############################################################################
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   472
#
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   473
# Enable or disable the elliptic curve crypto implementation
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   474
#
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   475
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   476
[
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   477
  AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   478
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   479
  if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   480
    ENABLE_INTREE_EC=yes
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   481
    AC_MSG_RESULT([yes])
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   482
  else
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   483
    ENABLE_INTREE_EC=no
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   484
    AC_MSG_RESULT([no])
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   485
  fi
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   486
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   487
  AC_SUBST(ENABLE_INTREE_EC)
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   488
])
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   489
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 29305
diff changeset
   490
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   491
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   492
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   493
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   494
  # ENABLE_DEBUG_SYMBOLS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   495
  # This must be done after the toolchain is setup, since we're looking at objcopy.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   496
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   497
  AC_ARG_ENABLE([debug-symbols],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   498
      [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   499
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   500
  AC_MSG_CHECKING([if we should generate debug symbols])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   501
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   502
  if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   503
    # explicit enabling of enable-debug-symbols and can't find objcopy
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   504
    #   this is an error
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   505
    AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   506
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   507
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   508
  if test "x$enable_debug_symbols" = "xyes"; then
14615
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   509
    ENABLE_DEBUG_SYMBOLS=true
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   510
  elif test "x$enable_debug_symbols" = "xno"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   511
    ENABLE_DEBUG_SYMBOLS=false
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   512
  else
21057
6cfd8ccbfbbc 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20641
diff changeset
   513
    # Default is on if objcopy is found
6cfd8ccbfbbc 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20641
diff changeset
   514
    if test "x$OBJCOPY" != x; then
6cfd8ccbfbbc 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20641
diff changeset
   515
      ENABLE_DEBUG_SYMBOLS=true
6cfd8ccbfbbc 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20641
diff changeset
   516
    # MacOS X and Windows don't use objcopy but default is on for those OSes
6cfd8ccbfbbc 8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents: 20641
diff changeset
   517
    elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   518
      ENABLE_DEBUG_SYMBOLS=true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   519
    else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   520
      ENABLE_DEBUG_SYMBOLS=false
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   521
    fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   522
  fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   523
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   524
  AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   525
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   526
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   527
  # ZIP_DEBUGINFO_FILES
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   528
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   529
  AC_MSG_CHECKING([if we should zip debug-info files])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   530
  AC_ARG_ENABLE([zip-debug-info],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   531
      [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   532
      [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   533
  AC_MSG_RESULT([${enable_zip_debug_info}])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   534
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   535
  if test "x${enable_zip_debug_info}" = "xno"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   536
    ZIP_DEBUGINFO_FILES=false
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   537
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   538
    ZIP_DEBUGINFO_FILES=true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   539
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   540
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   541
  AC_SUBST(ENABLE_DEBUG_SYMBOLS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20275
diff changeset
   542
  AC_SUBST(ZIP_DEBUGINFO_FILES)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   543
])
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   544
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   545
################################################################################
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   546
#
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   547
# Gcov coverage data for hotspot
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   548
#
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   549
AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE],
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   550
[
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   551
  AC_ARG_ENABLE(native-coverage, [AS_HELP_STRING([--enable-native-coverage],
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   552
      [enable native compilation with code coverage data@<:@disabled@:>@])])
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   553
  GCOV_ENABLED="false"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   554
  if test "x$enable_native_coverage" = "xyes"; then
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   555
    if test "x$TOOLCHAIN_TYPE" = "xgcc"; then
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   556
      AC_MSG_CHECKING([if native coverage is enabled])
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   557
      AC_MSG_RESULT([yes])
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   558
      GCOV_CFLAGS="-fprofile-arcs -ftest-coverage -fno-inline"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   559
      GCOV_LDFLAGS="-fprofile-arcs"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   560
      LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $GCOV_CFLAGS"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   561
      LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $GCOV_CFLAGS"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   562
      LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $GCOV_LDFLAGS"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   563
      CFLAGS_JDKLIB="$CFLAGS_JDKLIB $GCOV_CFLAGS"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   564
      CFLAGS_JDKEXE="$CFLAGS_JDKEXE $GCOV_CFLAGS"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   565
      CXXFLAGS_JDKLIB="$CXXFLAGS_JDKLIB $GCOV_CFLAGS"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   566
      CXXFLAGS_JDKEXE="$CXXFLAGS_JDKEXE $GCOV_CFLAGS"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   567
      LDFLAGS_JDKLIB="$LDFLAGS_JDKLIB $GCOV_LDFLAGS"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   568
      LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE $GCOV_LDFLAGS"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   569
      GCOV_ENABLED="true"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   570
    else
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   571
      AC_MSG_ERROR([--enable-native-coverage only works with toolchain type gcc])
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   572
    fi
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   573
  elif test "x$enable_native_coverage" = "xno"; then
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   574
    AC_MSG_CHECKING([if native coverage is enabled])
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   575
    AC_MSG_RESULT([no])
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   576
  elif test "x$enable_native_coverage" != "x"; then
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   577
    AC_MSG_ERROR([--enable-native-coverage can only be assigned "yes" or "no"])
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   578
  fi
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   579
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   580
  AC_SUBST(GCOV_ENABLED)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29162
diff changeset
   581
])