--- a/common/autoconf/bootcycle-spec.gmk.in Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/bootcycle-spec.gmk.in Tue Dec 13 02:04:18 2016 +0100
@@ -50,9 +50,6 @@
# The bootcycle build has a different output directory
OLD_BUILD_OUTPUT:=@BUILD_OUTPUT@
BUILD_OUTPUT:=$(OLD_BUILD_OUTPUT)/bootcycle-build
-# The HOTSPOT_DIST dir is not defined relative to BUILD_OUTPUT in spec.gmk. Must not
-# use space in this patsubst to avoid leading space in HOTSPOT_DIST.
-HOTSPOT_DIST:=$(patsubst $(OLD_BUILD_OUTPUT)%,$(BUILD_OUTPUT)%,$(HOTSPOT_DIST))
SJAVAC_SERVER_DIR:=$(patsubst $(OLD_BUILD_OUTPUT)%, $(BUILD_OUTPUT)%, $(SJAVAC_SERVER_DIR))
JAVA_CMD:=$(BOOT_JDK)/bin/java
--- a/common/autoconf/buildjdk-spec.gmk.in Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/buildjdk-spec.gmk.in Tue Dec 13 02:04:18 2016 +0100
@@ -44,15 +44,12 @@
# These directories should not be moved to BUILDJDK_OUTPUTDIR
HOTSPOT_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(HOTSPOT_OUTPUTDIR))
-HOTSPOT_DIST := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(HOTSPOT_DIST))
SUPPORT_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(SUPPORT_OUTPUTDIR))
JDK_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(JDK_OUTPUTDIR))
IMAGES_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(IMAGES_OUTPUTDIR))
OPENJDK_BUILD_CPU_LEGACY := @OPENJDK_BUILD_CPU_LEGACY@
OPENJDK_BUILD_CPU_LEGACY_LIB := @OPENJDK_BUILD_CPU_LEGACY_LIB@
-OPENJDK_BUILD_CPU_LIBDIR := @OPENJDK_BUILD_CPU_LIBDIR@
-OPENJDK_TARGET_CPU_LIBDIR := @OPENJDK_BUILD_CPU_LIBDIR@
OPENJDK_TARGET_CPU := @OPENJDK_BUILD_CPU@
OPENJDK_TARGET_CPU_ARCH := @OPENJDK_BUILD_CPU_ARCH@
OPENJDK_TARGET_CPU_BITS := @OPENJDK_BUILD_CPU_BITS@
@@ -90,6 +87,7 @@
BUILD_GTEST := false
JVM_VARIANTS := server
+JVM_VARIANT_MAIN := server
# Some users still set EXTRA_*FLAGS on the make command line. Must
# make sure to override that when building buildjdk.
--- a/common/autoconf/compare.sh.in Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/compare.sh.in Tue Dec 13 02:04:18 2016 +0100
@@ -33,7 +33,6 @@
export OPENJDK_TARGET_OS="@OPENJDK_TARGET_OS@"
export OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@"
-export OPENJDK_TARGET_CPU_LIBDIR="@OPENJDK_TARGET_CPU_LIBDIR@"
export DEBUG_LEVEL="@DEBUG_LEVEL@"
export AWK="@AWK@"
--- a/common/autoconf/configure.ac Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/configure.ac Tue Dec 13 02:04:18 2016 +0100
@@ -205,7 +205,7 @@
# Need toolchain to setup dtrace
HOTSPOT_SETUP_DTRACE
-HOTSPOT_SETUP_JVM_FEATURES
+HOTSPOT_ENABLE_DISABLE_AOT
HOTSPOT_ENABLE_DISABLE_GTEST
###############################################################################
@@ -220,6 +220,10 @@
LIB_DETERMINE_DEPENDENCIES
LIB_SETUP_LIBRARIES
+# Hotspot setup depends on lib checks (AOT needs libelf).
+
+HOTSPOT_SETUP_JVM_FEATURES
+
###############################################################################
#
# We need to do some final tweaking, when everything else is done.
--- a/common/autoconf/flags.m4 Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/flags.m4 Tue Dec 13 02:04:18 2016 +0100
@@ -1160,26 +1160,25 @@
$2JDKLIB_LIBS=""
else
$2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
- -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)"
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base"
if test "x$1" = "xTARGET"; then
- # On some platforms (mac) the linker warns about non existing -L dirs.
- # Add server first if available. Linking aginst client does not always produce the same results.
- # Only add client/minimal dir if client/minimal is being built.
- # Default to server for other variants.
- if HOTSPOT_CHECK_JVM_VARIANT(server); then
- $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
- elif HOTSPOT_CHECK_JVM_VARIANT(client); then
- $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/client"
- elif HOTSPOT_CHECK_JVM_VARIANT(minimal); then
- $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/minimal"
- else
- $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
- fi
+ # On some platforms (mac) the linker warns about non existing -L dirs.
+ # For any of the variants server, client or minimal, the dir matches the
+ # variant name. The "main" variant should be used for linking. For the
+ # rest, the dir is just server.
+ if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) \
+ || HOTSPOT_CHECK_JVM_VARIANT(minimal); then
+ $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$JVM_VARIANT_MAIN"
+ else
+ $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
+ fi
elif test "x$1" = "xBUILD"; then
# When building a buildjdk, it's always only the server variant
$2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
- -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
fi
$2JDKLIB_LIBS="-ljava -ljvm"
--- a/common/autoconf/generated-configure.sh Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/generated-configure.sh Tue Dec 13 02:04:18 2016 +0100
@@ -654,6 +654,17 @@
ENABLE_GENERATE_CLASSLIST
BUILD_FAILURE_HANDLER
ENABLE_INTREE_EC
+VALID_JVM_FEATURES
+JVM_FEATURES_custom
+JVM_FEATURES_zeroshark
+JVM_FEATURES_zero
+JVM_FEATURES_minimal
+JVM_FEATURES_core
+JVM_FEATURES_client
+JVM_FEATURES_server
+INCLUDE_GRAAL
+ELF_LIBS
+ELF_CFLAGS
STLPORT_LIB
LIBZIP_CAN_USE_MMAP
LIBDL
@@ -692,14 +703,7 @@
FIXPATH_DETACH_FLAG
FIXPATH
BUILD_GTEST
-VALID_JVM_FEATURES
-JVM_FEATURES_custom
-JVM_FEATURES_zeroshark
-JVM_FEATURES_zero
-JVM_FEATURES_minimal
-JVM_FEATURES_core
-JVM_FEATURES_client
-JVM_FEATURES_server
+ENABLE_AOT
INCLUDE_DTRACE
GCOV_ENABLED
ZIP_EXTERNAL_DEBUG_SYMBOLS
@@ -867,8 +871,6 @@
IMPORT_MODULES_LIBS
IMPORT_MODULES_CMDS
IMPORT_MODULES_CLASSES
-BUILD_HOTSPOT
-HOTSPOT_DIST
BUILD_OUTPUT
JDK_TOPDIR
NASHORN_TOPDIR
@@ -961,6 +963,7 @@
SPEC
SDKROOT
XCODEBUILD
+JVM_VARIANT_MAIN
VALID_JVM_VARIANTS
JVM_VARIANTS
DEBUG_LEVEL
@@ -981,10 +984,8 @@
OPENJDK_BUILD_CPU_BUNDLE
OPENJDK_BUILD_OS_BUNDLE
OPENJDK_BUILD_OS_EXPORT_DIR
-OPENJDK_BUILD_CPU_JLI_CFLAGS
OPENJDK_BUILD_CPU_OSARCH
OPENJDK_BUILD_CPU_ISADIR
-OPENJDK_BUILD_CPU_LIBDIR
OPENJDK_BUILD_CPU_LEGACY_LIB
OPENJDK_BUILD_CPU_LEGACY
HOTSPOT_TARGET_CPU_DEFINE
@@ -998,10 +999,8 @@
OPENJDK_TARGET_CPU_BUNDLE
OPENJDK_TARGET_OS_BUNDLE
OPENJDK_TARGET_OS_EXPORT_DIR
-OPENJDK_TARGET_CPU_JLI_CFLAGS
OPENJDK_TARGET_CPU_OSARCH
OPENJDK_TARGET_CPU_ISADIR
-OPENJDK_TARGET_CPU_LIBDIR
OPENJDK_TARGET_CPU_LEGACY_LIB
OPENJDK_TARGET_CPU_LEGACY
REQUIRED_OS_VERSION
@@ -1190,8 +1189,7 @@
enable_zip_debug_info
enable_native_coverage
enable_dtrace
-with_jvm_features
-with_jvm_interpreter
+enable_aot
enable_hotspot_gtest
with_stdc__lib
with_msvcr_dll
@@ -1219,6 +1217,11 @@
with_dxsdk
with_dxsdk_lib
with_dxsdk_include
+with_libelf
+with_libelf_include
+with_libelf_lib
+with_jvm_features
+with_jvm_interpreter
enable_jtreg_failure_handler
enable_generate_classlist
with_num_cores
@@ -1343,6 +1346,8 @@
PNG_LIBS
LCMS_CFLAGS
LCMS_LIBS
+ELF_CFLAGS
+ELF_LIBS
ICECC_CMD
ICECC_CREATE_ENV
ICECC_WRAPPER
@@ -1988,6 +1993,10 @@
--enable-dtrace[=yes/no/auto]
enable dtrace. Default is auto, where dtrace is
enabled if all dependencies are present.
+ --enable-aot[=yes/no/auto]
+ enable ahead of time compilation feature. Default is
+ auto, where aot is enabled if all dependencies are
+ present.
--disable-hotspot-gtest Disables building of the Hotspot unit tests
--disable-freetype-bundling
disable bundling of the freetype library with the
@@ -2097,9 +2106,8 @@
compatibility and is ignored
--with-override-jdk Deprecated. Option is kept for backwards
compatibility and is ignored
- --with-import-hotspot import hotspot binaries from this jdk image or
- hotspot build dist dir instead of building from
- source
+ --with-import_hotspot Deprecated. Option is kept for backwards
+ compatibility and is ignored
--with-import-modules import a set of prebuilt modules either as a zip
file or an exploded directory
--with-toolchain-type the toolchain type (or family) to use, use '--help'
@@ -2116,10 +2124,6 @@
--with-native-debug-symbols
set the native debug symbol configuration (none,
internal, external, zipped) [varying]
- --with-jvm-features additional JVM features to enable (separated by
- comma), use '--help' to show possible values [none]
- --with-jvm-interpreter Deprecated. Option is kept for backwards
- compatibility and is ignored
--with-stdc++lib=<static>,<dynamic>,<default>
force linking of the C++ runtime on Linux to either
static or dynamic, default is static with dynamic as
@@ -2166,6 +2170,15 @@
compatibility and is ignored
--with-dxsdk-include Deprecated. Option is kept for backwards
compatibility and is ignored
+ --with-libelf specify prefix directory for the libelf package
+ (expecting the libraries under PATH/lib and the
+ headers under PATH/include)
+ --with-libelf-include specify directory for the libelf include files
+ --with-libelf-lib specify directory for the libelf library
+ --with-jvm-features additional JVM features to enable (separated by
+ comma), use '--help' to show possible values [none]
+ --with-jvm-interpreter Deprecated. Option is kept for backwards
+ compatibility and is ignored
--with-num-cores number of cores in the build system, e.g.
--with-num-cores=8 [probed]
--with-memory-size memory (in MB) available in the build system, e.g.
@@ -2295,6 +2308,8 @@
PNG_LIBS linker flags for PNG, overriding pkg-config
LCMS_CFLAGS C compiler flags for LCMS, overriding pkg-config
LCMS_LIBS linker flags for LCMS, overriding pkg-config
+ ELF_CFLAGS C compiler flags for ELF, overriding pkg-config
+ ELF_LIBS linker flags for ELF, overriding pkg-config
ICECC_CMD Override default value for ICECC_CMD
ICECC_CREATE_ENV
Override default value for ICECC_CREATE_ENV
@@ -4182,6 +4197,8 @@
PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
dtrace)
PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;;
+ elf)
+ PKGHANDLER_COMMAND="sudo apt-get install libelf-dev" ;;
esac
}
@@ -4201,6 +4218,8 @@
PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;;
ccache)
PKGHANDLER_COMMAND="sudo yum install ccache" ;;
+ elf)
+ PKGHANDLER_COMMAND="sudo yum install elfutils-libelf-devel" ;;
esac
}
@@ -4253,7 +4272,7 @@
# All valid JVM features, regardless of platform
VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \
- fprof vm-structs jni-check services management all-gcs nmt cds static-build"
+ graal fprof vm-structs jni-check services management all-gcs nmt cds static-build aot"
# All valid JVM variants
VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
@@ -4297,6 +4316,11 @@
#
+################################################################################
+# Check if AOT should be enabled
+#
+
+
###############################################################################
# Set up all JVM features for each JVM variant.
#
@@ -4720,6 +4744,36 @@
################################################################################
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################################
+# Setup libelf (ELF library)
+################################################################################
+
+
################################################################################
# Determine which libraries are needed for this configuration
@@ -5088,7 +5142,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1481104795
+DATE_WHEN_GENERATED=1481496095
###############################################################################
#
@@ -15790,15 +15844,6 @@
fi
- # This is the name of the cpu (but using i386 and amd64 instead of
- # x86 and x86_64, respectively), preceeded by a /, to be used when
- # locating libraries. On macosx, it's empty, though.
- OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB"
- if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- OPENJDK_TARGET_CPU_LIBDIR=""
- fi
-
-
# OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
# /amd64 or /sparcv9. This string is appended to some library paths, like this:
# /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so
@@ -15830,16 +15875,6 @@
# On all platforms except macosx, we replace x86_64 with amd64.
OPENJDK_TARGET_CPU_JLI="amd64"
fi
- # Now setup the -D flags for building libjli.
- OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
- if test "x$OPENJDK_TARGET_OS" = xsolaris; then
- if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
- OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
- elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
- OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
- fi
- fi
-
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
OPENJDK_TARGET_OS_EXPORT_DIR=macosx
@@ -15965,15 +16000,6 @@
fi
- # This is the name of the cpu (but using i386 and amd64 instead of
- # x86 and x86_64, respectively), preceeded by a /, to be used when
- # locating libraries. On macosx, it's empty, though.
- OPENJDK_BUILD_CPU_LIBDIR="/$OPENJDK_BUILD_CPU_LEGACY_LIB"
- if test "x$OPENJDK_BUILD_OS" = xmacosx; then
- OPENJDK_BUILD_CPU_LIBDIR=""
- fi
-
-
# OPENJDK_BUILD_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
# /amd64 or /sparcv9. This string is appended to some library paths, like this:
# /usr/lib${OPENJDK_BUILD_CPU_ISADIR}/libexample.so
@@ -16005,16 +16031,6 @@
# On all platforms except macosx, we replace x86_64 with amd64.
OPENJDK_BUILD_CPU_JLI="amd64"
fi
- # Now setup the -D flags for building libjli.
- OPENJDK_BUILD_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_BUILD_CPU_JLI\"'"
- if test "x$OPENJDK_BUILD_OS" = xsolaris; then
- if test "x$OPENJDK_BUILD_CPU_ARCH" = xsparc; then
- OPENJDK_BUILD_CPU_JLI_CFLAGS="$OPENJDK_BUILD_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
- elif test "x$OPENJDK_BUILD_CPU_ARCH" = xx86; then
- OPENJDK_BUILD_CPU_JLI_CFLAGS="$OPENJDK_BUILD_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
- fi
- fi
-
if test "x$OPENJDK_BUILD_OS" = xmacosx; then
OPENJDK_BUILD_OS_EXPORT_DIR=macosx
@@ -16750,6 +16766,21 @@
as_fn_error $? "You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS." "$LINENO" 5
fi
+ # The "main" variant is the one used by other libs to link against during the
+ # build.
+ if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then
+ MAIN_VARIANT_PRIO_ORDER="server client minimal"
+ for variant in $MAIN_VARIANT_PRIO_ORDER; do
+ if [[ " $JVM_VARIANTS " =~ " $variant " ]] ; then
+ JVM_VARIANT_MAIN="$variant"
+ break
+ fi
+ done
+ else
+ JVM_VARIANT_MAIN="$JVM_VARIANTS"
+ fi
+
+
@@ -30992,33 +31023,17 @@
BUILD_OUTPUT="$OUTPUT_ROOT"
-
- HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
- BUILD_HOTSPOT=true
-
-
-
-# Check whether --with-import-hotspot was given.
+ JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
+
+
+
+# Check whether --with-import_hotspot was given.
if test "${with_import_hotspot+set}" = set; then :
- withval=$with_import_hotspot;
-fi
-
- if test "x$with_import_hotspot" != x; then
- CURDIR="$PWD"
- cd "$with_import_hotspot"
- HOTSPOT_DIST="`pwd`"
- cd "$CURDIR"
- if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then
- as_fn_error $? "You have to import hotspot from a full jdk image or hotspot build dist dir!" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be imported" >&5
-$as_echo_n "checking if hotspot should be imported... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes from $HOTSPOT_DIST" >&5
-$as_echo "yes from $HOTSPOT_DIST" >&6; }
- BUILD_HOTSPOT=false
- fi
-
- JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
+ withval=$with_import_hotspot; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-import_hotspot is deprecated and will be ignored." >&5
+$as_echo "$as_me: WARNING: Option --with-import_hotspot is deprecated and will be ignored." >&2;}
+fi
+
+
@@ -50379,26 +50394,25 @@
JDKLIB_LIBS=""
else
JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \
- -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)"
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base"
if test "xTARGET" = "xTARGET"; then
- # On some platforms (mac) the linker warns about non existing -L dirs.
- # Add server first if available. Linking aginst client does not always produce the same results.
- # Only add client/minimal dir if client/minimal is being built.
- # Default to server for other variants.
- if [[ " $JVM_VARIANTS " =~ " server " ]] ; then
- JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server"
- elif [[ " $JVM_VARIANTS " =~ " client " ]] ; then
- JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/client"
- elif [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then
- JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/minimal"
- else
- JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server"
- fi
+ # On some platforms (mac) the linker warns about non existing -L dirs.
+ # For any of the variants server, client or minimal, the dir matches the
+ # variant name. The "main" variant should be used for linking. For the
+ # rest, the dir is just server.
+ if [[ " $JVM_VARIANTS " =~ " server " ]] || [[ " $JVM_VARIANTS " =~ " client " ]] \
+ || [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then
+ JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$JVM_VARIANT_MAIN"
+ else
+ JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
+ fi
elif test "xTARGET" = "xBUILD"; then
# When building a buildjdk, it's always only the server variant
JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \
- -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server"
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
fi
JDKLIB_LIBS="-ljava -ljvm"
@@ -51202,26 +51216,25 @@
OPENJDK_BUILD_JDKLIB_LIBS=""
else
OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \
- -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)"
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base"
if test "xBUILD" = "xTARGET"; then
- # On some platforms (mac) the linker warns about non existing -L dirs.
- # Add server first if available. Linking aginst client does not always produce the same results.
- # Only add client/minimal dir if client/minimal is being built.
- # Default to server for other variants.
- if [[ " $JVM_VARIANTS " =~ " server " ]] ; then
- OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server"
- elif [[ " $JVM_VARIANTS " =~ " client " ]] ; then
- OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/client"
- elif [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then
- OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/minimal"
- else
- OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server"
- fi
+ # On some platforms (mac) the linker warns about non existing -L dirs.
+ # For any of the variants server, client or minimal, the dir matches the
+ # variant name. The "main" variant should be used for linking. For the
+ # rest, the dir is just server.
+ if [[ " $JVM_VARIANTS " =~ " server " ]] || [[ " $JVM_VARIANTS " =~ " client " ]] \
+ || [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then
+ OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$JVM_VARIANT_MAIN"
+ else
+ OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
+ fi
elif test "xBUILD" = "xBUILD"; then
# When building a buildjdk, it's always only the server variant
OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \
- -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server"
+ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
fi
OPENJDK_BUILD_JDKLIB_LIBS="-ljava -ljvm"
@@ -52740,112 +52753,51 @@
- # The user can in some cases supply additional jvm features. For the custom
- # variant, this defines the entire variant.
-
-# Check whether --with-jvm-features was given.
-if test "${with_jvm_features+set}" = set; then :
- withval=$with_jvm_features;
-fi
-
- if test "x$with_jvm_features" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking additional JVM features" >&5
-$as_echo_n "checking additional JVM features... " >&6; }
- JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JVM_FEATURES" >&5
-$as_echo "$JVM_FEATURES" >&6; }
- fi
-
- # Verify that dependencies are met for explicitly set features.
- if [[ " $JVM_FEATURES " =~ " jvmti " ]] && ! [[ " $JVM_FEATURES " =~ " services " ]] ; then
- as_fn_error $? "Specified JVM feature 'jvmti' requires feature 'services'" "$LINENO" 5
- fi
-
- if [[ " $JVM_FEATURES " =~ " management " ]] && ! [[ " $JVM_FEATURES " =~ " nmt " ]] ; then
- as_fn_error $? "Specified JVM feature 'management' requires feature 'nmt'" "$LINENO" 5
- fi
-
- if [[ " $JVM_FEATURES " =~ " jvmci " ]] && ! ( [[ " $JVM_FEATURES " =~ " compiler1 " ]] || [[ " $JVM_FEATURES " =~ " compiler2 " ]] ); then
- as_fn_error $? "Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1'" "$LINENO" 5
- fi
-
- if [[ " $JVM_FEATURES " =~ " compiler2 " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then
- as_fn_error $? "Specified JVM feature 'compiler2' requires feature 'all-gcs'" "$LINENO" 5
- fi
-
- if [[ " $JVM_FEATURES " =~ " vm-structs " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then
- as_fn_error $? "Specified JVM feature 'vm-structs' requires feature 'all-gcs'" "$LINENO" 5
- fi
-
- # Turn on additional features based on other parts of configure
- if test "x$INCLUDE_DTRACE" = "xtrue"; then
- JVM_FEATURES="$JVM_FEATURES dtrace"
- else
- if [[ " $JVM_FEATURES " =~ " dtrace " ]] ; then
- as_fn_error $? "To enable dtrace, you must use --enable-dtrace" "$LINENO" 5
- fi
- fi
-
- if test "x$STATIC_BUILD" = "xtrue"; then
- JVM_FEATURES="$JVM_FEATURES static-build"
- else
- if [[ " $JVM_FEATURES " =~ " static-build " ]] ; then
- as_fn_error $? "To enable static-build, you must use --enable-static-build" "$LINENO" 5
- fi
- fi
-
- if ! [[ " $JVM_VARIANTS " =~ " zero " ]] && ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then
- if [[ " $JVM_FEATURES " =~ " zero " ]] ; then
- as_fn_error $? "To enable zero/zeroshark, you must use --with-jvm-variants=zero/zeroshark" "$LINENO" 5
- fi
- fi
-
- if ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then
- if [[ " $JVM_FEATURES " =~ " shark " ]] ; then
- as_fn_error $? "To enable shark, you must use --with-jvm-variants=zeroshark" "$LINENO" 5
- fi
- fi
-
- # Only enable jvmci on x86_64, sparcv9 and aarch64.
- if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
- test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
- test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
- JVM_FEATURES_jvmci="jvmci"
- else
- JVM_FEATURES_jvmci=""
- fi
-
- # All variants but minimal (and custom) get these features
- NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
-
- # Enable features depending on variant.
- JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
- JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
- JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
- JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES"
- JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
- JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES"
- JVM_FEATURES_custom="$JVM_FEATURES"
-
-
-
-
-
-
-
-
-
- # Used for verification of Makefiles by check-jvm-feature
-
-
- # We don't support --with-jvm-interpreter anymore, use zero instead.
-
-
-# Check whether --with-jvm-interpreter was given.
-if test "${with_jvm_interpreter+set}" = set; then :
- withval=$with_jvm_interpreter; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&5
-$as_echo "$as_me: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&2;}
-fi
+ # Check whether --enable-aot was given.
+if test "${enable_aot+set}" = set; then :
+ enableval=$enable_aot;
+fi
+
+
+ if test "x$enable_aot" = "x" || test "x$enable_aot" = "xauto"; then
+ ENABLE_AOT="true"
+ elif test "x$enable_aot" = "xyes"; then
+ ENABLE_AOT="true"
+ elif test "x$enable_aot" = "xno"; then
+ ENABLE_AOT="false"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if aot should be enabled" >&5
+$as_echo_n "checking if aot should be enabled... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, forced" >&5
+$as_echo "no, forced" >&6; }
+ else
+ as_fn_error $? "Invalid value for --enable-aot: $enable_aot" "$LINENO" 5
+ fi
+
+ if test "x$ENABLE_AOT" = "xtrue"; then
+ # Only enable AOT on linux-X64.
+ if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then
+ if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
+ if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then
+ ENABLE_AOT="true"
+ else
+ ENABLE_AOT="false"
+ if test "x$enable_aot" = "xyes"; then
+ as_fn_error $? "Cannot build AOT without hotspot/src/jdk.vm.compiler sources. Remove --enable-aot." "$LINENO" 5
+ fi
+ fi
+ else
+ ENABLE_AOT="false"
+ if test "x$enable_aot" = "xyes"; then
+ as_fn_error $? "Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot." "$LINENO" 5
+ fi
+ fi
+ else
+ ENABLE_AOT="false"
+ if test "x$enable_aot" = "xyes"; then
+ as_fn_error $? "AOT is currently only supported on Linux-x86_64. Remove --enable-aot." "$LINENO" 5
+ fi
+ fi
+ fi
@@ -63814,13 +63766,450 @@
-
-
-
-
-
-
-
+# Check whether --with-libelf was given.
+if test "${with_libelf+set}" = set; then :
+ withval=$with_libelf;
+fi
+
+
+# Check whether --with-libelf-include was given.
+if test "${with_libelf_include+set}" = set; then :
+ withval=$with_libelf_include;
+fi
+
+
+# Check whether --with-libelf-lib was given.
+if test "${with_libelf_lib+set}" = set; then :
+ withval=$with_libelf_lib;
+fi
+
+
+ if test "x$ENABLE_AOT" = xfalse; then
+ if (test "x${with_libelf}" != x && test "x${with_libelf}" != xno) || \
+ (test "x${with_libelf_include}" != x && test "x${with_libelf_include}" != xno) || \
+ (test "x${with_libelf_lib}" != x && test "x${with_libelf_lib}" != xno); then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libelf is not used, so --with-libelf[-*] is ignored" >&5
+$as_echo "$as_me: WARNING: libelf is not used, so --with-libelf[-*] is ignored" >&2;}
+ fi
+ LIBELF_CFLAGS=
+ LIBELF_LIBS=
+ else
+ LIBELF_FOUND=no
+
+ if test "x${with_libelf}" = xno || test "x${with_libelf_include}" = xno || test "x${with_libelf_lib}" = xno; then
+ ENABLE_AOT="false"
+ if test "x${enable_aot}" = xyes; then
+ as_fn_error $? "libelf is explicitly disabled, cannot build AOT. Enable libelf or remove --enable-aot to disable AOT." "$LINENO" 5
+ fi
+ else
+ if test "x${with_libelf}" != x; then
+ ELF_LIBS="-L${with_libelf}/lib -lelf"
+ ELF_CFLAGS="-I${with_libelf}/include"
+ LIBELF_FOUND=yes
+ fi
+ if test "x${with_libelf_include}" != x; then
+ ELF_CFLAGS="-I${with_libelf_include}"
+ LIBELF_FOUND=yes
+ fi
+ if test "x${with_libelf_lib}" != x; then
+ ELF_LIBS="-L${with_libelf_lib} -lelf"
+ LIBELF_FOUND=yes
+ fi
+ # Do not try pkg-config if we have a sysroot set.
+ if test "x$SYSROOT" = x; then
+ if test "x$LIBELF_FOUND" = xno; then
+ # Figure out ELF_CFLAGS and ELF_LIBS
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5
+$as_echo_n "checking for ELF... " >&6; }
+
+if test -n "$ELF_CFLAGS"; then
+ pkg_cv_ELF_CFLAGS="$ELF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelf\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libelf") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_ELF_CFLAGS=`$PKG_CONFIG --cflags "libelf" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$ELF_LIBS"; then
+ pkg_cv_ELF_LIBS="$ELF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelf\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libelf") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_ELF_LIBS=`$PKG_CONFIG --libs "libelf" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ ELF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libelf" 2>&1`
+ else
+ ELF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libelf" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ELF_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ LIBELF_FOUND=no
+elif test $pkg_failed = untried; then
+ LIBELF_FOUND=no
+else
+ ELF_CFLAGS=$pkg_cv_ELF_CFLAGS
+ ELF_LIBS=$pkg_cv_ELF_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ LIBELF_FOUND=yes
+fi
+ fi
+ fi
+ if test "x$LIBELF_FOUND" = xno; then
+ for ac_header in libelf.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "libelf.h" "ac_cv_header_libelf_h" "$ac_includes_default"
+if test "x$ac_cv_header_libelf_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBELF_H 1
+_ACEOF
+
+ LIBELF_FOUND=yes
+ ELF_CFLAGS=
+ ELF_LIBS=-lelf
+
+else
+ LIBELF_FOUND=no
+
+fi
+
+done
+
+ fi
+ if test "x$LIBELF_FOUND" = xno; then
+ ENABLE_AOT="false"
+
+ # Print a helpful message on how to acquire the necessary build dependency.
+ # elf is the help tag: freetype, cups, alsa etc
+ MISSING_DEPENDENCY=elf
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
+
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
+ fi
+
+ if test "x${enable_aot}" = xyes; then
+ as_fn_error $? "libelf not found, cannot build AOT. Remove --enable-aot to disable AOT or: $HELP_MSG" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libelf not found, cannot build AOT. $HELP_MSG" >&5
+$as_echo "$as_me: WARNING: libelf not found, cannot build AOT. $HELP_MSG" >&2;}
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libelf works" >&5
+$as_echo_n "checking if libelf works... " >&6; }
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ OLD_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $ELF_CFLAGS"
+ OLD_LIBS="$LIBS"
+ LIBS="$LIBS $ELF_LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <libelf.h>
+int
+main ()
+{
+
+ elf_version(0);
+ return 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ LIBELF_WORKS=yes
+else
+ LIBELF_WORKS=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$OLD_CFLAGS"
+ LIBS="$OLD_LIBS"
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBELF_WORKS" >&5
+$as_echo "$LIBELF_WORKS" >&6; }
+
+ if test "x$LIBELF_WORKS" = xno; then
+ ENABLE_AOT="false"
+
+ # Print a helpful message on how to acquire the necessary build dependency.
+ # elf is the help tag: freetype, cups, alsa etc
+ MISSING_DEPENDENCY=elf
+
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ cygwin_help $MISSING_DEPENDENCY
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ msys_help $MISSING_DEPENDENCY
+ else
+ PKGHANDLER_COMMAND=
+
+ case $PKGHANDLER in
+ apt-get)
+ apt_help $MISSING_DEPENDENCY ;;
+ yum)
+ yum_help $MISSING_DEPENDENCY ;;
+ port)
+ port_help $MISSING_DEPENDENCY ;;
+ pkgutil)
+ pkgutil_help $MISSING_DEPENDENCY ;;
+ pkgadd)
+ pkgadd_help $MISSING_DEPENDENCY ;;
+ esac
+
+ if test "x$PKGHANDLER_COMMAND" != x; then
+ HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
+ fi
+ fi
+
+ if test "x$enable_aot" = "xyes"; then
+ as_fn_error $? "Found libelf but could not link and compile with it. Remove --enable-aot to disable AOT or: $HELP_MSG" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found libelf but could not link and compile with it. $HELP_MSG" >&5
+$as_echo "$as_me: WARNING: Found libelf but could not link and compile with it. $HELP_MSG" >&2;}
+ fi
+ fi
+ fi
+ fi
+ fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Hotspot setup depends on lib checks (AOT needs libelf).
+
+
+ # The user can in some cases supply additional jvm features. For the custom
+ # variant, this defines the entire variant.
+
+# Check whether --with-jvm-features was given.
+if test "${with_jvm_features+set}" = set; then :
+ withval=$with_jvm_features;
+fi
+
+ if test "x$with_jvm_features" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking additional JVM features" >&5
+$as_echo_n "checking additional JVM features... " >&6; }
+ JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JVM_FEATURES" >&5
+$as_echo "$JVM_FEATURES" >&6; }
+ fi
+
+ # Verify that dependencies are met for explicitly set features.
+ if [[ " $JVM_FEATURES " =~ " jvmti " ]] && ! [[ " $JVM_FEATURES " =~ " services " ]] ; then
+ as_fn_error $? "Specified JVM feature 'jvmti' requires feature 'services'" "$LINENO" 5
+ fi
+
+ if [[ " $JVM_FEATURES " =~ " management " ]] && ! [[ " $JVM_FEATURES " =~ " nmt " ]] ; then
+ as_fn_error $? "Specified JVM feature 'management' requires feature 'nmt'" "$LINENO" 5
+ fi
+
+ if [[ " $JVM_FEATURES " =~ " jvmci " ]] && ! ( [[ " $JVM_FEATURES " =~ " compiler1 " ]] || [[ " $JVM_FEATURES " =~ " compiler2 " ]] ); then
+ as_fn_error $? "Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1'" "$LINENO" 5
+ fi
+
+ if [[ " $JVM_FEATURES " =~ " compiler2 " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then
+ as_fn_error $? "Specified JVM feature 'compiler2' requires feature 'all-gcs'" "$LINENO" 5
+ fi
+
+ if [[ " $JVM_FEATURES " =~ " vm-structs " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then
+ as_fn_error $? "Specified JVM feature 'vm-structs' requires feature 'all-gcs'" "$LINENO" 5
+ fi
+
+ # Turn on additional features based on other parts of configure
+ if test "x$INCLUDE_DTRACE" = "xtrue"; then
+ JVM_FEATURES="$JVM_FEATURES dtrace"
+ else
+ if [[ " $JVM_FEATURES " =~ " dtrace " ]] ; then
+ as_fn_error $? "To enable dtrace, you must use --enable-dtrace" "$LINENO" 5
+ fi
+ fi
+
+ if test "x$STATIC_BUILD" = "xtrue"; then
+ JVM_FEATURES="$JVM_FEATURES static-build"
+ else
+ if [[ " $JVM_FEATURES " =~ " static-build " ]] ; then
+ as_fn_error $? "To enable static-build, you must use --enable-static-build" "$LINENO" 5
+ fi
+ fi
+
+ if ! [[ " $JVM_VARIANTS " =~ " zero " ]] && ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then
+ if [[ " $JVM_FEATURES " =~ " zero " ]] ; then
+ as_fn_error $? "To enable zero/zeroshark, you must use --with-jvm-variants=zero/zeroshark" "$LINENO" 5
+ fi
+ fi
+
+ if ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then
+ if [[ " $JVM_FEATURES " =~ " shark " ]] ; then
+ as_fn_error $? "To enable shark, you must use --with-jvm-variants=zeroshark" "$LINENO" 5
+ fi
+ fi
+
+ # Only enable jvmci on x86_64, sparcv9 and aarch64.
+ if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
+ test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
+ test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
+ JVM_FEATURES_jvmci="jvmci"
+ else
+ JVM_FEATURES_jvmci=""
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jdk.vm.compiler should be built" >&5
+$as_echo_n "checking if jdk.vm.compiler should be built... " >&6; }
+ if [[ " $JVM_FEATURES " =~ " graal " ]] ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5
+$as_echo "yes, forced" >&6; }
+ if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then
+ as_fn_error $? "Specified JVM feature 'graal' requires feature 'jvmci'" "$LINENO" 5
+ fi
+ INCLUDE_GRAAL="true"
+ else
+ # By default enable graal build where AOT is available
+ if test "x$ENABLE_AOT" = "xtrue"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ JVM_FEATURES_graal="graal"
+ INCLUDE_GRAAL="true"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ JVM_FEATURES_graal=""
+ INCLUDE_GRAAL="false"
+ fi
+ fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if aot should be enabled" >&5
+$as_echo_n "checking if aot should be enabled... " >&6; }
+ if test "x$ENABLE_AOT" = "xtrue"; then
+ if test "x$enable_aot" = "xyes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5
+$as_echo "yes, forced" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ fi
+ JVM_FEATURES_aot="aot"
+ else
+ if test "x$enable_aot" = "xno"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, forced" >&5
+$as_echo "no, forced" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ JVM_FEATURES_aot=""
+ fi
+
+ # All variants but minimal (and custom) get these features
+ NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
+
+ # Enable features depending on variant.
+ JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
+ JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
+ JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
+ JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES"
+ JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
+ JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES"
+ JVM_FEATURES_custom="$JVM_FEATURES"
+
+
+
+
+
+
+
+
+
+ # Used for verification of Makefiles by check-jvm-feature
+
+
+ # We don't support --with-jvm-interpreter anymore, use zero instead.
+
+
+# Check whether --with-jvm-interpreter was given.
+if test "${with_jvm_interpreter+set}" = set; then :
+ withval=$with_jvm_interpreter; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&5
+$as_echo "$as_me: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&2;}
+fi
--- a/common/autoconf/help.m4 Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/help.m4 Tue Dec 13 02:04:18 2016 +0100
@@ -121,6 +121,8 @@
PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
dtrace)
PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;;
+ elf)
+ PKGHANDLER_COMMAND="sudo apt-get install libelf-dev" ;;
esac
}
@@ -140,6 +142,8 @@
PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;;
ccache)
PKGHANDLER_COMMAND="sudo yum install ccache" ;;
+ elf)
+ PKGHANDLER_COMMAND="sudo yum install elfutils-libelf-devel" ;;
esac
}
--- a/common/autoconf/hotspot.m4 Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/hotspot.m4 Tue Dec 13 02:04:18 2016 +0100
@@ -25,7 +25,7 @@
# All valid JVM features, regardless of platform
VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \
- fprof vm-structs jni-check services management all-gcs nmt cds static-build"
+ graal fprof vm-structs jni-check services management all-gcs nmt cds static-build aot"
# All valid JVM variants
VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
@@ -111,8 +111,23 @@
AC_MSG_ERROR([You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS.])
fi
+ # The "main" variant is the one used by other libs to link against during the
+ # build.
+ if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then
+ MAIN_VARIANT_PRIO_ORDER="server client minimal"
+ for variant in $MAIN_VARIANT_PRIO_ORDER; do
+ if HOTSPOT_CHECK_JVM_VARIANT($variant); then
+ JVM_VARIANT_MAIN="$variant"
+ break
+ fi
+ done
+ else
+ JVM_VARIANT_MAIN="$JVM_VARIANTS"
+ fi
+
AC_SUBST(JVM_VARIANTS)
AC_SUBST(VALID_JVM_VARIANTS)
+ AC_SUBST(JVM_VARIANT_MAIN)
if HOTSPOT_CHECK_JVM_VARIANT(zero) || HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then
# zero behaves as a platform and rewrites these values. This is really weird. :(
@@ -174,6 +189,55 @@
AC_SUBST(INCLUDE_DTRACE)
])
+################################################################################
+# Check if AOT should be enabled
+#
+AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
+[
+ AC_ARG_ENABLE([aot], [AS_HELP_STRING([--enable-aot@<:@=yes/no/auto@:>@],
+ [enable ahead of time compilation feature. Default is auto, where aot is enabled if all dependencies are present.])])
+
+ if test "x$enable_aot" = "x" || test "x$enable_aot" = "xauto"; then
+ ENABLE_AOT="true"
+ elif test "x$enable_aot" = "xyes"; then
+ ENABLE_AOT="true"
+ elif test "x$enable_aot" = "xno"; then
+ ENABLE_AOT="false"
+ AC_MSG_CHECKING([if aot should be enabled])
+ AC_MSG_RESULT([no, forced])
+ else
+ AC_MSG_ERROR([Invalid value for --enable-aot: $enable_aot])
+ fi
+
+ if test "x$ENABLE_AOT" = "xtrue"; then
+ # Only enable AOT on linux-X64.
+ if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then
+ if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
+ if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then
+ ENABLE_AOT="true"
+ else
+ ENABLE_AOT="false"
+ if test "x$enable_aot" = "xyes"; then
+ AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.vm.compiler sources. Remove --enable-aot.])
+ fi
+ fi
+ else
+ ENABLE_AOT="false"
+ if test "x$enable_aot" = "xyes"; then
+ AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot.])
+ fi
+ fi
+ else
+ ENABLE_AOT="false"
+ if test "x$enable_aot" = "xyes"; then
+ AC_MSG_ERROR([AOT is currently only supported on Linux-x86_64. Remove --enable-aot.])
+ fi
+ fi
+ fi
+
+ AC_SUBST(ENABLE_AOT)
+])
+
###############################################################################
# Set up all JVM features for each JVM variant.
#
@@ -241,18 +305,57 @@
# Only enable jvmci on x86_64, sparcv9 and aarch64.
if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
- test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
- test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
+ test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
+ test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
JVM_FEATURES_jvmci="jvmci"
else
JVM_FEATURES_jvmci=""
fi
+ AC_MSG_CHECKING([if jdk.vm.compiler should be built])
+ if HOTSPOT_CHECK_JVM_FEATURE(graal); then
+ AC_MSG_RESULT([yes, forced])
+ if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then
+ AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci'])
+ fi
+ INCLUDE_GRAAL="true"
+ else
+ # By default enable graal build where AOT is available
+ if test "x$ENABLE_AOT" = "xtrue"; then
+ AC_MSG_RESULT([yes])
+ JVM_FEATURES_graal="graal"
+ INCLUDE_GRAAL="true"
+ else
+ AC_MSG_RESULT([no])
+ JVM_FEATURES_graal=""
+ INCLUDE_GRAAL="false"
+ fi
+ fi
+
+ AC_SUBST(INCLUDE_GRAAL)
+
+ AC_MSG_CHECKING([if aot should be enabled])
+ if test "x$ENABLE_AOT" = "xtrue"; then
+ if test "x$enable_aot" = "xyes"; then
+ AC_MSG_RESULT([yes, forced])
+ else
+ AC_MSG_RESULT([yes])
+ fi
+ JVM_FEATURES_aot="aot"
+ else
+ if test "x$enable_aot" = "xno"; then
+ AC_MSG_RESULT([no, forced])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ JVM_FEATURES_aot=""
+ fi
+
# All variants but minimal (and custom) get these features
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
# Enable features depending on variant.
- JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
+ JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/autoconf/lib-elf.m4 Tue Dec 13 02:04:18 2016 +0100
@@ -0,0 +1,129 @@
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################################
+# Setup libelf (ELF library)
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_LIBELF],
+[
+ AC_ARG_WITH(libelf, [AS_HELP_STRING([--with-libelf],
+ [specify prefix directory for the libelf package
+ (expecting the libraries under PATH/lib and the headers under PATH/include)])])
+ AC_ARG_WITH(libelf-include, [AS_HELP_STRING([--with-libelf-include],
+ [specify directory for the libelf include files])])
+ AC_ARG_WITH(libelf-lib, [AS_HELP_STRING([--with-libelf-lib],
+ [specify directory for the libelf library])])
+
+ if test "x$ENABLE_AOT" = xfalse; then
+ if (test "x${with_libelf}" != x && test "x${with_libelf}" != xno) || \
+ (test "x${with_libelf_include}" != x && test "x${with_libelf_include}" != xno) || \
+ (test "x${with_libelf_lib}" != x && test "x${with_libelf_lib}" != xno); then
+ AC_MSG_WARN([[libelf is not used, so --with-libelf[-*] is ignored]])
+ fi
+ LIBELF_CFLAGS=
+ LIBELF_LIBS=
+ else
+ LIBELF_FOUND=no
+
+ if test "x${with_libelf}" = xno || test "x${with_libelf_include}" = xno || test "x${with_libelf_lib}" = xno; then
+ ENABLE_AOT="false"
+ if test "x${enable_aot}" = xyes; then
+ AC_MSG_ERROR([libelf is explicitly disabled, cannot build AOT. Enable libelf or remove --enable-aot to disable AOT.])
+ fi
+ else
+ if test "x${with_libelf}" != x; then
+ ELF_LIBS="-L${with_libelf}/lib -lelf"
+ ELF_CFLAGS="-I${with_libelf}/include"
+ LIBELF_FOUND=yes
+ fi
+ if test "x${with_libelf_include}" != x; then
+ ELF_CFLAGS="-I${with_libelf_include}"
+ LIBELF_FOUND=yes
+ fi
+ if test "x${with_libelf_lib}" != x; then
+ ELF_LIBS="-L${with_libelf_lib} -lelf"
+ LIBELF_FOUND=yes
+ fi
+ # Do not try pkg-config if we have a sysroot set.
+ if test "x$SYSROOT" = x; then
+ if test "x$LIBELF_FOUND" = xno; then
+ # Figure out ELF_CFLAGS and ELF_LIBS
+ PKG_CHECK_MODULES([ELF], [libelf], [LIBELF_FOUND=yes], [LIBELF_FOUND=no])
+ fi
+ fi
+ if test "x$LIBELF_FOUND" = xno; then
+ AC_CHECK_HEADERS([libelf.h],
+ [
+ LIBELF_FOUND=yes
+ ELF_CFLAGS=
+ ELF_LIBS=-lelf
+ ],
+ [LIBELF_FOUND=no]
+ )
+ fi
+ if test "x$LIBELF_FOUND" = xno; then
+ ENABLE_AOT="false"
+ HELP_MSG_MISSING_DEPENDENCY([elf])
+ if test "x${enable_aot}" = xyes; then
+ AC_MSG_ERROR([libelf not found, cannot build AOT. Remove --enable-aot to disable AOT or: $HELP_MSG])
+ else
+ AC_MSG_WARN([libelf not found, cannot build AOT. $HELP_MSG])
+ fi
+ else
+ AC_MSG_CHECKING([if libelf works])
+ AC_LANG_PUSH(C)
+ OLD_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $ELF_CFLAGS"
+ OLD_LIBS="$LIBS"
+ LIBS="$LIBS $ELF_LIBS"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <libelf.h>],
+ [
+ elf_version(0);
+ return 0;
+ ])],
+ [LIBELF_WORKS=yes],
+ [LIBELF_WORKS=no]
+ )
+ CFLAGS="$OLD_CFLAGS"
+ LIBS="$OLD_LIBS"
+ AC_LANG_POP(C)
+ AC_MSG_RESULT([$LIBELF_WORKS])
+
+ if test "x$LIBELF_WORKS" = xno; then
+ ENABLE_AOT="false"
+ HELP_MSG_MISSING_DEPENDENCY([elf])
+ if test "x$enable_aot" = "xyes"; then
+ AC_MSG_ERROR([Found libelf but could not link and compile with it. Remove --enable-aot to disable AOT or: $HELP_MSG])
+ else
+ AC_MSG_WARN([Found libelf but could not link and compile with it. $HELP_MSG])
+ fi
+ fi
+ fi
+ fi
+ fi
+
+ AC_SUBST(ELF_CFLAGS)
+ AC_SUBST(ELF_LIBS)
+])
--- a/common/autoconf/libraries.m4 Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/libraries.m4 Tue Dec 13 02:04:18 2016 +0100
@@ -31,6 +31,7 @@
m4_include([lib-freetype.m4])
m4_include([lib-std.m4])
m4_include([lib-x11.m4])
+m4_include([lib-elf.m4])
################################################################################
# Determine which libraries are needed for this configuration
@@ -90,6 +91,7 @@
LIB_SETUP_BUNDLED_LIBS
LIB_SETUP_MISC_LIBS
LIB_SETUP_SOLARIS_STLPORT
+ LIB_SETUP_LIBELF
])
################################################################################
--- a/common/autoconf/platform.m4 Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/platform.m4 Tue Dec 13 02:04:18 2016 +0100
@@ -308,15 +308,6 @@
fi
AC_SUBST(OPENJDK_$1_CPU_LEGACY_LIB)
- # This is the name of the cpu (but using i386 and amd64 instead of
- # x86 and x86_64, respectively), preceeded by a /, to be used when
- # locating libraries. On macosx, it's empty, though.
- OPENJDK_$1_CPU_LIBDIR="/$OPENJDK_$1_CPU_LEGACY_LIB"
- if test "x$OPENJDK_$1_OS" = xmacosx; then
- OPENJDK_$1_CPU_LIBDIR=""
- fi
- AC_SUBST(OPENJDK_$1_CPU_LIBDIR)
-
# OPENJDK_$1_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
# /amd64 or /sparcv9. This string is appended to some library paths, like this:
# /usr/lib${OPENJDK_$1_CPU_ISADIR}/libexample.so
@@ -348,16 +339,6 @@
# On all platforms except macosx, we replace x86_64 with amd64.
OPENJDK_$1_CPU_JLI="amd64"
fi
- # Now setup the -D flags for building libjli.
- OPENJDK_$1_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_$1_CPU_JLI\"'"
- if test "x$OPENJDK_$1_OS" = xsolaris; then
- if test "x$OPENJDK_$1_CPU_ARCH" = xsparc; then
- OPENJDK_$1_CPU_JLI_CFLAGS="$OPENJDK_$1_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
- elif test "x$OPENJDK_$1_CPU_ARCH" = xx86; then
- OPENJDK_$1_CPU_JLI_CFLAGS="$OPENJDK_$1_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
- fi
- fi
- AC_SUBST(OPENJDK_$1_CPU_JLI_CFLAGS)
if test "x$OPENJDK_$1_OS" = xmacosx; then
OPENJDK_$1_OS_EXPORT_DIR=macosx
--- a/common/autoconf/source-dirs.m4 Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/source-dirs.m4 Tue Dec 13 02:04:18 2016 +0100
@@ -62,27 +62,9 @@
[
BUILD_OUTPUT="$OUTPUT_ROOT"
AC_SUBST(BUILD_OUTPUT)
+ JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
- HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
- BUILD_HOTSPOT=true
- AC_SUBST(HOTSPOT_DIST)
- AC_SUBST(BUILD_HOTSPOT)
- AC_ARG_WITH(import-hotspot, [AS_HELP_STRING([--with-import-hotspot],
- [import hotspot binaries from this jdk image or hotspot build dist dir instead of building from source])])
- if test "x$with_import_hotspot" != x; then
- CURDIR="$PWD"
- cd "$with_import_hotspot"
- HOTSPOT_DIST="`pwd`"
- cd "$CURDIR"
- if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then
- AC_MSG_ERROR([You have to import hotspot from a full jdk image or hotspot build dist dir!])
- fi
- AC_MSG_CHECKING([if hotspot should be imported])
- AC_MSG_RESULT([yes from $HOTSPOT_DIST])
- BUILD_HOTSPOT=false
- fi
-
- JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
+ BASIC_DEPRECATED_ARG_WITH(import_hotspot)
])
################################################################################
--- a/common/autoconf/spec.gmk.in Wed Jul 05 22:34:05 2017 +0200
+++ b/common/autoconf/spec.gmk.in Tue Dec 13 02:04:18 2016 +0100
@@ -75,11 +75,9 @@
# Legacy support
OPENJDK_TARGET_CPU_ISADIR:=@OPENJDK_TARGET_CPU_ISADIR@
-OPENJDK_TARGET_CPU_LIBDIR:=@OPENJDK_TARGET_CPU_LIBDIR@
OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
-OPENJDK_TARGET_CPU_JLI_CFLAGS:=@OPENJDK_TARGET_CPU_JLI_CFLAGS@
OPENJDK_TARGET_OS_EXPORT_DIR:=@OPENJDK_TARGET_OS_EXPORT_DIR@
HOTSPOT_TARGET_OS := @HOTSPOT_TARGET_OS@
@@ -220,6 +218,7 @@
# Which JVM variants to build (space-separated list)
JVM_VARIANTS := @JVM_VARIANTS@
+JVM_VARIANT_MAIN := @JVM_VARIANT_MAIN@
# Lists of features per variant. Only relevant for the variants listed in
# JVM_VARIANTS.
@@ -273,8 +272,6 @@
CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@
BUILDJDK_OUTPUTDIR=$(BUILD_OUTPUT)/buildjdk
-HOTSPOT_DIST=@HOTSPOT_DIST@
-
BUILD_HOTSPOT=@BUILD_HOTSPOT@
BUILD_FAILURE_HANDLER := @BUILD_FAILURE_HANDLER@
@@ -686,6 +683,7 @@
TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@
# Build setup
+ENABLE_AOT:=@ENABLE_AOT@
ENABLE_JFR=@ENABLE_JFR@
ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
@@ -760,6 +758,8 @@
PNG_LIBS:=@PNG_LIBS@
PNG_CFLAGS:=@PNG_CFLAGS@
+ELF_CFLAGS:=@ELF_CFLAGS@
+ELF_LIBS:=@ELF_LIBS@
####################################################
#
@@ -767,6 +767,7 @@
#
INCLUDE_SA=@INCLUDE_SA@
+INCLUDE_GRAAL=@INCLUDE_GRAAL@
OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@
OS_VERSION_MINOR:=@OS_VERSION_MINOR@
--- a/common/bin/compare_exceptions.sh.incl Wed Jul 05 22:34:05 2017 +0200
+++ b/common/bin/compare_exceptions.sh.incl Tue Dec 13 02:04:18 2016 +0100
@@ -57,21 +57,21 @@
./demo/jvmti/mtrace/lib/libmtrace.so
./demo/jvmti/versionCheck/lib/libversionCheck.so
./demo/jvmti/waiters/lib/libwaiters.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/client/libjsig.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/client/libjvm.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/libattach.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/libdt_socket.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/libinstrument.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/libjsdt.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/libjsig.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/libmanagement.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/libnet.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/libnpt.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/libverify.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjsig.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/server/libjsig.so
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/server/libjvm.so
+ ./lib/client/libjsig.so
+ ./lib/client/libjvm.so
+ ./lib/libattach.so
+ ./lib/libdt_socket.so
+ ./lib/libinstrument.so
+ ./lib/libjsdt.so
+ ./lib/libjsig.so
+ ./lib/libmanagement.so
+ ./lib/libnet.so
+ ./lib/libnpt.so
+ ./lib/libverify.so
+ ./lib/minimal/libjsig.so
+ ./lib/minimal/libjvm.so
+ ./lib/server/libjsig.so
+ ./lib/server/libjvm.so
./bin/appletviewer
./bin/idlj
./bin/jar
@@ -122,12 +122,12 @@
# So for now, accept the difference but put a limit on the size. The
# different order of functions shouldn't result in a very big diff.
KNOWN_FULLDUMP_DIFF="
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
+ ./lib/minimal/libjvm.so
"
# Link time optimization adds random numbers to symbol names
NEED_DIS_DIFF_FILTER="
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
+ ./lib/minimal/libjvm.so
"
DIS_DIFF_FILTER="$SED -r \
-e 's/\.[0-9]+/.X/g' \
@@ -135,12 +135,12 @@
-e 's/\t[0-9a-f]{5,} /\t<HEX> /' \
"
KNOWN_DIS_DIFF="
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
+ ./lib/minimal/libjvm.so
"
MAX_KNOWN_DIS_DIFF_SIZE="3000"
NEED_SYMBOLS_DIFF_FILTER="
- ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
+ ./lib/minimal/libjvm.so
"
SYMBOLS_DIFF_FILTER="$SED -r \
-e 's/\.[0-9]+/.X/g'
@@ -163,11 +163,11 @@
"
SORT_SYMBOLS="
- ./lib/amd64/server/libjvm.so
- ./lib/amd64/libfontmanager.so
- ./lib/amd64/libjimage.so
- ./lib/amd64/libsaproc.so
- ./lib/amd64/libunpack.so
+ ./lib/server/libjvm.so
+ ./lib/libfontmanager.so
+ ./lib/libjimage.so
+ ./lib/libsaproc.so
+ ./lib/libunpack.so
./bin/unpack200
"
@@ -183,48 +183,48 @@
./demo/jvmti/mtrace/lib/libmtrace.so
./demo/jvmti/versionCheck/lib/libversionCheck.so
./demo/jvmti/waiters/lib/libwaiters.so
- ./lib/amd64/jli/libjli.so
- ./lib/amd64/jspawnhelper
- ./lib/amd64/libJdbcOdbc.so
- ./lib/amd64/libattach.so
- ./lib/amd64/libawt.so
- ./lib/amd64/libawt_headless.so
- ./lib/amd64/libawt_xawt.so
- ./lib/amd64/libdcpr.so
- ./lib/amd64/libdt_socket.so
- ./lib/amd64/libfontmanager.so
- ./lib/amd64/libinstrument.so
- ./lib/amd64/libj2gss.so
- ./lib/amd64/libj2pcsc.so
- ./lib/amd64/libj2pkcs11.so
- ./lib/amd64/libj2ucrypto.so
- ./lib/amd64/libjaas_unix.so
- ./lib/amd64/libjava.so
- ./lib/amd64/libjawt.so
- ./lib/amd64/libjdwp.so
- ./lib/amd64/libjpeg.so
- ./lib/amd64/libjsdt.so
- ./lib/amd64/libjsound.so
- ./lib/amd64/libkcms.so
- ./lib/amd64/liblcms.so
- ./lib/amd64/libmanagement.so
- ./lib/amd64/libmlib_image.so
- ./lib/amd64/libnet.so
- ./lib/amd64/libnio.so
- ./lib/amd64/libnpt.so
- ./lib/amd64/libsctp.so
- ./lib/amd64/libsplashscreen.so
- ./lib/amd64/libsunec.so
- ./lib/amd64/libsunwjdga.so
- ./lib/amd64/libt2k.so
- ./lib/amd64/libunpack.so
- ./lib/amd64/libverify.so
- ./lib/amd64/libzip.so
- ./lib/amd64/server/64/libjvm_db.so
- ./lib/amd64/server/64/libjvm_dtrace.so
- ./lib/amd64/server/libjvm.so
- ./lib/amd64/server/libjvm_db.so
- ./lib/amd64/server/libjvm_dtrace.so
+ ./lib/jli/libjli.so
+ ./lib/jspawnhelper
+ ./lib/libJdbcOdbc.so
+ ./lib/libattach.so
+ ./lib/libawt.so
+ ./lib/libawt_headless.so
+ ./lib/libawt_xawt.so
+ ./lib/libdcpr.so
+ ./lib/libdt_socket.so
+ ./lib/libfontmanager.so
+ ./lib/libinstrument.so
+ ./lib/libj2gss.so
+ ./lib/libj2pcsc.so
+ ./lib/libj2pkcs11.so
+ ./lib/libj2ucrypto.so
+ ./lib/libjaas_unix.so
+ ./lib/libjava.so
+ ./lib/libjawt.so
+ ./lib/libjdwp.so
+ ./lib/libjpeg.so
+ ./lib/libjsdt.so
+ ./lib/libjsound.so
+ ./lib/libkcms.so
+ ./lib/liblcms.so
+ ./lib/libmanagement.so
+ ./lib/libmlib_image.so
+ ./lib/libnet.so
+ ./lib/libnio.so
+ ./lib/libnpt.so
+ ./lib/libsctp.so
+ ./lib/libsplashscreen.so
+ ./lib/libsunec.so
+ ./lib/libsunwjdga.so
+ ./lib/libt2k.so
+ ./lib/libunpack.so
+ ./lib/libverify.so
+ ./lib/libzip.so
+ ./lib/server/64/libjvm_db.so
+ ./lib/server/64/libjvm_dtrace.so
+ ./lib/server/libjvm.so
+ ./lib/server/libjvm_db.so
+ ./lib/server/libjvm_dtrace.so
./bin/appletviewer
./bin/idlj
./bin/jar
@@ -292,13 +292,13 @@
SORT_SYMBOLS="
./demo/jvmti/waiters/lib/libwaiters.so
- ./lib/sparcv9/libjsig.so
- ./lib/sparcv9/libfontmanager.so
- ./lib/sparcv9/libjimage.so
- ./lib/sparcv9/libsaproc.so
- ./lib/sparcv9/libunpack.so
- ./lib/sparcv9/server/libjvm.so
- ./lib/sparcv9/server/libjvm_dtrace.so
+ ./lib/libjsig.so
+ ./lib/libfontmanager.so
+ ./lib/libjimage.so
+ ./lib/libsaproc.so
+ ./lib/libunpack.so
+ ./lib/server/libjvm.so
+ ./lib/server/libjvm_dtrace.so
./bin/unpack200
"
@@ -314,46 +314,46 @@
./demo/jvmti/mtrace/lib/libmtrace.so
./demo/jvmti/versionCheck/lib/libversionCheck.so
./demo/jvmti/waiters/lib/libwaiters.so
- ./lib/sparcv9/client/libjvm.so
- ./lib/sparcv9/jli/libjli.so
- ./lib/sparcv9/jspawnhelper
- ./lib/sparcv9/libJdbcOdbc.so
- ./lib/sparcv9/libattach.so
- ./lib/sparcv9/libawt.so
- ./lib/sparcv9/libawt_headless.so
- ./lib/sparcv9/libawt_xawt.so
- ./lib/sparcv9/libdcpr.so
- ./lib/sparcv9/libdt_socket.so
- ./lib/sparcv9/libfontmanager.so
- ./lib/sparcv9/libinstrument.so
- ./lib/sparcv9/libj2gss.so
- ./lib/sparcv9/libj2pcsc.so
- ./lib/sparcv9/libj2pkcs11.so
- ./lib/sparcv9/libj2ucrypto.so
- ./lib/sparcv9/libjaas_unix.so
- ./lib/sparcv9/libjava.so
- ./lib/sparcv9/libjawt.so
- ./lib/sparcv9/libjdwp.so
- ./lib/sparcv9/libjpeg.so
- ./lib/sparcv9/libjsdt.so
- ./lib/sparcv9/libjsound.so
- ./lib/sparcv9/libkcms.so
- ./lib/sparcv9/liblcms.so
- ./lib/sparcv9/libmanagement.so
- ./lib/sparcv9/libmlib_image.so
- ./lib/sparcv9/libmlib_image_v.so
- ./lib/sparcv9/libnet.so
- ./lib/sparcv9/libnio.so
- ./lib/sparcv9/libnpt.so
- ./lib/sparcv9/libsctp.so
- ./lib/sparcv9/libsplashscreen.so
- ./lib/sparcv9/libsunec.so
- ./lib/sparcv9/libsunwjdga.so
- ./lib/sparcv9/libt2k.so
- ./lib/sparcv9/libunpack.so
- ./lib/sparcv9/libverify.so
- ./lib/sparcv9/libzip.so
- ./lib/sparcv9/server/libjvm.so
+ ./lib/client/libjvm.so
+ ./lib/jli/libjli.so
+ ./lib/jspawnhelper
+ ./lib/libJdbcOdbc.so
+ ./lib/libattach.so
+ ./lib/libawt.so
+ ./lib/libawt_headless.so
+ ./lib/libawt_xawt.so
+ ./lib/libdcpr.so
+ ./lib/libdt_socket.so
+ ./lib/libfontmanager.so
+ ./lib/libinstrument.so
+ ./lib/libj2gss.so
+ ./lib/libj2pcsc.so
+ ./lib/libj2pkcs11.so
+ ./lib/libj2ucrypto.so
+ ./lib/libjaas_unix.so
+ ./lib/libjava.so
+ ./lib/libjawt.so
+ ./lib/libjdwp.so
+ ./lib/libjpeg.so
+ ./lib/libjsdt.so
+ ./lib/libjsound.so
+ ./lib/libkcms.so
+ ./lib/liblcms.so
+ ./lib/libmanagement.so
+ ./lib/libmlib_image.so
+ ./lib/libmlib_image_v.so
+ ./lib/libnet.so
+ ./lib/libnio.so
+ ./lib/libnpt.so
+ ./lib/libsctp.so
+ ./lib/libsplashscreen.so
+ ./lib/libsunec.so
+ ./lib/libsunwjdga.so
+ ./lib/libt2k.so
+ ./lib/libunpack.so
+ ./lib/libverify.so
+ ./lib/libzip.so
+ ./lib/server/libjvm.so
./bin/appletviewer
./bin/idlj
./bin/jar
@@ -409,7 +409,7 @@
"
KNOWN_DIS_DIFF="
- ./lib/sparcv9/libsaproc.so
+ ./lib/libsaproc.so
"
MAX_KNOWN_DIS_DIFF_SIZE="3000"
@@ -417,8 +417,8 @@
# On slowdebug the disassembly can differ randomly.
if [ "$DEBUG_LEVEL" = "slowdebug" ]; then
ACCEPTED_DIS_DIFF="
- ./lib/sparcv9/libfontmanager.so
- ./lib/sparcv9/server/libjvm.so
+ ./lib/libfontmanager.so
+ ./lib/server/libjvm.so
"
fi
--- a/make/CompileJavaModules.gmk Wed Jul 05 22:34:05 2017 +0200
+++ b/make/CompileJavaModules.gmk Tue Dec 13 02:04:18 2016 +0100
@@ -448,7 +448,51 @@
################################################################################
-jdk.vm.ci_ADD_JAVAC_FLAGS := -Xlint:-exports
+# -parameters provides method's parameters information in class file,
+# JVMCI compilers make use of that information for various sanity checks.
+# Don't use Indy strings concatenation to have good JVMCI startup performance.
+
+jdk.vm.ci_ADD_JAVAC_FLAGS := -parameters -Xlint:-exports -XDstringConcat=inline
+
+################################################################################
+
+jdk.vm.compiler_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline
+
+jdk.vm.compiler_EXCLUDES += \
+ org.graalvm.compiler.core.match.processor \
+ org.graalvm.compiler.nodeinfo.processor \
+ org.graalvm.compiler.options.processor \
+ org.graalvm.compiler.serviceprovider.processor \
+ org.graalvm.compiler.replacements.verifier \
+ org.graalvm.compiler.api.directives.test \
+ org.graalvm.compiler.api.test \
+ org.graalvm.compiler.asm.aarch64.test \
+ org.graalvm.compiler.asm.amd64.test \
+ org.graalvm.compiler.asm.sparc.test \
+ org.graalvm.compiler.asm.test \
+ org.graalvm.compiler.core.amd64.test \
+ org.graalvm.compiler.core.sparc.test \
+ org.graalvm.compiler.core.test \
+ org.graalvm.compiler.debug.test \
+ org.graalvm.compiler.graph.test \
+ org.graalvm.compiler.hotspot.amd64.test \
+ org.graalvm.compiler.hotspot.lir.test \
+ org.graalvm.compiler.hotspot.test \
+ org.graalvm.compiler.jtt \
+ org.graalvm.compiler.lir.jtt \
+ org.graalvm.compiler.lir.test \
+ org.graalvm.compiler.microbenchmarks \
+ org.graalvm.compiler.nodes.test \
+ org.graalvm.compiler.options.test \
+ org.graalvm.compiler.phases.common.test \
+ org.graalvm.compiler.replacements.test \
+ org.graalvm.compiler.test \
+ org.graalvm.compiler.virtual.bench \
+ #
+
+################################################################################
+
+jdk.aot_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline
################################################################################
@@ -511,6 +555,22 @@
MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
endif
+ifeq ($(MODULE), jdk.vm.compiler)
+ ## WORKAROUND jdk.vm.compiler source structure issue
+ VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+ $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
+ $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+ MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
+endif
+
+ifeq ($(MODULE), jdk.aot)
+ ## WORKAROUND jdk.aot source structure issue
+ AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+ $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
+ $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+ MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
+endif
+
$(eval $(call SetupJavaCompilation, $(MODULE), \
SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
MODULE := $(MODULE), \
--- a/make/Help.gmk Wed Jul 05 22:34:05 2017 +0200
+++ b/make/Help.gmk Tue Dec 13 02:04:18 2016 +0100
@@ -66,6 +66,12 @@
$(info $(_) make clean-<module>-<phase> # Remove all build results related to a certain)
$(info $(_) # module and phase)
$(info )
+ $(info Targets for Hotspot)
+ $(info $(_) make hotspot # Build all of hotspot)
+ $(info $(_) make hotspot-<variant> # Build just the specified jvm variant)
+ $(info $(_) make hotspot-gensrc # Only build the gensrc part of hotspot)
+ $(info $(_) make hotspot-<variant>-<phase> # Build the specified phase for the specified module)
+ $(info )
$(info Targets for specific modules)
$(info $(_) make <module> # Build <module> and everything it depends on)
$(info $(_) make <module>-<phase> # Compile the specified phase for the specified module)
--- a/make/Javadoc.gmk Wed Jul 05 22:34:05 2017 +0200
+++ b/make/Javadoc.gmk Tue Dec 13 02:04:18 2016 +0100
@@ -122,6 +122,7 @@
org.w3c.dom.html \
org.w3c.dom.stylesheets \
org.w3c.dom.xpath \
+ org.graalvm.compiler.% \
#
CORE_PACKAGES := $(filter-out $(CORE_EXCLUDED_PACKAGES), \
--- a/make/Main.gmk Wed Jul 05 22:34:05 2017 +0200
+++ b/make/Main.gmk Tue Dec 13 02:04:18 2016 +0100
@@ -85,10 +85,14 @@
buildtools-modules:
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
+
+ buildtools-hotspot:
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
endif
ALL_TARGETS += buildtools-langtools interim-langtools \
- interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules
+ interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules \
+ buildtools-hotspot
################################################################################
# Special targets for certain modules
@@ -236,15 +240,35 @@
################################################################################
# Build hotspot target
-ifeq ($(BUILD_HOTSPOT),true)
- hotspot:
- +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildHotspot.gmk)
-endif
+HOTSPOT_VARIANT_TARGETS := $(addprefix hotspot-, $(JVM_VARIANTS))
+HOTSPOT_VARIANT_GENSRC_TARGETS := $(addsuffix -gensrc, $(HOTSPOT_VARIANT_TARGETS))
+HOTSPOT_VARIANT_LIBS_TARGETS := $(addsuffix -libs, $(HOTSPOT_VARIANT_TARGETS))
+
+define DeclareHotspotGensrcRecipe
+ hotspot-$1-gensrc:
+ $$(call LogInfo, Building JVM variant '$1' with features '$(JVM_FEATURES_$1)')
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f gensrc/GenerateSources.gmk \
+ JVM_VARIANT=$1)
+endef
+
+$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotGensrcRecipe,$v)))
+
+define DeclareHotspotLibsRecipe
+ hotspot-$1-libs:
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibraries.gmk \
+ JVM_VARIANT=$1)
+endef
+
+$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
+
+hotspot-jsig:
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibjsig.gmk)
hotspot-ide-project:
+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
-ALL_TARGETS += hotspot hotspot-ide-project
+ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
+ $(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-jsig hotspot-ide-project
################################################################################
# Build demos and samples targets
@@ -527,11 +551,13 @@
buildtools-jdk: interim-langtools interim-cldrconverter
+ buildtools-hotspot: interim-langtools
+
buildtools-modules: exploded-image-base
$(CORBA_GENSRC_TARGETS): interim-langtools
- $(HOTSPOT_GENSRC_TARGETS): interim-langtools
+ $(HOTSPOT_GENSRC_TARGETS): interim-langtools buildtools-hotspot
$(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk
@@ -545,11 +571,18 @@
$(JAVA_TARGETS): interim-langtools
+ # Declare dependencies between hotspot-<variant>* targets
+ $(foreach v, $(JVM_VARIANTS), \
+ $(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \
+ $(eval hotspot-$v-libs: hotspot-$v-gensrc) \
+ )
+
hotspot-ide-project: hotspot exploded-image
generate-exported-symbols: java.base-libs jdk.jdwp.agent-libs
- $(LIBS_TARGETS): hotspot
+ # Building one JVM variant is enough to start building the other libs
+ $(LIBS_TARGETS): hotspot-$(JVM_VARIANT_MAIN)-libs
$(LAUNCHER_TARGETS): java.base-libs
@@ -601,6 +634,14 @@
# current JDK.
jdk.vm.ci-gensrc-hotspot: java.base-java
+ # The annotation processing for jdk.vm.compiler needs classes from the current JDK.
+ jdk.vm.compiler-gensrc-hotspot: java.base-java java.management-java \
+ jdk.management-java jdk.vm.ci-java jdk.unsupported-java
+
+ # For jdk.vm.compiler, the gensrc step is generating a module-info.java.extra
+ # file to be processed by the gensrc-moduleinfo target.
+ jdk.vm.compiler-gensrc-moduleinfo: jdk.vm.compiler-gensrc-hotspot
+
# Explicitly add dependencies for special targets
java.base-java: unpack-sec
@@ -615,6 +656,9 @@
$(addsuffix -jmod, $(call FindAllUpgradeableModules)), $(JMOD_TARGETS))
endif
+ # Building java.base-jmod requires all of hotspot to be built.
+ java.base-jmod: hotspot
+
# Declare dependencies from <module>-jmod to all other module targets
# When creating a BUILDJDK, the java compilation has already been done by the
# normal build and copied in.
@@ -702,7 +746,7 @@
docs-javadoc: $(GENSRC_TARGETS) rmic
# The gensrc step for jdk.jdi creates an html file that is used by docs-copy.
- docs-copy: hotspot jdk.jdi-gensrc
+ docs-copy: hotspot-$(JVM_VARIANT_MAIN)-gensrc jdk.jdi-gensrc
docs-zip: docs-javadoc docs-copy
@@ -725,7 +769,8 @@
test-image-failure-handler: build-test-failure-handler
- build-test-hotspot-jtreg-native: buildtools-jdk hotspot
+ build-test-hotspot-jtreg-native: buildtools-jdk \
+ hotspot-$(JVM_VARIANT_MAIN)-libs
build-test-jdk-jtreg-native: buildtools-jdk
@@ -757,7 +802,17 @@
# Virtual targets without recipes
buildtools: buildtools-langtools interim-langtools interim-rmic \
- buildtools-jdk
+ buildtools-jdk buildtools-hotspot
+
+hotspot: $(HOTSPOT_VARIANT_TARGETS) hotspot-jsig
+
+hotspot-libs: hotspot-jsig
+
+# Create targets hotspot-libs and hotspot-gensrc.
+$(foreach v, $(JVM_VARIANTS), \
+ $(eval hotspot-libs: hotspot-$v-libs) \
+ $(eval hotspot-gensrc: hotspot-$v-gensrc) \
+)
gensrc: $(GENSRC_TARGETS)
@@ -788,6 +843,10 @@
$(foreach m, $(LIBS_MODULES), $(eval $m: $m-libs))
$(foreach m, $(LAUNCHER_MODULES), $(eval $m: $m-launchers))
$(foreach m, $(ALL_COPY_MODULES), $(eval $m: $m-copy))
+
+# Building java.base includes building all of hotspot.
+java.base: hotspot
+
demos: demos-jdk
samples: samples-jdk
@@ -843,7 +902,8 @@
# all-bundles packages all our deliverables as tar.gz bundles.
all-bundles: product-bundles test-bundles docs-bundles
-ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers jmods \
+ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
+ copy java rmic libs launchers jmods \
jdk.jdwp.agent-gensrc $(ALL_MODULES) demos samples \
exploded-image-base exploded-image \
create-buildjdk mac-bundles product-images docs-image test-image all-images \
--- a/make/common/MakeBase.gmk Wed Jul 05 22:34:05 2017 +0200
+++ b/make/common/MakeBase.gmk Tue Dec 13 02:04:18 2016 +0100
@@ -861,13 +861,8 @@
################################################################################
# Find lib dir for module
# Param 1 - module name
-ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
- FindLibDirForModule = \
- $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)$(OPENJDK_TARGET_CPU_LIBDIR)
-else
- FindLibDirForModule = \
- $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
-endif
+FindLibDirForModule = \
+ $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
################################################################################
# Return a string suitable for use after a -classpath or --module-path option. It
--- a/make/common/Modules.gmk Wed Jul 05 22:34:05 2017 +0200
+++ b/make/common/Modules.gmk Tue Dec 13 02:04:18 2016 +0100
@@ -145,6 +145,20 @@
endif
################################################################################
+# Filter out Graal specific modules if Graal build is disabled
+
+ifeq ($(INCLUDE_GRAAL), false)
+ MODULES_FILTER += jdk.vm.compiler
+endif
+
+################################################################################
+# Filter out aot specific modules if aot is disabled
+
+ifeq ($(ENABLE_AOT), false)
+ MODULES_FILTER += jdk.aot
+endif
+
+################################################################################
# Module list macros
# Use append so that the custom extension may add to these variables
--- a/test/jtreg-ext/requires/VMProps.java Wed Jul 05 22:34:05 2017 +0200
+++ b/test/jtreg-ext/requires/VMProps.java Tue Dec 13 02:04:18 2016 +0100
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -60,9 +61,10 @@
map.put("vm.flightRecorder", vmFlightRecorder());
map.put("vm.simpleArch", vmArch());
map.put("vm.debug", vmDebug());
+ map.put("vm.jvmci", vmJvmci());
vmGC(map); // vm.gc.X = true/false
- dump(map);
+ VMProps.dump(map);
return map;
}
@@ -156,6 +158,14 @@
}
/**
+ * @return true if VM supports JVMCI and false otherwise
+ */
+ protected String vmJvmci() {
+ // builds with jvmci have this flag
+ return "" + (WB.getBooleanVMFlag("EnableJVMCI") != null);
+ }
+
+ /**
* For all existing GC sets vm.gc.X property.
* Example vm.gc.G1=true means:
* VM supports G1
@@ -180,7 +190,7 @@
*
* @param map
*/
- protected void dump(Map<String, String> map) {
+ protected static void dump(Map<String, String> map) {
String dumpFileName = System.getProperty("vmprops.dump");
if (dumpFileName == null) {
return;
@@ -188,7 +198,7 @@
List<String> lines = new ArrayList<>();
map.forEach((k, v) -> lines.add(k + ":" + v));
try {
- Files.write(Paths.get(dumpFileName), lines);
+ Files.write(Paths.get(dumpFileName), lines, StandardOpenOption.APPEND);
} catch (IOException e) {
throw new RuntimeException("Failed to dump properties into '"
+ dumpFileName + "'", e);
--- a/test/lib/jdk/test/lib/Platform.java Wed Jul 05 22:34:05 2017 +0200
+++ b/test/lib/jdk/test/lib/Platform.java Tue Dec 13 02:04:18 2016 +0100
@@ -160,9 +160,8 @@
return vmVersion;
}
- // Returns true for sparc and sparcv9.
- public static boolean isSparc() {
- return isArch("sparc.*");
+ public static boolean isAArch64() {
+ return isArch("aarch64");
}
public static boolean isARM() {
@@ -173,9 +172,14 @@
return isArch("ppc.*");
}
- public static boolean isX86() {
- // On Linux it's 'i386', Windows 'x86' without '_64' suffix.
- return isArch("(i386)|(x86(?!_64))");
+ // Returns true for IBM z System running linux.
+ public static boolean isS390x() {
+ return isArch("s390.*") || isArch("s/390.*") || isArch("zArch_64");
+ }
+
+ // Returns true for sparc and sparcv9.
+ public static boolean isSparc() {
+ return isArch("sparc.*");
}
public static boolean isX64() {
@@ -183,8 +187,9 @@
return isArch("(amd64)|(x86_64)");
}
- public static boolean isAArch64() {
- return isArch("aarch64");
+ public static boolean isX86() {
+ // On Linux it's 'i386', Windows 'x86' without '_64' suffix.
+ return isArch("(i386)|(x86(?!_64))");
}
public static String getOsArch() {
@@ -200,6 +205,7 @@
if (isAix()) {
return false; // SA not implemented.
} else if (isLinux()) {
+ if (isS390x()) { return false; } // SA not implemented.
return canPtraceAttachLinux();
} else if (isOSX()) {
return canAttachOSX();
--- a/test/lib/sun/hotspot/WhiteBox.java Wed Jul 05 22:34:05 2017 +0200
+++ b/test/lib/sun/hotspot/WhiteBox.java Tue Dec 13 02:04:18 2016 +0100
@@ -229,7 +229,7 @@
return isMethodCompiled0(method, isOsr);
}
public boolean isMethodCompilable(Executable method) {
- return isMethodCompilable(method, -1 /*any*/);
+ return isMethodCompilable(method, -2 /*any*/);
}
public boolean isMethodCompilable(Executable method, int compLevel) {
return isMethodCompilable(method, compLevel, false /*not osr*/);
@@ -277,7 +277,7 @@
return deoptimizeMethod0(method, isOsr);
}
public void makeMethodNotCompilable(Executable method) {
- makeMethodNotCompilable(method, -1 /*any*/);
+ makeMethodNotCompilable(method, -2 /*any*/);
}
public void makeMethodNotCompilable(Executable method, int compLevel) {
makeMethodNotCompilable(method, compLevel, false /*not osr*/);
@@ -301,7 +301,7 @@
return testSetDontInlineMethod0(method, value);
}
public int getCompileQueuesSize() {
- return getCompileQueueSize(-1 /*any*/);
+ return getCompileQueueSize(-2 /*any*/);
}
public native int getCompileQueueSize(int compLevel);
private native boolean testSetForceInlineMethod0(Executable method, boolean value);
--- a/test/lib/sun/hotspot/code/CodeBlob.java Wed Jul 05 22:34:05 2017 +0200
+++ b/test/lib/sun/hotspot/code/CodeBlob.java Tue Dec 13 02:04:18 2016 +0100
@@ -49,8 +49,13 @@
assert obj.length == 4;
name = (String) obj[0];
size = (Integer) obj[1];
- code_blob_type = BlobType.values()[(Integer) obj[2]];
- assert code_blob_type.id == (Integer) obj[2];
+ int blob_type_index = (Integer) obj[2];
+ if (blob_type_index == -1) { // AOT
+ code_blob_type = null;
+ } else {
+ code_blob_type = BlobType.values()[blob_type_index];
+ assert code_blob_type.id == (Integer) obj[2];
+ }
address = (Long) obj[3];
}
public final String name;