Mercurial > hg > openjdk > jdk9
changeset 2299:530dbcad379e
Merge
author | amurillo |
---|---|
date | Tue, 25 Oct 2016 12:25:41 -0700 |
parents | 808cae9bfff0 (current diff) 2b3e5caafe35 (diff) |
children | f37e46c2e8f6 |
files | common/autoconf/flags.m4 common/autoconf/generated-configure.sh |
diffstat | 3 files changed, 8 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/flags.m4 Thu Oct 20 16:53:56 2016 -0700 +++ b/common/autoconf/flags.m4 Tue Oct 25 12:25:41 2016 -0700 @@ -899,7 +899,7 @@ elif test "x$OPENJDK_$1_OS" = xsolaris; then $2JVM_CFLAGS="[$]$2JVM_CFLAGS -DSOLARIS" $2JVM_CFLAGS="[$]$2JVM_CFLAGS -template=no%extdef -features=no%split_init \ - -D_Crun_inline_placement -library=%none -KPIC -mt -xwe -features=no%except" + -D_Crun_inline_placement -library=%none -KPIC -mt -features=no%except" elif test "x$OPENJDK_$1_OS" = xmacosx; then $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT" $2JVM_CFLAGS="[$]$2JVM_CFLAGS -D_ALLBSD_SOURCE"
--- a/common/autoconf/generated-configure.sh Thu Oct 20 16:53:56 2016 -0700 +++ b/common/autoconf/generated-configure.sh Tue Oct 25 12:25:41 2016 -0700 @@ -5093,7 +5093,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1476374246 +DATE_WHEN_GENERATED=1477108079 ############################################################################### # @@ -50081,7 +50081,7 @@ elif test "x$OPENJDK_TARGET_OS" = xsolaris; then JVM_CFLAGS="$JVM_CFLAGS -DSOLARIS" JVM_CFLAGS="$JVM_CFLAGS -template=no%extdef -features=no%split_init \ - -D_Crun_inline_placement -library=%none -KPIC -mt -xwe -features=no%except" + -D_Crun_inline_placement -library=%none -KPIC -mt -features=no%except" elif test "x$OPENJDK_TARGET_OS" = xmacosx; then COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT" JVM_CFLAGS="$JVM_CFLAGS -D_ALLBSD_SOURCE" @@ -50904,7 +50904,7 @@ elif test "x$OPENJDK_BUILD_OS" = xsolaris; then OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -DSOLARIS" OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -template=no%extdef -features=no%split_init \ - -D_Crun_inline_placement -library=%none -KPIC -mt -xwe -features=no%except" + -D_Crun_inline_placement -library=%none -KPIC -mt -features=no%except" elif test "x$OPENJDK_BUILD_OS" = xmacosx; then OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT" OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -D_ALLBSD_SOURCE"
--- a/test/failure_handler/src/share/conf/common.properties Thu Oct 20 16:53:56 2016 -0700 +++ b/test/failure_handler/src/share/conf/common.properties Tue Oct 25 12:25:41 2016 -0700 @@ -34,9 +34,8 @@ jcmd.vm.classloader_stats jcmd.vm.stringtable \ jcmd.vm.symboltable jcmd.vm.uptime jcmd.vm.dynlibs \ jcmd.vm.system_properties \ - jcmd.gc.class_stats jcmd.gc.class_histogram \ - jstack \ - jmap.heap jmap.histo jmap.clstats jmap.finalizerinfo + jcmd.gc.heap_info jcmd.gc.class_stats jcmd.gc.class_histogram jcmd.gc.finalizer_info \ + jstack jinfo.app=jinfo @@ -55,16 +54,12 @@ jcmd.gc.class_stats.args=%p GC.class_stats jcmd.gc.class_histogram.args=%p GC.class_histogram +jcmd.gc.finalizer_info.args=%p GC.finalizer_info +jcmd.gc.heap_info.args=%p GC.heap_info jstack.app=jstack jstack.params.repeat=6 -jmap.app=jmap -jmap.heap.args=-heap %p -jmap.histo.args=-histo %p -jmap.clstats.args=-clstats %p -jmap.finalizerinfo.args=-finalizerinfo %p - ################################################################################ # environment info to gather ################################################################################