OpenJDK / jdk / jdk
changeset 46863:d2d62aec9891
Merge
line wrap: on
line diff
--- a/.hgtags Thu May 11 17:55:05 2017 -0700 +++ b/.hgtags Fri May 12 13:59:16 2017 -0700 @@ -1,3 +1,5 @@ +8fd0a4569191f33c98ee90c2709174a342fefb0d jdk-9+167 +fcabc74bd44e56c7419d111d59b95669ecb33c55 jdk-9+168 d3e973f1809606c67412361041ad197e50fe8cec jdk-9+166 3965b747cfe1e6cbd66b8739da5a1ea6ec6985e9 jdk-9+165 d16aebbb56d37f12e0c0b0a4fb427db65e1fb1a8 jdk-9+162 @@ -415,3 +417,4 @@ d1cab6c7e608479be4ebfad48a25b0ed48600f62 jdk-10+3 02253db2ace1422f576f58502fc7831ead77424b jdk-10+4 f113ce12fe24fbd24acf02711372d9f1e1c12426 jdk-10+5 +1407b19a2ddf6baae162f5a1a5b96af473f4d7d1 jdk-10+6
--- a/.hgtags-top-repo Thu May 11 17:55:05 2017 -0700 +++ b/.hgtags-top-repo Fri May 12 13:59:16 2017 -0700 @@ -400,6 +400,7 @@ 8d26916eaa21b689835ffc1c0dbf12470aa9be61 jdk-9+154 688a3863c00ebc089ab17ee1fc46272cbbd96815 jdk-9+155 783ec7542cf7154e5d2b87f55bb97d28f81e9ada jdk-9+156 +4df5f619c9ead4604d2f97ed231b3a35ec688c41 jdk-10+1 4eb77fb98952dc477a4229575c81d2263a9ce711 jdk-9+157 a4087bc10a88a43ea3ad0919b5b4af1c86977221 jdk-9+158 fe8466adaef8178dba94be53c789a0aaa87d13bb jdk-9+159 @@ -410,3 +411,10 @@ 7810f75d016a52e32295c4233009de5ca90e31af jdk-9+164 aff4f339acd40942d3dab499846b52acd87b3af1 jdk-9+165 ba5b16c9c6d80632b61959a33d424b1c3398ce62 jdk-9+166 +35017c286513ddcbcc6b63b99679c604993fc639 jdk-9+167 +143d4c87bc1ef1ed6dadd613cd9dd4488fdefc29 jdk-9+168 +9c7248b787c39b034d4f48d4aa48df903836cca7 jdk-10+2 +06373236a30801f72e2a31ee5c691c2a1e500f57 jdk-10+3 +8ec175c61fc3f58328a3324f07d7ded00e060be3 jdk-10+4 +111e2e7d00f45c983cdbc9c59ae40552152fcc23 jdk-10+5 +03fe61bb7670644cf6e46b5cfafb6b27c0e0157e jdk-10+6 \ No newline at end of file
--- a/common/autoconf/basics.m4 Thu May 11 17:55:05 2017 -0700 +++ b/common/autoconf/basics.m4 Fri May 12 13:59:16 2017 -0700 @@ -1095,6 +1095,7 @@ OTOOL="true" fi BASIC_PATH_PROGS(READELF, [greadelf readelf]) + BASIC_PATH_PROGS(DOT, dot) BASIC_PATH_PROGS(HG, hg) BASIC_PATH_PROGS(STAT, stat) BASIC_PATH_PROGS(TIME, time)
--- a/common/autoconf/generated-configure.sh Thu May 11 17:55:05 2017 -0700 +++ b/common/autoconf/generated-configure.sh Fri May 12 13:59:16 2017 -0700 @@ -918,6 +918,7 @@ INCLUDE_SA UNLIMITED_CRYPTO CACERTS_FILE +ENABLE_FULL_DOCS ENABLE_HEADLESS_ONLY DEFAULT_MAKE_TARGET OS_VERSION_MICRO @@ -936,6 +937,7 @@ TIME STAT HG +DOT READELF OTOOL LDD @@ -994,9 +996,8 @@ OPENJDK_TARGET_CPU_ISADIR OPENJDK_TARGET_CPU_LEGACY_LIB OPENJDK_TARGET_CPU_LEGACY -REQUIRED_OS_VERSION -REQUIRED_OS_ARCH -REQUIRED_OS_NAME +OPENJDK_MODULE_TARGET_OS_ARCH +OPENJDK_MODULE_TARGET_OS_NAME COMPILE_TYPE OPENJDK_TARGET_CPU_ENDIAN OPENJDK_TARGET_CPU_BITS @@ -1139,6 +1140,7 @@ with_output_sync with_default_make_target enable_headless_only +enable_full_docs with_cacerts_file enable_unlimited_crypto with_copyright_year @@ -1291,6 +1293,7 @@ LDD OTOOL READELF +DOT HG STAT TIME @@ -1972,6 +1975,8 @@ --enable-debug set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) [disabled] --enable-headless-only only build headless (no GUI) support [disabled] + --enable-full-docs build complete documentation [enabled if all tools + found] --disable-unlimited-crypto Disable unlimited crypto policy [enabled] --disable-keep-packaged-modules @@ -2256,6 +2261,7 @@ LDD Override default value for LDD OTOOL Override default value for OTOOL READELF Override default value for READELF + DOT Override default value for DOT HG Override default value for HG STAT Override default value for STAT TIME Override default value for TIME @@ -5177,7 +5183,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1490900744 +DATE_WHEN_GENERATED=1492975963 ############################################################################### # @@ -16025,32 +16031,17 @@ $as_echo "$COMPILE_TYPE" >&6; }