Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
7c733af6
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7c733af6
编写于
7月 05, 2017
作者:
D
duke
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
587c9a35
7015f0b1
变更
17
展开全部
隐藏空白更改
内联
并排
Showing
17 changed file
with
236 addition
and
644 deletion
+236
-644
.hgtags-top-repo
.hgtags-top-repo
+1
-0
common/autoconf/flags.m4
common/autoconf/flags.m4
+27
-23
common/autoconf/generated-configure.sh
common/autoconf/generated-configure.sh
+77
-571
common/autoconf/hotspot.m4
common/autoconf/hotspot.m4
+4
-4
common/autoconf/spec.gmk.in
common/autoconf/spec.gmk.in
+0
-2
common/autoconf/toolchain.m4
common/autoconf/toolchain.m4
+9
-3
common/bin/hgforest.sh
common/bin/hgforest.sh
+4
-1
common/conf/jib-profiles.js
common/conf/jib-profiles.js
+16
-4
make/Bundles.gmk
make/Bundles.gmk
+5
-1
make/CreateJmods.gmk
make/CreateJmods.gmk
+6
-4
make/Images.gmk
make/Images.gmk
+1
-2
make/Javadoc.gmk
make/Javadoc.gmk
+69
-15
make/Main.gmk
make/Main.gmk
+1
-1
make/common/NON_CORE_PKGS.gmk
make/common/NON_CORE_PKGS.gmk
+3
-0
test/jtreg-ext/requires/VMProps.java
test/jtreg-ext/requires/VMProps.java
+10
-11
test/lib/share/classes/jdk/test/lib/Platform.java
test/lib/share/classes/jdk/test/lib/Platform.java
+2
-2
test/lib/sun/hotspot/WhiteBox.java
test/lib/sun/hotspot/WhiteBox.java
+1
-0
未找到文件。
.hgtags-top-repo
浏览文件 @
7c733af6
...
...
@@ -372,3 +372,4 @@ f80c841ae2545eaf9acd2724bccc305d98cefbe2 jdk-9+124
8fa686245bd2a072ece3392743460030f0854520 jdk-9+127
b30ae794d974d7dd3eb4e84203f70021823fa6c6 jdk-9+128
f5902d3841b82cac6e7716a20c24e8e916fb14a8 jdk-9+129
d94d54a3192fea79234c3ac55cd0b4052d45e954 jdk-9+130
common/autoconf/flags.m4
浏览文件 @
7c733af6
...
...
@@ -684,7 +684,7 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
AC_SUBST(CXXFLAGS_TESTEXE)
LDFLAGS_TESTLIB="$LDFLAGS_JDKLIB"
LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE"
LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE
$JAVA_BASE_LDFLAGS
"
AC_SUBST(LDFLAGS_TESTLIB)
AC_SUBST(LDFLAGS_TESTEXE)
...
...
@@ -713,20 +713,17 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [[$]$2CXXSTD_CXXFLAG -Werror],
IF_FALSE: [$2CXXSTD_CXXFLAG=""])
$2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} ${$2CXXSTD_CXXFLAG}"
$2JVM_CFLAGS="${$2JVM_CFLAGS} ${$2CXXSTD_CXXFLAG}"
AC_SUBST([$2CXXSTD_CXXFLAG])
fi
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
$2CFLAGS_JDK="${$2CFLAGS_JDK} -D__solaris__"
$2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} -D__solaris__"
$2CFLAGS_JDKLIB_EXTRA='-xstrconst'
CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt"
CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt"
fi
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
$2CFLAGS_JDK="${$2CFLAGS_JDK} -D__solaris__"
$2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} -D__solaris__"
$2CFLAGS_JDKLIB_EXTRA='-xstrconst'
fi
$2CFLAGS_JDK="${$2CFLAGS_JDK} ${$2EXTRA_CFLAGS}"
...
...
@@ -768,7 +765,7 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
$2CFLAGS_JDK="${$2CFLAGS_JDK} -fno-strict-aliasing"
;;
esac
TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: 6, PREFIX: $2, IF_AT_LEAST: FLAGS_SETUP_GCC6_COMPILER_FLAGS)
TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: 6, PREFIX: $2, IF_AT_LEAST: FLAGS_SETUP_GCC6_COMPILER_FLAGS
($2)
)
elif test "x$TOOLCHAIN_TYPE" = xclang; then
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -D_GNU_SOURCE"
...
...
@@ -1112,7 +1109,7 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
fi
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
LDFLAGS_SOLSTUDIO="-Wl,-z,defs"
$2LDFLAGS_JDK="[$]$2LDFLAGS_JDK $LDFLAGS_SOLSTUDIO -
xildoff -
ztext"
$2LDFLAGS_JDK="[$]$2LDFLAGS_JDK $LDFLAGS_SOLSTUDIO -ztext"
LDFLAGS_CXX_SOLSTUDIO="-norunpath"
$2LDFLAGS_CXX_JDK="[$]$2LDFLAGS_CXX_JDK $LDFLAGS_CXX_SOLSTUDIO -xnolib"
$2JVM_LDFLAGS="[$]$2JVM_LDFLAGS $LDFLAGS_SOLSTUDIO -library=%none -mt $LDFLAGS_CXX_SOLSTUDIO -z noversion"
...
...
@@ -1147,11 +1144,11 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
$2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} ${SHARED_LIBRARY_FLAGS}"
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
$2
LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB
} \
$2
JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS
} \
-libpath:${OUTPUT_ROOT}/support/modules_libs/java.base"
$2JDKLIB_LIBS=""
else
$2
LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB
} \
$2
JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS
} \
-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)"
if test "x$1" = "xTARGET"; then
...
...
@@ -1160,17 +1157,17 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
# Only add client/minimal dir if client/minimal is being built.
# Default to server for other variants.
if HOTSPOT_CHECK_JVM_VARIANT(server); then
$2
LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB
} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
$2
JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS
} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
elif HOTSPOT_CHECK_JVM_VARIANT(client); then
$2
LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB
} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/client"
$2
JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS
} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/client"
elif HOTSPOT_CHECK_JVM_VARIANT(minimal); then
$2
LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB
} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/minimal"
$2
JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS
} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/minimal"
else
$2
LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB
} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
$2
JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS
} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
fi
elif test "x$1" = "xBUILD"; then
# When building a buildjdk, it's always only the server variant
$2
LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB
} \
$2
JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS
} \
-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
fi
...
...
@@ -1181,6 +1178,8 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
fi
$2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} ${$2JAVA_BASE_LDFLAGS}"
# Set $2JVM_LIBS (per os)
if test "x$OPENJDK_$1_OS" = xlinux; then
$2JVM_LIBS="[$]$2JVM_LIBS -lm -ldl -lpthread"
...
...
@@ -1447,19 +1446,24 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_MISC],
AC_SUBST(CFLAGS_WARNINGS_ARE_ERRORS)
])
AC_DEFUN_ONCE([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
# FLAGS_SETUP_GCC6_COMPILER_FLAGS([PREFIX])
# Arguments:
# $1 - Optional prefix for each variable defined.
AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
[
# These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code
# runs afoul of the more aggressive versions of these optimisations.
# Notably, value range propagation now assumes that the this pointer of C++
# member functions is non-null.
NO_
NULL_POINTER_CHECK
_CFLAG="-fno-delete-null-pointer-checks"
FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_NULL_POINTER_CHECK_CFLAG -Werror],
IF_FALSE: [NO_NULL_POINTER_CHECK_CFLAG=""])
AC_SUBST([NO_NULL_POINTER_CHECK_CFLAG
])
NO_
DELETE_NULL_POINTER_CHECKS
_CFLAG="-fno-delete-null-pointer-checks"
dnl Argument check is disabled until FLAGS_COMPILER_CHECK_ARGUMENTS handles cross-compilation
dnl FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror],
dnl IF_FALSE: [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""
])
NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse"
FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_LIFETIME_DSE_CFLAG -Werror],
IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""])
CFLAGS_JDK="${CFLAGS_JDK} ${NO_NULL_POINTER_CHECK_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
AC_SUBST([NO_LIFETIME_DSE_CFLAG])
dnl Argument check is disabled until FLAGS_COMPILER_CHECK_ARGUMENTS handles cross-compilation
dnl FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_LIFETIME_DSE_CFLAG -Werror],
dnl IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""])
AC_MSG_NOTICE([GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} and ${NO_LIFETIME_DSE_CFLAG}])
$1CFLAGS_JDK="[$]$1CFLAGS_JDK ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
$1JVM_CFLAGS="[$]$1JVM_CFLAGS ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
])
common/autoconf/generated-configure.sh
浏览文件 @
7c733af6
此差异已折叠。
点击以展开。
common/autoconf/hotspot.m4
浏览文件 @
7c733af6
...
...
@@ -198,8 +198,8 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt'])
fi
if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && !
HOTSPOT_CHECK_JVM_FEATURE(compiler2
); then
AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2'])
if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && !
(HOTSPOT_CHECK_JVM_FEATURE(compiler1) || HOTSPOT_CHECK_JVM_FEATURE(compiler2)
); then
AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2'
or 'compiler1'
])
fi
if HOTSPOT_CHECK_JVM_FEATURE(compiler2) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then
...
...
@@ -239,7 +239,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
fi
fi
# Only enable jvmci on x86_64, sparcv9 and aarch64
, and only on server
.
# 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
...
...
@@ -253,7 +253,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
# 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_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"
...
...
common/autoconf/spec.gmk.in
浏览文件 @
7c733af6
...
...
@@ -391,8 +391,6 @@ CFLAGS_WARNINGS_ARE_ERRORS:=@CFLAGS_WARNINGS_ARE_ERRORS@
WARNINGS_AS_ERRORS := @WARNINGS_AS_ERRORS@
CFLAGS_CCACHE:=@CFLAGS_CCACHE@
NO_NULL_POINTER_CHECK_FLAG=@NO_NULL_POINTER_CHECK_CFLAG@
NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
CXXSTD_CXXFLAG=@CXXSTD_CXXFLAG@
# Tools that potentially need to be cross compilation aware.
...
...
common/autoconf/toolchain.m4
浏览文件 @
7c733af6
...
...
@@ -54,7 +54,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
TOOLCHAIN_MINIMUM_VERSION_clang="3.2"
TOOLCHAIN_MINIMUM_VERSION_gcc="4.3"
TOOLCHAIN_MINIMUM_VERSION_microsoft=""
TOOLCHAIN_MINIMUM_VERSION_solstudio="5.1
2
"
TOOLCHAIN_MINIMUM_VERSION_solstudio="5.1
3
"
TOOLCHAIN_MINIMUM_VERSION_xlc=""
# Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be called.
...
...
@@ -312,8 +312,12 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
# Restore path, etc
AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
[
# Restore old path.
PATH="$OLD_PATH"
# Restore old path, except for the microsoft toolchain, which requires VS_PATH
# to remain in place. Otherwise the compiler will not work in some siutations
# in later configure checks.
if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then
PATH="$OLD_PATH"
fi
# Restore the flags to the user specified values.
# This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
...
...
@@ -831,6 +835,8 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
BUILD_SYSROOT_CFLAGS="$SYSROOT_CFLAGS"
BUILD_SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS"
BUILD_AR="$AR"
TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS([], [OPENJDK_BUILD_])
fi
AC_SUBST(BUILD_CC)
...
...
common/bin/hgforest.sh
浏览文件 @
7c733af6
...
...
@@ -335,7 +335,10 @@ else
for
j
in
${
repos_extra
}
;
do
if
[
"
${
i
}
"
=
"
${
j
}
"
]
;
then
# it's an "extra"
pull_base
=
"
${
pull_extra
}
"
if
[
-n
"
${
pull_extra
}
"
]
;
then
# if no pull_extra is defined, assume that pull_default is valid
pull_base
=
"
${
pull_extra
}
"
fi
fi
done
...
...
common/conf/jib-profiles.js
浏览文件 @
7c733af6
...
...
@@ -357,6 +357,18 @@ var getJibProfilesDependencies = function (input, common) {
var
boot_jdk_platform
=
input
.
build_os
+
"
-
"
+
(
input
.
build_cpu
==
"
x86
"
?
"
i586
"
:
input
.
build_cpu
);
var
boot_jdk_revision
=
"
8
"
;
var
boot_jdk_subdirpart
=
"
1.8.0
"
;
// JDK 8 does not work on sparc M7 cpus, need a newer update when building
// on such hardware.
if
(
input
.
build_cpu
==
"
sparcv9
"
)
{
var
cpu_brand
=
$EXEC
(
"
bash -c
\"
kstat -m cpu_info | grep brand | head -n1 | awk '{ print
\
$2 }'
\"
"
);
if
(
cpu_brand
.
trim
()
==
'
SPARC-M7
'
)
{
boot_jdk_revision
=
"
8u20
"
;
boot_jdk_subdirpart
=
"
1.8.0_20
"
;
}
}
var
devkit_platform_revisions
=
{
linux_x64
:
"
gcc4.9.2-OEL6.4+1.0
"
,
macosx_x64
:
"
Xcode6.3-MacOSX10.9+1.0
"
,
...
...
@@ -374,12 +386,12 @@ var getJibProfilesDependencies = function (input, common) {
boot_jdk
:
{
server
:
"
javare
"
,
module
:
"
jdk
"
,
revision
:
"
8
"
,
revision
:
boot_jdk_revision
,
checksum_file
:
boot_jdk_platform
+
"
/MD5_VALUES
"
,
file
:
boot_jdk_platform
+
"
/jdk-
8
-
"
+
boot_jdk_platform
+
"
.tar.gz
"
,
file
:
boot_jdk_platform
+
"
/jdk-
"
+
boot_jdk_revision
+
"
-
"
+
boot_jdk_platform
+
"
.tar.gz
"
,
configure_args
:
(
input
.
build_os
==
"
macosx
"
?
"
--with-boot-jdk=
"
+
input
.
get
(
"
boot_jdk
"
,
"
install_path
"
)
+
"
/jdk
1.8.0
.jdk/Contents/Home
"
:
"
--with-boot-jdk=
"
+
input
.
get
(
"
boot_jdk
"
,
"
install_path
"
)
+
"
/jdk
1.8.0
"
)
?
"
--with-boot-jdk=
"
+
input
.
get
(
"
boot_jdk
"
,
"
install_path
"
)
+
"
/jdk
"
+
boot_jdk_subdirpart
+
"
.jdk/Contents/Home
"
:
"
--with-boot-jdk=
"
+
input
.
get
(
"
boot_jdk
"
,
"
install_path
"
)
+
"
/jdk
"
+
boot_jdk_subdirpart
)
},
devkit
:
{
...
...
make/Bundles.gmk
浏览文件 @
7c733af6
...
...
@@ -187,7 +187,11 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
$(JDK_SYMBOLS_EXCLUDE_PATTERN) \
$(SYMBOLS_EXCLUDE_PATTERN) \
, \
$(ALL_JDK_FILES) \
$(filter-out \
$(JDK_IMAGE_HOMEDIR)/demo/% $(JDK_IMAGE_HOMEDIR)/sample/% \
, \
$(ALL_JDK_FILES) \
) \
) \
$(call CacheFind, $(SYMBOLS_IMAGE_DIR))
...
...
make/CreateJmods.gmk
浏览文件 @
7c733af6
# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014,
2016,
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
...
...
@@ -82,8 +82,10 @@ ifeq ($(MODULE), java.base)
endif
endif
# Changes to the jmod tool itself should also trigger a rebuild of all jmods
DEPS += $(JMOD_CMD)
# Changes to the jmod tool itself should also trigger a rebuild of all jmods.
# The variable JMOD_CMD could contain an environment variable assignment before
# the actual command. Filter that out using wildcard before adding to DEPS.
DEPS += $(wildcard $(JMOD_CMD))
ifeq ($(EXTERNAL_BUILDJDK), false)
DEPS += $(call CacheFind, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod)
endif
...
...
@@ -100,7 +102,7 @@ $(JMODS_DIR)/$(MODULE).jmod: $(DEPS)
--os-name $(REQUIRED_OS_NAME) \
--os-arch $(OPENJDK_TARGET_CPU_LEGACY) \
--os-version $(REQUIRED_OS_VERSION) \
--modulepath $(JMODS_DIR) \
--modulepath $(JMODS_DIR) \
--exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.pdb,*.map}' \
$(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@)
$(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@
...
...
make/Images.gmk
浏览文件 @
7c733af6
#
# Copyright (c) 2014, 201
5
, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014, 201
6
, 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
...
...
@@ -225,7 +225,6 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
jmap.1 \
jps.1 \
jrunscript.1 \
jsadebugd.1 \
jstack.1 \
jstat.1 \
jstatd.1 \
...
...
make/Javadoc.gmk
浏览文件 @
7c733af6
...
...
@@ -82,7 +82,7 @@ JNLP_FIRST_COPYRIGHT_YEAR = 1998
PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
JDKNET_FIRST_COPYRIGHT_YEAR = 2014
JACCESSAPI_FIRST_COPYRIGHT_YEAR = 2002
JSOBJECT_FIRST_COPYRIGHT_YEAR = 1993
# Oracle name
FULL_COMPANY_NAME = Oracle and/or its affiliates
...
...
@@ -576,14 +576,14 @@ $(OLD_DOCLETAPI_PACKAGES_FILE): $(call PackageDependencies,$(OLD_DOCLETAPI_PKGS)
ALL_OTHER_TARGETS += tagletapidocs
TAGLETAPI_DOCDIR := $(OLD_DOCLET_DIR)/taglet
TAGLETAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
TAGLETAPI_DOCTITLE := Taglet API
TAGLETAPI_WINDOWTITLE := Taglet API
TAGLETAPI_HEADER := <strong>Taglet API</strong>
TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
# Temporary directory (special generation rules)
TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
# The index.html, options, and packages files
TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/
com/sun/tools/doclets/Taglet
.html
TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/
index
.html
TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
...
...
@@ -592,20 +592,12 @@ TAGLETAPI_MODULES = jdk.javadoc
tagletapidocs: $(TAGLETAPI_INDEX_FILE)
# Set relative location to core api document root
$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
# Run javadoc if the index file is out of date or missing
$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc)
$(RM) -r $(TAGLETAPI_TEMPDIR)
$(MKDIR) -p $(TAGLETAPI_TEMPDIR)
$(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
$(JAVADOC_CMD_SMALL) -d $(
TAGLETAPI_TEMPDIR
) \
$(JAVADOC_CMD_SMALL) -d $(
@D
) \
@$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
cp -r $(TAGLETAPI_TEMPDIR)/com $(TAGLETAPI_DOCDIR)
cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(TAGLETAPI_DOCDIR)
$(RM) -r $(TAGLETAPI_TEMPDIR)
# Create file with javadoc options in it
$(TAGLETAPI_OPTIONS_FILE):
...
...
@@ -617,6 +609,10 @@ $(TAGLETAPI_OPTIONS_FILE):
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(TAGLETAPI_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-breakiterator) ; \
$(call OptionPair,-doctitle,$(TAGLETAPI_DOCTITLE)) ; \
$(call OptionPair,-windowtitle,$(TAGLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
$(call OptionPair,-header,$(TAGLETAPI_HEADER)$(DRAFT_HEADER)) ; \
$(call OptionOnly,-nonavbar) ; \
$(call OptionOnly,-noindex) ; \
$(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
...
...
@@ -1025,6 +1021,64 @@ $(HTTPSERVER_PACKAGES_FILE): $(call PackageDependencies,$(HTTPSERVER_PKGS))
$(prep-target)
$(call PackageFilter,$(HTTPSERVER_PKGS))
#############################################################
#
# jsobjectdocs
#
ALL_OTHER_TARGETS += jsobjectdocs
JSOBJECT_DOCDIR := $(JRE_API_DOCSDIR)/plugin/jsobject
JSOBJECT2COREAPI := ../../$(JDKJRE2COREAPI)
JSOBJECT_DOCTITLE := Java$(TRADEMARK) JSObject Doc
JSOBJECT_WINDOWTITLE := Java JSObject Doc
JSOBJECT_HEADER := <strong>Java JSObject Doc</strong>
JSOBJECT_BOTTOM := $(call CommonBottom,$(JSOBJECT_FIRST_COPYRIGHT_YEAR))
# JSOBJECT_PKGS is located in NON_CORE_PKGS.gmk
JSOBJECT_INDEX_HTML = $(JSOBJECT_DOCDIR)/index.html
JSOBJECT_OPTIONS_FILE = $(DOCSTMPDIR)/jsobject.options
JSOBJECT_PACKAGES_FILE = $(DOCSTMPDIR)/jsobject.packages
# The modules required to be documented
JSOBJECT_MODULES = jdk.jsobject
jsobjectdocs: $(JSOBJECT_INDEX_HTML)
# Set relative location to core api document root
$(JSOBJECT_INDEX_HTML): GET2DOCSDIR=$(JSOBJECT2COREAPI)/..
# Run javadoc if the index file is out of date or missing
$(JSOBJECT_INDEX_HTML): $(JSOBJECT_OPTIONS_FILE) $(JSOBJECT_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc)
$(call JavadocSummary,$(JSOBJECT_OPTIONS_FILE),$(JSOBJECT_PACKAGES_FILE))
$(JAVADOC_CMD_SMALL) -d $(@D) \
@$(JSOBJECT_OPTIONS_FILE) @$(JSOBJECT_PACKAGES_FILE)
# Create file with javadoc options in it
$(JSOBJECT_OPTIONS_FILE):
$(prep-target)
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
$(call OptionOnly,-Xdoclint:none) ; \
$(call OptionPair,-system,none) ; \
$(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
$(call OptionPair,-addmods,$(JSOBJECT_MODULES)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nodeprecatedlist) ; \
$(call OptionPair,-doctitle,$(JSOBJECT_DOCTITLE)) ; \
$(call OptionPair,-windowtitle,$(JSOBJECT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
$(call OptionPair,-header,$(JSOBJECT_HEADER)$(DRAFT_HEADER)); \
$(call OptionPair,-bottom,$(JSOBJECT_BOTTOM)$(DRAFT_BOTTOM)); \
$(call OptionTrip,-linkoffline,$(JSOBJECT2COREAPI),$(COREAPI_DOCSDIR)/); \
) >> $@
# Create a file with the package names in it
$(JSOBJECT_PACKAGES_FILE): $(call PackageDependencies,$(JSOBJECT_PKGS))
$(prep-target)
$(call PackageFilter,$(JSOBJECT_PKGS))
#############################################################
#
# mgmtdocs
...
...
@@ -1610,7 +1664,7 @@ $(JDKNET_PACKAGES_FILE): $(call PackageDependencies,$(JDKNET_PKGS))
#
# TODO: Need to decide when the plugin API is ready to publish as experimental API.
# This target is temporarily added for internal use for now.
#
#
ALL_OTHER_TARGETS += jlinkdocs
...
...
make/Main.gmk
浏览文件 @
7c733af6
...
...
@@ -704,7 +704,7 @@ else
test-image-failure-handler: build-test-failure-handler
build-test-hotspot-jtreg-native: buildtools-jdk
build-test-hotspot-jtreg-native: buildtools-jdk
import-hotspot
build-test-jdk-jtreg-native: buildtools-jdk
...
...
make/common/NON_CORE_PKGS.gmk
浏览文件 @
7c733af6
...
...
@@ -114,8 +114,11 @@ JDK_PKGS = jdk \
JACCESSAPI_PKGS = com.sun.java.accessibility.util
JSOBJECT_PKGS = netscape.javascript
# non-core packages in rt.jar
NON_CORE_PKGS = $(DOMAPI_PKGS) \
$(JSOBJECT_PKGS) \
$(MGMT_PKGS) \
$(JAAS_PKGS) \
$(JGSS_PKGS) \
...
...
test/jtreg-ext/requires/VMProps.java
浏览文件 @
7c733af6
...
...
@@ -23,8 +23,6 @@
package
requires
;
import
java.io.IOException
;
import
java.lang.management.ManagementFactory
;
import
java.lang.management.RuntimeMXBean
;
import
java.nio.file.Files
;
import
java.nio.file.Paths
;
import
java.util.ArrayList
;
...
...
@@ -35,14 +33,18 @@ import java.util.concurrent.Callable;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
import
sun.hotspot.gc.GC
;
import
sun.hotspot.WhiteBox
;
/**
* The Class to be invoked by jtreg prior Test Suite execution to
* collect information about VM.
* Do not use any API's that may not be available in all target VMs.
* Properties set by this Class will be available in the @requires expressions.
*/
public
class
VMProps
implements
Callable
<
Map
<
String
,
String
>>
{
private
static
final
WhiteBox
WB
=
WhiteBox
.
getWhiteBox
();
/**
* Collects information about VM properties.
* This method will be invoked by jtreg.
...
...
@@ -131,17 +133,14 @@ public class VMProps implements Callable<Map<String, String>> {
* @return "true" if Flight Recorder is enabled, "false" if is disabled.
*/
protected
String
vmFlightRecorder
()
{
RuntimeMXBean
runtimeMxBean
=
ManagementFactory
.
getRuntimeMXBean
();
List
<
String
>
arguments
=
runtimeMxBean
.
getInputArguments
();
if
(
arguments
.
contains
(
"-XX:+UnlockCommercialFeatures"
))
{
if
(
arguments
.
contains
(
"-XX:+FlightRecorder"
))
{
Boolean
isUnlockedCommercialFatures
=
WB
.
getBooleanVMFlag
(
"UnlockCommercialFeatures"
);
Boolean
isFlightRecorder
=
WB
.
getBooleanVMFlag
(
"FlightRecorder"
);
String
startFROptions
=
WB
.
getStringVMFlag
(
"StartFlightRecording"
);
if
(
isUnlockedCommercialFatures
!=
null
&&
isUnlockedCommercialFatures
)
{
if
(
isFlightRecorder
!=
null
&&
isFlightRecorder
)
{
return
"true"
;
}
if
(
arguments
.
contains
(
"-XX:-FlightRecorder"
))
{
return
"false"
;
}
if
(
arguments
.
stream
()
.
anyMatch
(
option
->
option
.
startsWith
(
"-XX:StartFlightRecording"
)))
{
if
(
startFROptions
!=
null
&&
!
startFROptions
.
isEmpty
())
{
return
"true"
;
}
}
...
...
test/lib/share/classes/jdk/test/lib/Platform.java
浏览文件 @
7c733af6
...
...
@@ -26,15 +26,15 @@ package jdk.test.lib;
import
java.util.regex.Pattern
;
public
class
Platform
{
public
static
final
String
vmName
=
System
.
getProperty
(
"java.vm.name"
);
public
static
final
String
vmInfo
=
System
.
getProperty
(
"java.vm.info"
);
private
static
final
String
osName
=
System
.
getProperty
(
"os.name"
);
private
static
final
String
dataModel
=
System
.
getProperty
(
"sun.arch.data.model"
);
private
static
final
String
vmVersion
=
System
.
getProperty
(
"java.vm.version"
);
private
static
final
String
javaVersion
=
System
.
getProperty
(
"java.version"
);
private
static
final
String
osArch
=
System
.
getProperty
(
"os.arch"
);
private
static
final
String
vmName
=
System
.
getProperty
(
"java.vm.name"
);
private
static
final
String
userName
=
System
.
getProperty
(
"user.name"
);
private
static
final
String
compiler
=
System
.
getProperty
(
"sun.management.compiler"
);
private
static
final
String
vmInfo
=
System
.
getProperty
(
"java.vm.info"
);
public
static
boolean
isClient
()
{
return
vmName
.
endsWith
(
" Client VM"
);
...
...
test/lib/sun/hotspot/WhiteBox.java
浏览文件 @
7c733af6
...
...
@@ -84,6 +84,7 @@ public class WhiteBox {
public
native
long
getVMAllocationGranularity
();
public
native
long
getVMLargePageSize
();
public
native
long
getHeapSpaceAlignment
();
public
native
long
getHeapAlignment
();
private
native
boolean
isObjectInOldGen0
(
Object
o
);
public
boolean
isObjectInOldGen
(
Object
o
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录