Skip to content

D
dragonwell11

openanolis / dragonwell11

通知 7
Star 2
Fork 0
D
dragonwell11

体验新版 GitCode，发现更多精彩内容 >>

提交 98e8c0e6 编写于 作者: D duke
浏览文件
操作

Merge

上级 0559042a 6988162c
展开全部 隐藏空白更改
内联 并排
Showing with 462 addition and 676 deletion
.hgtags-top-repo
浏览文件 @ 98e8c0e6
......@@ -284,3 +284,4 @@ d42c0a90afc3c66ca87543076ec9aafd4b4680de jdk9-b38
512dbbeb1730edcebfec873fc3f1455660b32000 jdk9-b39
cf136458ee747e151a27aa9ea0c1492ea55ef3e7 jdk9-b40
67395f7ca2db3b52e3a62a84888487de5cb9210a jdk9-b41
f7c11da0b0481d49cc7a65a453336c108191e821 jdk9-b42
common/autoconf/boot-jdk.m4
浏览文件 @ 98e8c0e6
......@@ -73,31 +73,25 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
AC_MSG_NOTICE([(This might be an JRE instead of an JDK)])
BOOT_JDK_FOUND=no
else
# Do we have an rt.jar? (On MacOSX it is called classes.jar)
if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring])
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
# Extra M4 quote needed to protect [] in grep expression.
[FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`]
if test "x$FOUND_CORRECT_VERSION" = x; then
AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring])
AC_MSG_NOTICE([(Your Boot JDK must be version 8 or 9)])
BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
# Extra M4 quote needed to protect [] in grep expression.
[FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`]
if test "x$FOUND_CORRECT_VERSION" = x; then
AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring])
AC_MSG_NOTICE([(Your Boot JDK must be version 8 or 9)])
BOOT_JDK_FOUND=no
else
# We're done! :-)
BOOT_JDK_FOUND=yes
BASIC_FIXUP_PATH(BOOT_JDK)
AC_MSG_CHECKING([for Boot JDK])
AC_MSG_RESULT([$BOOT_JDK])
AC_MSG_CHECKING([Boot JDK version])
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
AC_MSG_RESULT([$BOOT_JDK_VERSION])
fi # end check jdk version
fi # end check rt.jar
# We're done! :-)
BOOT_JDK_FOUND=yes
BASIC_FIXUP_PATH(BOOT_JDK)
AC_MSG_CHECKING([for Boot JDK])
AC_MSG_RESULT([$BOOT_JDK])
AC_MSG_CHECKING([Boot JDK version])
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' ' '`
AC_MSG_RESULT([$BOOT_JDK_VERSION])
fi # end check jdk version
fi # end check javac
fi # end check java
fi # end check boot jdk found
......
make/common/JavaCompilation.gmk
浏览文件 @ 98e8c0e6
......@@ -382,10 +382,6 @@ define remove_string
$2 := $$(subst $1,,$$($2))
endef
define replace_space_with_pathsep
$1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2)))
endef
# Setup make rules for compiling Java source code to class files and/or a
# resulting jar file.
#
......@@ -408,8 +404,6 @@ endef
# INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
# EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
# "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
# JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete
# source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
# HEADERS:=path to directory where all generated c-headers are written.
# DEPENDS:=Extra dependecy
# DISABLE_SJAVAC:=Explicitly disable the use of sjavac for this compilation unit.
......@@ -523,13 +517,6 @@ define SetupJavaCompilationInner
endif
endif
# Prep the source paths.
ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),)
$$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE)))
else
$$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
endif
# Create a sed expression to remove the source roots and to replace / with .
# and remove .java at the end.
$1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
......@@ -612,7 +599,7 @@ define SetupJavaCompilationInner
$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
-implicit:none -sourcepath "$$($1_SRCROOTSC)" \
-implicit:none \
-d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \
$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
......
make/jprt.properties
浏览文件 @ 98e8c0e6
......@@ -258,13 +258,11 @@ my.test.targets.hotspot.solaris.sparcv9= \
solaris_sparcv9_5.11-product-c2-runThese8, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParNewGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_CMS, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_G1, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParOldGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_SerialGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_ParallelGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_ParNewGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_CMS, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_G1, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_ParOldGC, \
......@@ -284,13 +282,11 @@ my.test.targets.hotspot.solaris.x64= \
solaris_x64_5.11-product-c2-runThese8_Xcomp_vm, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParNewGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_CMS, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParOldGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_SerialGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParallelGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParNewGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_CMS, \
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_G1, \
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParOldGC, \
......@@ -312,13 +308,11 @@ my.test.targets.hotspot.linux.i586= \
linux_i586_2.6-fastdebug-c2-runThese8_Xcomp_vm, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
linux_i586_2.6-product-{c1|c2}-GCOld_SerialGC, \
linux_i586_2.6-product-{c1|c2}-GCOld_ParallelGC, \
linux_i586_2.6-product-{c1|c2}-GCOld_ParNewGC, \
linux_i586_2.6-product-{c1|c2}-GCOld_CMS, \
linux_i586_2.6-product-{c1|c2}-GCOld_G1, \
linux_i586_2.6-product-{c1|c2}-GCOld_ParOldGC, \
......@@ -335,13 +329,11 @@ my.test.targets.hotspot.linux.x64= \
linux_x64_2.6-{product|fastdebug}-c2-scimark, \
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_SerialGC, \
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParallelGC, \
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParNewGC, \
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_CMS, \
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1, \
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParOldGC, \
linux_x64_2.6-{product|fastdebug}-c2-GCOld_SerialGC, \
linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParallelGC, \
linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParNewGC, \
linux_x64_2.6-{product|fastdebug}-c2-GCOld_CMS, \
linux_x64_2.6-{product|fastdebug}-c2-GCOld_G1, \
linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParOldGC, \
......@@ -356,13 +348,11 @@ my.test.targets.hotspot.macosx.x64= \
macosx_x64_10.7-{product|fastdebug}-c2-scimark, \
macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_SerialGC, \
macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParallelGC, \
macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParNewGC, \
macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_CMS, \
macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_G1, \
macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParOldGC, \
macosx_x64_10.7-{product|fastdebug}-c2-GCOld_SerialGC, \
macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParallelGC, \
macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParNewGC, \
macosx_x64_10.7-{product|fastdebug}-c2-GCOld_CMS, \
macosx_x64_10.7-{product|fastdebug}-c2-GCOld_G1, \
macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParOldGC, \
......@@ -381,13 +371,11 @@ my.test.targets.hotspot.windows.i586= \
windows_i586_6.1-fastdebug-c1-runThese8_Xshare, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
windows_i586_6.1-product-{c1|c2}-GCOld_SerialGC, \
windows_i586_6.1-product-{c1|c2}-GCOld_ParallelGC, \
windows_i586_6.1-product-{c1|c2}-GCOld_ParNewGC, \
windows_i586_6.1-product-{c1|c2}-GCOld_CMS, \
windows_i586_6.1-product-{c1|c2}-GCOld_G1, \
windows_i586_6.1-product-{c1|c2}-GCOld_ParOldGC, \
......@@ -407,13 +395,11 @@ my.test.targets.hotspot.windows.x64= \
windows_x64_6.1-product-c2-runThese8_Xcomp_vm, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_SerialGC, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParallelGC, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParNewGC, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_CMS, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_G1, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParOldGC, \
windows_x64_6.1-{product|fastdebug}-c2-GCOld_SerialGC, \
windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParallelGC, \
windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParNewGC, \
windows_x64_6.1-{product|fastdebug}-c2-GCOld_CMS, \
windows_x64_6.1-{product|fastdebug}-c2-GCOld_G1, \
windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParOldGC, \
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或