Lines 1-5
Link Here
|
1 |
--- ./common/autoconf/build-performance.m4 Sat Oct 06 10:24:47 2018 +0100 |
1 |
--- ./common/autoconf/build-performance.m4 Sat Jun 23 21:01:22 2018 -0700 |
2 |
+++ ./common/autoconf/build-performance.m4 Sat Dec 01 12:25:45 2018 -0800 |
2 |
+++ ./common/autoconf/build-performance.m4 Mon Sep 03 11:10:31 2018 -0700 |
3 |
@@ -41,6 +41,10 @@ |
3 |
@@ -41,6 +41,10 @@ |
4 |
# Looks like a MacOSX system |
4 |
# Looks like a MacOSX system |
5 |
NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` |
5 |
NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` |
Lines 27-33
Link Here
|
27 |
elif test "x$OPENJDK_BUILD_OS" = xwindows; then |
27 |
elif test "x$OPENJDK_BUILD_OS" = xwindows; then |
28 |
# Windows, but without cygwin |
28 |
# Windows, but without cygwin |
29 |
MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` |
29 |
MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` |
30 |
@@ -209,8 +222,8 @@ |
30 |
@@ -199,8 +212,8 @@ |
31 |
# Only use ccache if it is 3.1.4 or later, which supports |
31 |
# Only use ccache if it is 3.1.4 or later, which supports |
32 |
# precompiled headers. |
32 |
# precompiled headers. |
33 |
AC_MSG_CHECKING([if ccache supports precompiled headers]) |
33 |
AC_MSG_CHECKING([if ccache supports precompiled headers]) |
Lines 37-102
Link Here
|
37 |
+ if test "x$HAS_GOOD_CCACHE" = xyes; then |
37 |
+ if test "x$HAS_GOOD_CCACHE" = xyes; then |
38 |
AC_MSG_RESULT([no, disabling ccache]) |
38 |
AC_MSG_RESULT([no, disabling ccache]) |
39 |
CCACHE= |
39 |
CCACHE= |
40 |
CCACHE_STATUS="disabled" |
40 |
else |
41 |
--- ./common/autoconf/flags.m4 Sat Oct 06 10:24:47 2018 +0100 |
41 |
--- ./common/autoconf/generated-configure.sh Sat Jun 23 21:01:22 2018 -0700 |
42 |
+++ ./common/autoconf/flags.m4 Sat Dec 01 12:25:45 2018 -0800 |
42 |
+++ ./common/autoconf/generated-configure.sh Mon Sep 03 11:10:31 2018 -0700 |
43 |
@@ -154,7 +154,7 @@ |
43 |
@@ -646,6 +646,8 @@ |
44 |
# How to compile shared libraries. |
|
|
45 |
# |
46 |
|
47 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
48 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
49 |
PICFLAG="-fPIC" |
50 |
C_FLAG_REORDER='' |
51 |
CXX_FLAG_REORDER='' |
52 |
@@ -266,7 +266,7 @@ |
53 |
# fi |
54 |
|
55 |
# Generate make dependency files |
56 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
57 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
58 |
C_FLAG_DEPS="-MMD -MF" |
59 |
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
60 |
C_FLAG_DEPS="-xMMD -xMF" |
61 |
@@ -278,7 +278,7 @@ |
62 |
AC_SUBST(CXX_FLAG_DEPS) |
63 |
|
64 |
# Debug symbols |
65 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
66 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
67 |
if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then |
68 |
CFLAGS_DEBUG_SYMBOLS="-g1" |
69 |
CXXFLAGS_DEBUG_SYMBOLS="-g1" |
70 |
@@ -327,7 +327,7 @@ |
71 |
else |
72 |
# The remaining toolchains share opt flags between CC and CXX; |
73 |
# setup for C and duplicate afterwards. |
74 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
75 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
76 |
if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
77 |
# On MacOSX we optimize for size, something |
78 |
# we should do for all platforms? |
79 |
@@ -431,7 +431,7 @@ |
80 |
|
81 |
# Setup compiler/platform specific flags to CFLAGS_JDK, |
82 |
# CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?) |
83 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
84 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
85 |
# these options are used for both C and C++ compiles |
86 |
CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \ |
87 |
-pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" |
88 |
@@ -633,7 +633,7 @@ |
89 |
fi |
90 |
LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE" |
91 |
else |
92 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
93 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
94 |
# If this is a --hash-style=gnu system, use --hash-style=both, why? |
95 |
# We have previously set HAS_GNU_HASH if this is the case |
96 |
if test -n "$HAS_GNU_HASH"; then |
97 |
--- ./common/autoconf/generated-configure.sh Sat Oct 06 10:24:47 2018 +0100 |
98 |
+++ ./common/autoconf/generated-configure.sh Sat Dec 01 12:25:45 2018 -0800 |
99 |
@@ -654,6 +654,8 @@ |
100 |
LIBM |
44 |
LIBM |
101 |
LIBZIP_CAN_USE_MMAP |
45 |
LIBZIP_CAN_USE_MMAP |
102 |
USE_EXTERNAL_LIBZ |
46 |
USE_EXTERNAL_LIBZ |
Lines 105-111
Link Here
|
105 |
USE_EXTERNAL_LIBGIF |
49 |
USE_EXTERNAL_LIBGIF |
106 |
USE_EXTERNAL_LIBJPEG |
50 |
USE_EXTERNAL_LIBJPEG |
107 |
ALSA_LIBS |
51 |
ALSA_LIBS |
108 |
@@ -837,6 +839,7 @@ |
52 |
@@ -824,6 +826,7 @@ |
109 |
JDK_MAJOR_VERSION |
53 |
JDK_MAJOR_VERSION |
110 |
USER_RELEASE_SUFFIX |
54 |
USER_RELEASE_SUFFIX |
111 |
COMPRESS_JARS |
55 |
COMPRESS_JARS |
Lines 113-127
Link Here
|
113 |
UNLIMITED_CRYPTO |
57 |
UNLIMITED_CRYPTO |
114 |
CACERTS_FILE |
58 |
CACERTS_FILE |
115 |
TEST_IN_BUILD |
59 |
TEST_IN_BUILD |
116 |
@@ -914,6 +917,7 @@ |
60 |
@@ -900,6 +903,7 @@ |
|
|
61 |
OPENJDK_TARGET_CPU_ARCH |
117 |
OPENJDK_TARGET_CPU |
62 |
OPENJDK_TARGET_CPU |
118 |
OPENJDK_TARGET_OS_ENV |
|
|
119 |
OPENJDK_TARGET_OS_API |
63 |
OPENJDK_TARGET_OS_API |
120 |
+OPENJDK_TARGET_OS_VENDOR |
64 |
+OPENJDK_TARGET_OS_VENDOR |
121 |
OPENJDK_TARGET_OS |
65 |
OPENJDK_TARGET_OS |
122 |
OPENJDK_BUILD_CPU_ENDIAN |
66 |
OPENJDK_BUILD_CPU_ENDIAN |
123 |
OPENJDK_BUILD_CPU_BITS |
67 |
OPENJDK_BUILD_CPU_BITS |
124 |
@@ -1050,6 +1054,7 @@ |
68 |
@@ -1032,6 +1036,7 @@ |
125 |
enable_hotspot_test_in_build |
69 |
enable_hotspot_test_in_build |
126 |
with_cacerts_file |
70 |
with_cacerts_file |
127 |
enable_unlimited_crypto |
71 |
enable_unlimited_crypto |
Lines 129-143
Link Here
|
129 |
with_milestone |
73 |
with_milestone |
130 |
with_update_version |
74 |
with_update_version |
131 |
with_user_release_suffix |
75 |
with_user_release_suffix |
132 |
@@ -1070,6 +1075,7 @@ |
76 |
@@ -1058,6 +1063,7 @@ |
133 |
with_import_hotspot |
|
|
134 |
with_toolchain_type |
135 |
with_toolchain_version |
136 |
+with_package_path |
137 |
with_jtreg |
138 |
with_extra_cflags |
77 |
with_extra_cflags |
139 |
with_extra_cxxflags |
78 |
with_extra_cxxflags |
140 |
@@ -1827,6 +1833,7 @@ |
79 |
with_extra_ldflags |
|
|
80 |
+with_package_path |
81 |
enable_debug_symbols |
82 |
enable_zip_debug_info |
83 |
enable_macosx_runtime_support |
84 |
@@ -1734,6 +1740,7 @@ |
141 |
run the Queens test after Hotspot build [disabled] |
85 |
run the Queens test after Hotspot build [disabled] |
142 |
--enable-unlimited-crypto |
86 |
--enable-unlimited-crypto |
143 |
Enable unlimited crypto policy [disabled] |
87 |
Enable unlimited crypto policy [disabled] |
Lines 145-177
Link Here
|
145 |
--disable-debug-symbols disable generation of debug symbols [enabled] |
89 |
--disable-debug-symbols disable generation of debug symbols [enabled] |
146 |
--disable-zip-debug-info |
90 |
--disable-zip-debug-info |
147 |
disable zipping of debug-info files [enabled] |
91 |
disable zipping of debug-info files [enabled] |
148 |
@@ -1919,6 +1926,8 @@ |
92 |
@@ -1830,6 +1837,8 @@ |
149 |
the version of the toolchain to look for, use |
|
|
150 |
'--help' to show possible values [platform |
151 |
dependent] |
152 |
+ --with-package-path package path to be used for location of third party |
153 |
+ packages |
154 |
--with-jtreg Regression Test Harness [probed] |
155 |
--with-extra-cflags extra flags to be used when compiling jdk c-files |
93 |
--with-extra-cflags extra flags to be used when compiling jdk c-files |
156 |
--with-extra-cxxflags extra flags to be used when compiling jdk c++-files |
94 |
--with-extra-cxxflags extra flags to be used when compiling jdk c++-files |
157 |
@@ -4121,6 +4130,7 @@ |
95 |
--with-extra-ldflags extra flags to be used when linking jdk |
158 |
VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft" |
96 |
+ --with-package-path package path to be used for location of third party |
159 |
|
97 |
+ packages |
160 |
# These toolchains are valid on different platforms |
98 |
--with-x use the X Window System |
161 |
+VALID_TOOLCHAINS_bsd="clang gcc" |
99 |
--with-cups specify prefix directory for the cups package |
162 |
VALID_TOOLCHAINS_linux="gcc clang" |
100 |
(expecting the headers under PATH/include) |
163 |
VALID_TOOLCHAINS_solaris="solstudio" |
101 |
@@ -3744,7 +3753,7 @@ |
164 |
VALID_TOOLCHAINS_macosx="gcc clang" |
102 |
|
165 |
@@ -4336,7 +4346,7 @@ |
103 |
|
166 |
#CUSTOM_AUTOCONF_INCLUDE |
|
|
167 |
|
168 |
# Do not change or remove the following line, it is needed for consistency checks: |
169 |
-DATE_WHEN_GENERATED=1536764960 |
170 |
+DATE_WHEN_GENERATED=1543299193 |
171 |
|
172 |
############################################################################### |
173 |
# |
104 |
# |
174 |
@@ -13570,11 +13580,27 @@ |
105 |
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
|
|
106 |
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
107 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
108 |
# |
109 |
# This code is free software; you can redistribute it and/or modify it |
110 |
@@ -6840,11 +6849,27 @@ |
175 |
as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5 |
111 |
as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5 |
176 |
;; |
112 |
;; |
177 |
esac |
113 |
esac |
Lines 200-206
Link Here
|
200 |
VAR_CPU=x86_64 |
136 |
VAR_CPU=x86_64 |
201 |
VAR_CPU_ARCH=x86 |
137 |
VAR_CPU_ARCH=x86 |
202 |
VAR_CPU_BITS=64 |
138 |
VAR_CPU_BITS=64 |
203 |
@@ -13708,11 +13734,27 @@ |
139 |
@@ -6977,11 +7002,27 @@ |
204 |
as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5 |
140 |
as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5 |
205 |
;; |
141 |
;; |
206 |
esac |
142 |
esac |
Lines 229-235
Link Here
|
229 |
VAR_CPU=x86_64 |
165 |
VAR_CPU=x86_64 |
230 |
VAR_CPU_ARCH=x86 |
166 |
VAR_CPU_ARCH=x86 |
231 |
VAR_CPU_BITS=64 |
167 |
VAR_CPU_BITS=64 |
232 |
@@ -13785,6 +13827,7 @@ |
168 |
@@ -7054,6 +7095,7 @@ |
233 |
|
169 |
|
234 |
# ... and setup our own variables. (Do this explicitely to facilitate searching) |
170 |
# ... and setup our own variables. (Do this explicitely to facilitate searching) |
235 |
OPENJDK_TARGET_OS="$VAR_OS" |
171 |
OPENJDK_TARGET_OS="$VAR_OS" |
Lines 237-243
Link Here
|
237 |
OPENJDK_TARGET_OS_API="$VAR_OS_API" |
173 |
OPENJDK_TARGET_OS_API="$VAR_OS_API" |
238 |
OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV" |
174 |
OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV" |
239 |
OPENJDK_TARGET_CPU="$VAR_CPU" |
175 |
OPENJDK_TARGET_CPU="$VAR_CPU" |
240 |
@@ -13799,6 +13842,7 @@ |
176 |
@@ -7067,6 +7109,7 @@ |
241 |
|
177 |
|
242 |
|
178 |
|
243 |
|
179 |
|
Lines 245-251
Link Here
|
245 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5 |
181 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5 |
246 |
$as_echo_n "checking openjdk-target os-cpu... " >&6; } |
182 |
$as_echo_n "checking openjdk-target os-cpu... " >&6; } |
247 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5 |
183 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5 |
248 |
@@ -13927,8 +13971,8 @@ |
184 |
@@ -7195,8 +7238,8 @@ |
249 |
|
185 |
|
250 |
# Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property |
186 |
# Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property |
251 |
OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU" |
187 |
OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU" |
Lines 256-262
Link Here
|
256 |
OPENJDK_TARGET_CPU_OSARCH="i386" |
192 |
OPENJDK_TARGET_CPU_OSARCH="i386" |
257 |
elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then |
193 |
elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then |
258 |
# On all platforms except macosx, we replace x86_64 with amd64. |
194 |
# On all platforms except macosx, we replace x86_64 with amd64. |
259 |
@@ -14570,7 +14614,7 @@ |
195 |
@@ -8017,7 +8060,7 @@ |
260 |
INCLUDE_SA=false |
196 |
INCLUDE_SA=false |
261 |
fi |
197 |
fi |
262 |
if test "x$VAR_CPU" = xppc64 ; then |
198 |
if test "x$VAR_CPU" = xppc64 ; then |
Lines 265-271
Link Here
|
265 |
fi |
201 |
fi |
266 |
if test "x$OPENJDK_TARGET_CPU" = xaarch64; then |
202 |
if test "x$OPENJDK_TARGET_CPU" = xaarch64; then |
267 |
INCLUDE_SA=false |
203 |
INCLUDE_SA=false |
268 |
@@ -19744,6 +19788,24 @@ |
204 |
@@ -11206,6 +11249,24 @@ |
269 |
|
205 |
|
270 |
############################################################################### |
206 |
############################################################################### |
271 |
# |
207 |
# |
Lines 290-309
Link Here
|
290 |
# Enable or disable the elliptic curve crypto implementation |
226 |
# Enable or disable the elliptic curve crypto implementation |
291 |
# |
227 |
# |
292 |
|
228 |
|
293 |
@@ -37332,7 +37394,7 @@ |
229 |
@@ -19429,6 +19490,8 @@ |
|
|
230 |
elif test "x$OPENJDK_TARGET_OS" = "xaix"; then |
231 |
# Do not probe for cc on AIX. |
232 |
COMPILER_CHECK_LIST="xlc_r" |
233 |
+ elif test "`uname -s`" = "FreeBSD"; then |
234 |
+ COMPILER_CHECK_LIST="cc gcc" |
235 |
else |
236 |
COMPILER_CHECK_LIST="gcc cc" |
237 |
fi |
238 |
@@ -20389,7 +20452,7 @@ |
239 |
else |
240 |
COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` |
241 |
# Check that this is likely to be GCC. |
242 |
- $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null |
243 |
+ $COMPILER --version 2>&1 | $GREP -E "(Free Software Foundation|clang)" > /dev/null |
244 |
if test $? -ne 0; then |
245 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5 |
246 |
$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;} |
247 |
@@ -21991,7 +22054,7 @@ |
248 |
else |
249 |
COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` |
250 |
# Check that this is likely to be GCC. |
251 |
- $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null |
252 |
+ $COMPILER --version 2>&1 | $GREP -E "(Free Software Foundation|clang)" > /dev/null |
253 |
if test $? -ne 0; then |
254 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5 |
255 |
$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;} |
256 |
@@ -28026,7 +28089,7 @@ |
294 |
|
257 |
|
295 |
# objcopy is used for moving debug symbols to separate files when |
258 |
# objcopy is used for moving debug symbols to separate files when |
296 |
# full debug symbols are enabled. |
259 |
# full debug symbols are enabled. |
297 |
- if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then |
260 |
- if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then |
298 |
+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xbsd ; then |
261 |
+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xbsd ; then |
299 |
|
262 |
if test -n "$ac_tool_prefix"; then |
300 |
|
263 |
for ac_prog in gobjcopy objcopy |
301 |
# Publish this variable in the help. |
264 |
do |
302 |
@@ -40009,8 +40071,31 @@ |
265 |
@@ -29383,8 +29446,10 @@ |
303 |
|
266 |
SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' |
|
|
267 |
SET_SHARED_LIBRARY_MAPFILE='' |
268 |
SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.' |
269 |
+ POST_STRIP_CMD="$STRIP -S" |
270 |
+ fi |
271 |
+ if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then |
272 |
SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN" |
273 |
- POST_STRIP_CMD="$STRIP -S" |
274 |
fi |
275 |
else |
276 |
if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
277 |
@@ -29731,7 +29796,7 @@ |
278 |
# |
279 |
case $COMPILER_NAME in |
280 |
gcc ) |
281 |
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ |
282 |
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \ |
283 |
-pipe \ |
284 |
-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" |
285 |
CXXSTD_CXXFLAG="-std=gnu++98" |
286 |
@@ -30073,22 +30138,36 @@ |
287 |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64" |
304 |
|
288 |
|
305 |
# The package path is used only on macosx? |
289 |
# The package path is used only on macosx? |
306 |
- # FIXME: clean this up, and/or move it elsewhere. |
|
|
307 |
- PACKAGE_PATH=/opt/local |
290 |
- PACKAGE_PATH=/opt/local |
308 |
+ |
291 |
+ |
309 |
+# Check whether --with-package-path was given. |
292 |
+# Check whether --with-package-path was given. |
Lines 329-393
Link Here
|
329 |
+ PACKAGE_PATH=/usr/local |
312 |
+ PACKAGE_PATH=/usr/local |
330 |
+ fi |
313 |
+ fi |
331 |
+ fi |
314 |
+ fi |
332 |
+ |
|
|
333 |
|
334 |
|
315 |
|
335 |
# Check for extra potential brokenness. |
|
|
336 |
@@ -41117,7 +41202,7 @@ |
337 |
# How to compile shared libraries. |
338 |
# |
339 |
|
316 |
|
340 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
317 |
if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then |
341 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
318 |
- # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the |
342 |
PICFLAG="-fPIC" |
319 |
- # Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN |
343 |
C_FLAG_REORDER='' |
320 |
- # (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h). |
344 |
CXX_FLAG_REORDER='' |
321 |
- # Note: -Dmacro is the same as #define macro 1 |
345 |
@@ -41196,7 +41281,7 @@ |
322 |
- # -Dmacro= is the same as #define macro |
346 |
# fi |
323 |
- if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
347 |
|
324 |
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN=" |
348 |
# Generate make dependency files |
325 |
- else |
349 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
326 |
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN" |
350 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
327 |
- fi |
351 |
C_FLAG_DEPS="-MMD -MF" |
328 |
- else |
352 |
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
329 |
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN" |
353 |
C_FLAG_DEPS="-xMMD -xMF" |
330 |
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN" |
354 |
@@ -41208,7 +41293,7 @@ |
331 |
+ else |
355 |
|
332 |
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_BIG_ENDIAN" |
356 |
|
333 |
fi |
357 |
# Debug symbols |
334 |
if test "x$OPENJDK_TARGET_OS" = xlinux; then |
358 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
335 |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX" |
359 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
336 |
@@ -30118,6 +30197,38 @@ |
360 |
if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then |
337 |
fi |
361 |
CFLAGS_DEBUG_SYMBOLS="-g1" |
338 |
if test "x$OPENJDK_TARGET_OS" = xbsd; then |
362 |
CXXFLAGS_DEBUG_SYMBOLS="-g1" |
339 |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" |
363 |
@@ -41257,7 +41342,7 @@ |
340 |
+ if test "`uname -s`" = "OpenBSD"; then |
364 |
else |
341 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld requires -z wxneeded" >&5 |
365 |
# The remaining toolchains share opt flags between CC and CXX; |
342 |
+$as_echo_n "checking if ld requires -z wxneeded... " >&6; } |
366 |
# setup for C and duplicate afterwards. |
343 |
+ if test "$cross_compiling" = yes; then : |
367 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
344 |
+ |
368 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
345 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
369 |
if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
346 |
+$as_echo "no" >&6; } |
370 |
# On MacOSX we optimize for size, something |
347 |
+ |
371 |
# we should do for all platforms? |
348 |
+ |
372 |
@@ -41411,7 +41496,7 @@ |
349 |
+else |
373 |
|
350 |
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
374 |
# Setup compiler/platform specific flags to CFLAGS_JDK, |
351 |
+/* end confdefs.h. */ |
375 |
# CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?) |
352 |
+#include <sys/mman.h> |
376 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
353 |
+int main() { return mmap(0, 4096, PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0) != MAP_FAILED; } |
377 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
354 |
+_ACEOF |
378 |
# these options are used for both C and C++ compiles |
355 |
+if ac_fn_cxx_try_run "$LINENO"; then : |
379 |
CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \ |
356 |
+ |
380 |
-pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" |
357 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
381 |
@@ -41830,7 +41915,7 @@ |
358 |
+$as_echo "yes" >&6; } |
|
|
359 |
+ LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,wxneeded" |
360 |
+ |
361 |
+else |
362 |
+ |
363 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
364 |
+$as_echo "no" >&6; } |
365 |
+ |
366 |
+fi |
367 |
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
368 |
+ conftest.$ac_objext conftest.beam conftest.$ac_ext |
369 |
+fi |
370 |
+ |
371 |
+ fi |
372 |
fi |
373 |
if test "x$DEBUG_LEVEL" = xrelease; then |
374 |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG" |
375 |
@@ -30187,6 +30298,15 @@ |
376 |
# Should this be supplied to the OSS linker as well? |
377 |
LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1" |
378 |
fi |
379 |
+ elif test "x$OPENJDK_TARGET_OS" = xbsd; then |
380 |
+ # And since we now know that the linker is gnu, then add: |
381 |
+ # -z noexecstack, to mark stack regions as non-executable |
382 |
+ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker noexecstack" |
383 |
+ if test "x$DEBUG_LEVEL" = "xrelease"; then |
384 |
+ # When building release libraries, tell the linker optimize them. |
385 |
+ # Should this be supplied to the OSS linker as well? |
386 |
+ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1" |
387 |
+ fi |
388 |
fi |
382 |
fi |
389 |
fi |
383 |
LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE" |
390 |
LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \ |
384 |
else |
391 |
@@ -30641,11 +30761,18 @@ |
385 |
- if test "x$TOOLCHAIN_TYPE" = xgcc; then |
|
|
386 |
+ if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then |
387 |
# If this is a --hash-style=gnu system, use --hash-style=both, why? |
388 |
# We have previously set HAS_GNU_HASH if this is the case |
389 |
if test -n "$HAS_GNU_HASH"; then |
390 |
@@ -42366,11 +42451,18 @@ |
391 |
fi |
392 |
fi |
392 |
|
393 |
|
393 |
if test "x$OPENJDK_TARGET_OS" = xbsd; then |
394 |
if test "x$OPENJDK_TARGET_OS" = xbsd; then |
Lines 411-457
Link Here
|
411 |
fi |
412 |
fi |
412 |
|
413 |
|
413 |
if test "x$OPENJDK" = "xfalse"; then |
414 |
if test "x$OPENJDK" = "xfalse"; then |
414 |
@@ -42405,21 +42497,25 @@ |
415 |
@@ -30681,14 +30808,18 @@ |
415 |
# Make a simple check for the libraries at the sysroot, and setup --x-includes and |
|
|
416 |
# --x-libraries for the sysroot, if that seems to be correct. |
416 |
# --x-libraries for the sysroot, if that seems to be correct. |
417 |
if test "x$OPENJDK_TARGET_OS" = "xlinux"; then |
417 |
if test "x$SYS_ROOT" != "x/"; then |
418 |
- if test "x$SYSROOT" != "x"; then |
418 |
if test "x$x_includes" = xNONE; then |
419 |
+ if test "x$SYS_ROOT" != "x/"; then |
419 |
- if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then |
420 |
if test "x$x_includes" = xNONE; then |
420 |
+ if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then |
421 |
- if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then |
421 |
+ x_includes="$SYS_ROOT/usr/X11R7/include" |
422 |
- x_includes="$SYSROOT/usr/X11R6/include" |
422 |
+ elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then |
423 |
- elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then |
423 |
x_includes="$SYS_ROOT/usr/X11R6/include" |
424 |
- x_includes="$SYSROOT/usr/include" |
424 |
elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then |
425 |
+ if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then |
425 |
x_includes="$SYS_ROOT/usr/include" |
426 |
+ x_includes="$SYS_ROOT/usr/X11R7/include" |
|
|
427 |
+ elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then |
428 |
+ x_includes="$SYS_ROOT/usr/X11R6/include" |
429 |
+ elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then |
430 |
+ x_includes="$SYS_ROOT/usr/include" |
431 |
fi |
432 |
fi |
433 |
if test "x$x_libraries" = xNONE; then |
434 |
- if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then |
435 |
- x_libraries="$SYSROOT/usr/X11R6/lib" |
436 |
- elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
437 |
- x_libraries="$SYSROOT/usr/lib64" |
438 |
- elif test -f "$SYSROOT/usr/lib/libX11.so"; then |
439 |
- x_libraries="$SYSROOT/usr/lib" |
440 |
+ if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then |
441 |
+ x_libraries="$SYS_ROOT/usr/X11R7/lib" |
442 |
+ elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then |
443 |
+ x_libraries="$SYS_ROOT/usr/X11R6/lib" |
444 |
+ elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
445 |
+ x_libraries="$SYS_ROOT/usr/lib64" |
446 |
+ elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then |
447 |
+ x_libraries="$SYS_ROOT/usr/lib" |
448 |
fi |
449 |
fi |
426 |
fi |
450 |
fi |
427 |
fi |
451 |
@@ -43466,6 +43562,10 @@ |
428 |
if test "x$x_libraries" = xNONE; then |
|
|
429 |
- if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then |
430 |
+ if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then |
431 |
+ x_libraries="$SYS_ROOT/usr/X11R7/lib" |
432 |
+ elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then |
433 |
x_libraries="$SYS_ROOT/usr/X11R6/lib" |
434 |
elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
435 |
x_libraries="$SYS_ROOT/usr/lib64" |
436 |
@@ -31735,6 +31866,10 @@ |
452 |
# A CSW package seems to be installed! |
437 |
# A CSW package seems to be installed! |
453 |
CUPS_FOUND=yes |
438 |
CUPS_FOUND=yes |
454 |
CUPS_CFLAGS="-I$SYSROOT/opt/csw/include" |
439 |
CUPS_CFLAGS="-I/opt/csw/include" |
455 |
+ elif test -s ${PACKAGE_PATH}/include/cups/cups.h; then |
440 |
+ elif test -s ${PACKAGE_PATH}/include/cups/cups.h; then |
456 |
+ # Standard package location for BSD |
441 |
+ # Standard package location for BSD |
457 |
+ CUPS_FOUND=yes |
442 |
+ CUPS_FOUND=yes |
Lines 459-465
Link Here
|
459 |
fi |
444 |
fi |
460 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5 |
445 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5 |
461 |
$as_echo "$CUPS_FOUND" >&6; } |
446 |
$as_echo "$CUPS_FOUND" >&6; } |
462 |
@@ -47351,7 +47451,7 @@ |
447 |
@@ -34900,7 +35035,7 @@ |
463 |
|
448 |
|
464 |
############################################################################### |
449 |
############################################################################### |
465 |
# |
450 |
# |
Lines 468-474
Link Here
|
468 |
# |
453 |
# |
469 |
|
454 |
|
470 |
# Check whether --with-alsa was given. |
455 |
# Check whether --with-alsa was given. |
471 |
@@ -47762,15 +47862,66 @@ |
456 |
@@ -35308,15 +35443,66 @@ |
472 |
|
457 |
|
473 |
if test "x${with_giflib}" = "xbundled"; then |
458 |
if test "x${with_giflib}" = "xbundled"; then |
474 |
USE_EXTERNAL_LIBGIF=false |
459 |
USE_EXTERNAL_LIBGIF=false |
Lines 540-546
Link Here
|
540 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5 |
525 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5 |
541 |
$as_echo_n "checking for DGifGetCode in -lgif... " >&6; } |
526 |
$as_echo_n "checking for DGifGetCode in -lgif... " >&6; } |
542 |
if ${ac_cv_lib_gif_DGifGetCode+:} false; then : |
527 |
if ${ac_cv_lib_gif_DGifGetCode+:} false; then : |
543 |
@@ -47808,16 +47959,96 @@ |
528 |
@@ -35354,16 +35540,96 @@ |
544 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5 |
529 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5 |
545 |
$as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; } |
530 |
$as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; } |
546 |
if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then : |
531 |
if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then : |
Lines 647-653
Link Here
|
647 |
|
632 |
|
648 |
USE_EXTERNAL_LIBGIF=true |
633 |
USE_EXTERNAL_LIBGIF=true |
649 |
else |
634 |
else |
650 |
@@ -47825,6 +48056,8 @@ |
635 |
@@ -35371,6 +35637,8 @@ |
651 |
fi |
636 |
fi |
652 |
|
637 |
|
653 |
|
638 |
|
Lines 656-662
Link Here
|
656 |
############################################################################### |
641 |
############################################################################### |
657 |
# |
642 |
# |
658 |
# Check for the zlib library |
643 |
# Check for the zlib library |
659 |
@@ -48392,6 +48625,11 @@ |
644 |
@@ -35938,6 +36206,11 @@ |
660 |
LIBCXX="-lstdc++" |
645 |
LIBCXX="-lstdc++" |
661 |
fi |
646 |
fi |
662 |
|
647 |
|
Lines 668-674
Link Here
|
668 |
|
653 |
|
669 |
|
654 |
|
670 |
|
655 |
|
671 |
@@ -51078,6 +51316,10 @@ |
656 |
@@ -36011,6 +36284,10 @@ |
672 |
# Looks like a MacOSX system |
657 |
# Looks like a MacOSX system |
673 |
NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'` |
658 |
NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'` |
674 |
FOUND_CORES=yes |
659 |
FOUND_CORES=yes |
Lines 679-685
Link Here
|
679 |
elif test "x$OPENJDK_BUILD_OS" = xaix ; then |
664 |
elif test "x$OPENJDK_BUILD_OS" = xaix ; then |
680 |
NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'` |
665 |
NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'` |
681 |
FOUND_CORES=yes |
666 |
FOUND_CORES=yes |
682 |
@@ -51133,6 +51375,15 @@ |
667 |
@@ -36066,6 +36343,15 @@ |
683 |
MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print $2}'` |
668 |
MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print $2}'` |
684 |
MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` |
669 |
MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` |
685 |
FOUND_MEM=yes |
670 |
FOUND_MEM=yes |
Lines 695-701
Link Here
|
695 |
elif test "x$OPENJDK_BUILD_OS" = xwindows; then |
680 |
elif test "x$OPENJDK_BUILD_OS" = xwindows; then |
696 |
# Windows, but without cygwin |
681 |
# Windows, but without cygwin |
697 |
MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` |
682 |
MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` |
698 |
@@ -51706,8 +51957,8 @@ |
683 |
@@ -36473,8 +36759,8 @@ |
699 |
# precompiled headers. |
684 |
# precompiled headers. |
700 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5 |
685 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5 |
701 |
$as_echo_n "checking if ccache supports precompiled headers... " >&6; } |
686 |
$as_echo_n "checking if ccache supports precompiled headers... " >&6; } |
Lines 706-713
Link Here
|
706 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5 |
691 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5 |
707 |
$as_echo "no, disabling ccache" >&6; } |
692 |
$as_echo "no, disabling ccache" >&6; } |
708 |
CCACHE= |
693 |
CCACHE= |
709 |
--- ./common/autoconf/jdk-options.m4 Sat Oct 06 10:24:47 2018 +0100 |
694 |
--- ./common/autoconf/jdk-options.m4 Sat Jun 23 21:01:22 2018 -0700 |
710 |
+++ ./common/autoconf/jdk-options.m4 Sat Dec 01 12:25:45 2018 -0800 |
695 |
+++ ./common/autoconf/jdk-options.m4 Mon Sep 03 11:10:31 2018 -0700 |
711 |
@@ -159,7 +159,7 @@ |
696 |
@@ -159,7 +159,7 @@ |
712 |
INCLUDE_SA=false |
697 |
INCLUDE_SA=false |
713 |
fi |
698 |
fi |
Lines 738-745
Link Here
|
738 |
# Enable or disable the elliptic curve crypto implementation |
723 |
# Enable or disable the elliptic curve crypto implementation |
739 |
# |
724 |
# |
740 |
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], |
725 |
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], |
741 |
--- ./common/autoconf/libraries.m4 Sat Oct 06 10:24:47 2018 +0100 |
726 |
--- ./common/autoconf/libraries.m4 Sat Jun 23 21:01:22 2018 -0700 |
742 |
+++ ./common/autoconf/libraries.m4 Sat Dec 01 12:25:45 2018 -0800 |
727 |
+++ ./common/autoconf/libraries.m4 Mon Sep 03 11:10:31 2018 -0700 |
743 |
@@ -69,9 +69,15 @@ |
728 |
@@ -69,9 +69,15 @@ |
744 |
fi |
729 |
fi |
745 |
|
730 |
|
Lines 759-805
Link Here
|
759 |
fi |
744 |
fi |
760 |
|
745 |
|
761 |
if test "x$OPENJDK" = "xfalse"; then |
746 |
if test "x$OPENJDK" = "xfalse"; then |
762 |
@@ -98,21 +104,25 @@ |
747 |
@@ -99,14 +105,18 @@ |
763 |
# Make a simple check for the libraries at the sysroot, and setup --x-includes and |
|
|
764 |
# --x-libraries for the sysroot, if that seems to be correct. |
748 |
# --x-libraries for the sysroot, if that seems to be correct. |
765 |
if test "x$OPENJDK_TARGET_OS" = "xlinux"; then |
749 |
if test "x$SYS_ROOT" != "x/"; then |
766 |
- if test "x$SYSROOT" != "x"; then |
750 |
if test "x$x_includes" = xNONE; then |
767 |
+ if test "x$SYS_ROOT" != "x/"; then |
751 |
- if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then |
768 |
if test "x$x_includes" = xNONE; then |
752 |
+ if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then |
769 |
- if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then |
753 |
+ x_includes="$SYS_ROOT/usr/X11R7/include" |
770 |
- x_includes="$SYSROOT/usr/X11R6/include" |
754 |
+ elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then |
771 |
- elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then |
755 |
x_includes="$SYS_ROOT/usr/X11R6/include" |
772 |
- x_includes="$SYSROOT/usr/include" |
756 |
elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then |
773 |
+ if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then |
757 |
x_includes="$SYS_ROOT/usr/include" |
774 |
+ x_includes="$SYS_ROOT/usr/X11R7/include" |
|
|
775 |
+ elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then |
776 |
+ x_includes="$SYS_ROOT/usr/X11R6/include" |
777 |
+ elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then |
778 |
+ x_includes="$SYS_ROOT/usr/include" |
779 |
fi |
780 |
fi |
781 |
if test "x$x_libraries" = xNONE; then |
782 |
- if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then |
783 |
- x_libraries="$SYSROOT/usr/X11R6/lib" |
784 |
- elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
785 |
- x_libraries="$SYSROOT/usr/lib64" |
786 |
- elif test -f "$SYSROOT/usr/lib/libX11.so"; then |
787 |
- x_libraries="$SYSROOT/usr/lib" |
788 |
+ if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then |
789 |
+ x_libraries="$SYS_ROOT/usr/X11R7/lib" |
790 |
+ elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then |
791 |
+ x_libraries="$SYS_ROOT/usr/X11R6/lib" |
792 |
+ elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
793 |
+ x_libraries="$SYS_ROOT/usr/lib64" |
794 |
+ elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then |
795 |
+ x_libraries="$SYS_ROOT/usr/lib" |
796 |
fi |
797 |
fi |
758 |
fi |
798 |
fi |
759 |
fi |
799 |
@@ -238,6 +248,10 @@ |
760 |
if test "x$x_libraries" = xNONE; then |
|
|
761 |
- if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then |
762 |
+ if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then |
763 |
+ x_libraries="$SYS_ROOT/usr/X11R7/lib" |
764 |
+ elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then |
765 |
x_libraries="$SYS_ROOT/usr/X11R6/lib" |
766 |
elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
767 |
x_libraries="$SYS_ROOT/usr/lib64" |
768 |
@@ -232,6 +242,10 @@ |
800 |
# A CSW package seems to be installed! |
769 |
# A CSW package seems to be installed! |
801 |
CUPS_FOUND=yes |
770 |
CUPS_FOUND=yes |
802 |
CUPS_CFLAGS="-I$SYSROOT/opt/csw/include" |
771 |
CUPS_CFLAGS="-I/opt/csw/include" |
803 |
+ elif test -s ${PACKAGE_PATH}/include/cups/cups.h; then |
772 |
+ elif test -s ${PACKAGE_PATH}/include/cups/cups.h; then |
804 |
+ # Standard package location for BSD |
773 |
+ # Standard package location for BSD |
805 |
+ CUPS_FOUND=yes |
774 |
+ CUPS_FOUND=yes |
Lines 807-813
Link Here
|
807 |
fi |
776 |
fi |
808 |
AC_MSG_RESULT([$CUPS_FOUND]) |
777 |
AC_MSG_RESULT([$CUPS_FOUND]) |
809 |
fi |
778 |
fi |
810 |
@@ -638,7 +652,7 @@ |
779 |
@@ -525,7 +539,7 @@ |
811 |
|
780 |
|
812 |
############################################################################### |
781 |
############################################################################### |
813 |
# |
782 |
# |
Lines 816-822
Link Here
|
816 |
# |
785 |
# |
817 |
AC_ARG_WITH(alsa, [AS_HELP_STRING([--with-alsa], |
786 |
AC_ARG_WITH(alsa, [AS_HELP_STRING([--with-alsa], |
818 |
[specify prefix directory for the alsa package |
787 |
[specify prefix directory for the alsa package |
819 |
@@ -743,17 +757,61 @@ |
788 |
@@ -627,17 +641,61 @@ |
820 |
|
789 |
|
821 |
if test "x${with_giflib}" = "xbundled"; then |
790 |
if test "x${with_giflib}" = "xbundled"; then |
822 |
USE_EXTERNAL_LIBGIF=false |
791 |
USE_EXTERNAL_LIBGIF=false |
Lines 882-888
Link Here
|
882 |
|
851 |
|
883 |
############################################################################### |
852 |
############################################################################### |
884 |
# |
853 |
# |
885 |
@@ -988,6 +1046,11 @@ |
854 |
@@ -872,5 +930,10 @@ |
886 |
LIBCXX="-lstdc++" |
855 |
LIBCXX="-lstdc++" |
887 |
fi |
856 |
fi |
888 |
|
857 |
|
Lines 893-901
Link Here
|
893 |
+ |
862 |
+ |
894 |
AC_SUBST(LIBCXX) |
863 |
AC_SUBST(LIBCXX) |
895 |
]) |
864 |
]) |
896 |
|
865 |
--- ./common/autoconf/platform.m4 Sat Jun 23 21:01:22 2018 -0700 |
897 |
--- ./common/autoconf/platform.m4 Sat Oct 06 10:24:47 2018 +0100 |
866 |
+++ ./common/autoconf/platform.m4 Mon Sep 03 11:10:31 2018 -0700 |
898 |
+++ ./common/autoconf/platform.m4 Sat Dec 01 12:25:45 2018 -0800 |
|
|
899 |
@@ -30,7 +30,7 @@ |
867 |
@@ -30,7 +30,7 @@ |
900 |
[ |
868 |
[ |
901 |
# First argument is the cpu name from the trip/quad |
869 |
# First argument is the cpu name from the trip/quad |
Lines 928-934
Link Here
|
928 |
]) |
896 |
]) |
929 |
|
897 |
|
930 |
# Expects $host_os $host_cpu $build_os and $build_cpu |
898 |
# Expects $host_os $host_cpu $build_os and $build_cpu |
931 |
@@ -193,6 +209,7 @@ |
899 |
@@ -192,6 +208,7 @@ |
932 |
PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu) |
900 |
PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu) |
933 |
# ... and setup our own variables. (Do this explicitely to facilitate searching) |
901 |
# ... and setup our own variables. (Do this explicitely to facilitate searching) |
934 |
OPENJDK_TARGET_OS="$VAR_OS" |
902 |
OPENJDK_TARGET_OS="$VAR_OS" |
Lines 936-950
Link Here
|
936 |
OPENJDK_TARGET_OS_API="$VAR_OS_API" |
904 |
OPENJDK_TARGET_OS_API="$VAR_OS_API" |
937 |
OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV" |
905 |
OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV" |
938 |
OPENJDK_TARGET_CPU="$VAR_CPU" |
906 |
OPENJDK_TARGET_CPU="$VAR_CPU" |
939 |
@@ -200,6 +217,7 @@ |
907 |
@@ -199,6 +216,7 @@ |
940 |
OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS" |
908 |
OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS" |
941 |
OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN" |
909 |
OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN" |
942 |
AC_SUBST(OPENJDK_TARGET_OS) |
910 |
AC_SUBST(OPENJDK_TARGET_OS) |
943 |
+ AC_SUBST(OPENJDK_TARGET_OS_VENDOR) |
911 |
+ AC_SUBST(OPENJDK_TARGET_OS_VENDOR) |
944 |
AC_SUBST(OPENJDK_TARGET_OS_API) |
912 |
AC_SUBST(OPENJDK_TARGET_OS_API) |
945 |
AC_SUBST(OPENJDK_TARGET_OS_ENV) |
|
|
946 |
AC_SUBST(OPENJDK_TARGET_CPU) |
913 |
AC_SUBST(OPENJDK_TARGET_CPU) |
947 |
@@ -310,8 +328,8 @@ |
914 |
AC_SUBST(OPENJDK_TARGET_CPU_ARCH) |
|
|
915 |
@@ -308,8 +326,8 @@ |
948 |
|
916 |
|
949 |
# Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property |
917 |
# Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property |
950 |
OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU" |
918 |
OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU" |
Lines 955-963
Link Here
|
955 |
OPENJDK_TARGET_CPU_OSARCH="i386" |
923 |
OPENJDK_TARGET_CPU_OSARCH="i386" |
956 |
elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then |
924 |
elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then |
957 |
# On all platforms except macosx, we replace x86_64 with amd64. |
925 |
# On all platforms except macosx, we replace x86_64 with amd64. |
958 |
--- ./common/autoconf/spec.gmk.in Sat Oct 06 10:24:47 2018 +0100 |
926 |
--- ./common/autoconf/spec.gmk.in Sat Jun 23 21:01:22 2018 -0700 |
959 |
+++ ./common/autoconf/spec.gmk.in Sat Dec 01 12:25:45 2018 -0800 |
927 |
+++ ./common/autoconf/spec.gmk.in Mon Sep 03 11:10:31 2018 -0700 |
960 |
@@ -79,6 +79,7 @@ |
928 |
@@ -76,6 +76,7 @@ |
961 |
OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@ |
929 |
OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@ |
962 |
OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@ |
930 |
OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@ |
963 |
OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@ |
931 |
OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@ |
Lines 965-971
Link Here
|
965 |
|
933 |
|
966 |
OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@ |
934 |
OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@ |
967 |
OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@ |
935 |
OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@ |
968 |
@@ -281,7 +282,7 @@ |
936 |
@@ -276,7 +277,7 @@ |
969 |
ALSA_LIBS:=@ALSA_LIBS@ |
937 |
ALSA_LIBS:=@ALSA_LIBS@ |
970 |
ALSA_CFLAGS:=@ALSA_CFLAGS@ |
938 |
ALSA_CFLAGS:=@ALSA_CFLAGS@ |
971 |
|
939 |
|
Lines 974-980
Link Here
|
974 |
|
942 |
|
975 |
# Source file for cacerts |
943 |
# Source file for cacerts |
976 |
CACERTS_FILE=@CACERTS_FILE@ |
944 |
CACERTS_FILE=@CACERTS_FILE@ |
977 |
@@ -289,6 +290,9 @@ |
945 |
@@ -284,6 +285,9 @@ |
978 |
# Enable unlimited crypto policy |
946 |
# Enable unlimited crypto policy |
979 |
UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@ |
947 |
UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@ |
980 |
|
948 |
|
Lines 984-990
Link Here
|
984 |
# Necessary additional compiler flags to compile X11 |
952 |
# Necessary additional compiler flags to compile X11 |
985 |
X_CFLAGS:=@X_CFLAGS@ |
953 |
X_CFLAGS:=@X_CFLAGS@ |
986 |
X_LIBS:=@X_LIBS@ |
954 |
X_LIBS:=@X_LIBS@ |
987 |
@@ -571,6 +575,8 @@ |
955 |
@@ -568,6 +572,8 @@ |
988 |
ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ |
956 |
ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ |
989 |
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ |
957 |
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ |
990 |
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ |
958 |
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ |
Lines 993-1022
Link Here
|
993 |
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ |
961 |
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ |
994 |
LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ |
962 |
LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ |
995 |
MSVCR_DLL:=@MSVCR_DLL@ |
963 |
MSVCR_DLL:=@MSVCR_DLL@ |
996 |
--- ./common/autoconf/toolchain.m4 Sat Oct 06 10:24:47 2018 +0100 |
964 |
--- ./common/autoconf/toolchain.m4 Sat Jun 23 21:01:22 2018 -0700 |
997 |
+++ ./common/autoconf/toolchain.m4 Sat Dec 01 12:25:45 2018 -0800 |
965 |
+++ ./common/autoconf/toolchain.m4 Mon Sep 03 11:10:31 2018 -0700 |
998 |
@@ -37,6 +37,7 @@ |
966 |
@@ -122,7 +122,7 @@ |
999 |
VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft" |
967 |
else |
1000 |
|
968 |
COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` |
1001 |
# These toolchains are valid on different platforms |
969 |
# Check that this is likely to be GCC. |
1002 |
+VALID_TOOLCHAINS_bsd="clang gcc" |
970 |
- $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null |
1003 |
VALID_TOOLCHAINS_linux="gcc clang" |
971 |
+ $COMPILER --version 2>&1 | $GREP -E "(Free Software Foundation|clang)" > /dev/null |
1004 |
VALID_TOOLCHAINS_solaris="solstudio" |
972 |
if test $? -ne 0; then |
1005 |
VALID_TOOLCHAINS_macosx="gcc clang" |
973 |
AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler.]) |
1006 |
@@ -713,7 +714,7 @@ |
974 |
AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_TEST"]) |
|
|
975 |
@@ -401,6 +401,8 @@ |
976 |
elif test "x$OPENJDK_TARGET_OS" = "xaix"; then |
977 |
# Do not probe for cc on AIX. |
978 |
COMPILER_CHECK_LIST="xlc_r" |
979 |
+ elif test "`uname -s`" = "FreeBSD"; then |
980 |
+ COMPILER_CHECK_LIST="cc gcc" |
981 |
else |
982 |
COMPILER_CHECK_LIST="gcc cc" |
983 |
fi |
984 |
@@ -629,7 +631,7 @@ |
1007 |
|
985 |
|
1008 |
# objcopy is used for moving debug symbols to separate files when |
986 |
# objcopy is used for moving debug symbols to separate files when |
1009 |
# full debug symbols are enabled. |
987 |
# full debug symbols are enabled. |
1010 |
- if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then |
988 |
- if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then |
1011 |
+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xbsd ; then |
989 |
+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xbsd ; then |
1012 |
BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy]) |
990 |
AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy]) |
1013 |
# Only call fixup if objcopy was found. |
991 |
# Only call fixup if objcopy was found. |
1014 |
if test -n "$OBJCOPY"; then |
992 |
if test -n "$OBJCOPY"; then |
1015 |
@@ -801,8 +802,27 @@ |
993 |
@@ -692,8 +694,10 @@ |
1016 |
AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS], |
994 |
SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1' |
1017 |
[ |
995 |
SET_SHARED_LIBRARY_MAPFILE='' |
|
|
996 |
SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.' |
997 |
+ POST_STRIP_CMD="$STRIP -S" |
998 |
+ fi |
999 |
+ if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then |
1000 |
SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN" |
1001 |
- POST_STRIP_CMD="$STRIP -S" |
1002 |
fi |
1003 |
else |
1004 |
if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
1005 |
@@ -1018,7 +1022,7 @@ |
1006 |
# |
1007 |
case $COMPILER_NAME in |
1008 |
gcc ) |
1009 |
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ |
1010 |
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \ |
1011 |
-pipe \ |
1012 |
-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" |
1013 |
CXXSTD_CXXFLAG="-std=gnu++98" |
1014 |
@@ -1106,22 +1110,33 @@ |
1015 |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64" |
1016 |
|
1018 |
# The package path is used only on macosx? |
1017 |
# The package path is used only on macosx? |
1019 |
- # FIXME: clean this up, and/or move it elsewhere. |
|
|
1020 |
- PACKAGE_PATH=/opt/local |
1018 |
- PACKAGE_PATH=/opt/local |
1021 |
+ AC_ARG_WITH(package-path, [AS_HELP_STRING([--with-package-path], |
1019 |
+ AC_ARG_WITH(package-path, [AS_HELP_STRING([--with-package-path], |
1022 |
+ [package path to be used for location of third party packages])]) |
1020 |
+ [package path to be used for location of third party packages])]) |
Lines 1041-1057
Link Here
|
1041 |
+ |
1039 |
+ |
1042 |
AC_SUBST(PACKAGE_PATH) |
1040 |
AC_SUBST(PACKAGE_PATH) |
1043 |
|
1041 |
|
1044 |
# Check for extra potential brokenness. |
1042 |
if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then |
1045 |
--- ./configure Sat Oct 06 10:24:47 2018 +0100 |
1043 |
- # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the |
1046 |
+++ ./configure Sat Dec 01 12:25:45 2018 -0800 |
1044 |
- # Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN |
|
|
1045 |
- # (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h). |
1046 |
- # Note: -Dmacro is the same as #define macro 1 |
1047 |
- # -Dmacro= is the same as #define macro |
1048 |
- if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
1049 |
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN=" |
1050 |
- else |
1051 |
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN" |
1052 |
- fi |
1053 |
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN" |
1054 |
else |
1055 |
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN" |
1056 |
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_BIG_ENDIAN" |
1057 |
fi |
1058 |
if test "x$OPENJDK_TARGET_OS" = xlinux; then |
1059 |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX" |
1060 |
@@ -1151,6 +1166,22 @@ |
1061 |
fi |
1062 |
if test "x$OPENJDK_TARGET_OS" = xbsd; then |
1063 |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" |
1064 |
+ if test "`uname -s`" = "OpenBSD"; then |
1065 |
+ AC_MSG_CHECKING([if ld requires -z wxneeded]) |
1066 |
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/mman.h> |
1067 |
+int main() { return mmap(0, 4096, PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0) != MAP_FAILED; }]])], |
1068 |
+ [ |
1069 |
+ AC_MSG_RESULT([yes]) |
1070 |
+ LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,wxneeded" |
1071 |
+ ], |
1072 |
+ [ |
1073 |
+ AC_MSG_RESULT([no]) |
1074 |
+ ], |
1075 |
+ [ |
1076 |
+ AC_MSG_RESULT([no]) |
1077 |
+ ] |
1078 |
+ ) |
1079 |
+ fi |
1080 |
fi |
1081 |
if test "x$DEBUG_LEVEL" = xrelease; then |
1082 |
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG" |
1083 |
@@ -1220,6 +1251,15 @@ |
1084 |
# Should this be supplied to the OSS linker as well? |
1085 |
LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1" |
1086 |
fi |
1087 |
+ elif test "x$OPENJDK_TARGET_OS" = xbsd; then |
1088 |
+ # And since we now know that the linker is gnu, then add: |
1089 |
+ # -z noexecstack, to mark stack regions as non-executable |
1090 |
+ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker noexecstack" |
1091 |
+ if test "x$DEBUG_LEVEL" = "xrelease"; then |
1092 |
+ # When building release libraries, tell the linker optimize them. |
1093 |
+ # Should this be supplied to the OSS linker as well? |
1094 |
+ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1" |
1095 |
+ fi |
1096 |
fi |
1097 |
fi |
1098 |
LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \ |
1099 |
--- ./configure Sat Jun 23 21:01:22 2018 -0700 |
1100 |
+++ ./configure Mon Sep 03 11:10:31 2018 -0700 |
1047 |
@@ -1,4 +1,4 @@ |
1101 |
@@ -1,4 +1,4 @@ |
1048 |
-#!/bin/bash |
1102 |
-#!/bin/bash |
1049 |
+#!/bin/sh |
1103 |
+#!/bin/sh |
1050 |
# |
1104 |
# |
1051 |
# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. |
1105 |
# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. |
1052 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
1106 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
1053 |
--- ./make/Javadoc.gmk Sat Oct 06 10:24:47 2018 +0100 |
1107 |
--- ./make/Javadoc.gmk Sat Jun 23 21:01:22 2018 -0700 |
1054 |
+++ ./make/Javadoc.gmk Sat Dec 01 12:25:45 2018 -0800 |
1108 |
+++ ./make/Javadoc.gmk Mon Sep 03 11:10:31 2018 -0700 |
1055 |
@@ -46,8 +46,18 @@ |
1109 |
@@ -46,8 +46,18 @@ |
1056 |
|
1110 |
|
1057 |
BUILD_NUMBER=$(JDK_BUILD_NUMBER) |
1111 |
BUILD_NUMBER=$(JDK_BUILD_NUMBER) |
Lines 1072-1079
Link Here
|
1072 |
-Djava.awt.headless=true \ |
1126 |
-Djava.awt.headless=true \ |
1073 |
$(NEW_JAVADOC) \ |
1127 |
$(NEW_JAVADOC) \ |
1074 |
-bootclasspath $(JDK_OUTPUTDIR)/classes |
1128 |
-bootclasspath $(JDK_OUTPUTDIR)/classes |
1075 |
--- ./make/Main.gmk Sat Oct 06 10:24:47 2018 +0100 |
1129 |
--- ./make/Main.gmk Sat Jun 23 21:01:22 2018 -0700 |
1076 |
+++ ./make/Main.gmk Sat Dec 01 12:25:45 2018 -0800 |
1130 |
+++ ./make/Main.gmk Mon Sep 03 11:10:31 2018 -0700 |
1077 |
@@ -58,7 +58,11 @@ |
1131 |
@@ -58,7 +58,11 @@ |
1078 |
|
1132 |
|
1079 |
# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line, |
1133 |
# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line, |
Lines 1086-1093
Link Here
|
1086 |
|
1140 |
|
1087 |
### Main targets |
1141 |
### Main targets |
1088 |
|
1142 |
|
1089 |
--- ./make/common/MakeBase.gmk Sat Oct 06 10:24:47 2018 +0100 |
1143 |
--- ./make/common/MakeBase.gmk Sat Jun 23 21:01:22 2018 -0700 |
1090 |
+++ ./make/common/MakeBase.gmk Sat Dec 01 12:25:45 2018 -0800 |
1144 |
+++ ./make/common/MakeBase.gmk Mon Sep 03 11:10:31 2018 -0700 |
1091 |
@@ -338,7 +338,7 @@ |
1145 |
@@ -338,7 +338,7 @@ |
1092 |
# (and causing a crash on Cygwin). |
1146 |
# (and causing a crash on Cygwin). |
1093 |
# Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris. |
1147 |
# Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris. |
Lines 1108-1116
Link Here
|
1108 |
endef |
1162 |
endef |
1109 |
|
1163 |
|
1110 |
# Make directory without forking mkdir if not needed |
1164 |
# Make directory without forking mkdir if not needed |
1111 |
--- ./make/common/NativeCompilation.gmk Sat Oct 06 10:24:47 2018 +0100 |
1165 |
--- ./make/common/NativeCompilation.gmk Sat Jun 23 21:01:22 2018 -0700 |
1112 |
+++ ./make/common/NativeCompilation.gmk Sat Dec 01 12:25:45 2018 -0800 |
1166 |
+++ ./make/common/NativeCompilation.gmk Mon Sep 03 11:10:31 2018 -0700 |
1113 |
@@ -158,9 +158,9 @@ |
1167 |
@@ -151,9 +151,9 @@ |
1114 |
# CC the compiler to use, default is $(CC) |
1168 |
# CC the compiler to use, default is $(CC) |
1115 |
# LDEXE the linker to use for linking executables, default is $(LDEXE) |
1169 |
# LDEXE the linker to use for linking executables, default is $(LDEXE) |
1116 |
# OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST |
1170 |
# OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST |
Lines 1123-1130
Link Here
|
1123 |
|
1177 |
|
1124 |
ifneq (,$$($1_BIN)) |
1178 |
ifneq (,$$($1_BIN)) |
1125 |
$$(error BIN has been replaced with OBJECT_DIR) |
1179 |
$$(error BIN has been replaced with OBJECT_DIR) |
1126 |
--- ./hotspot/agent/make/Makefile Sat Oct 06 10:25:04 2018 +0100 |
1180 |
--- ./hotspot/agent/make/Makefile Sat Jun 23 21:01:40 2018 -0700 |
1127 |
+++ ./hotspot/agent/make/Makefile Sat Dec 01 12:42:05 2018 -0800 |
1181 |
+++ ./hotspot/agent/make/Makefile Mon Sep 03 11:13:04 2018 -0700 |
1128 |
@@ -50,6 +50,7 @@ |
1182 |
@@ -50,6 +50,7 @@ |
1129 |
sun.jvm.hotspot.debugger.amd64 \ |
1183 |
sun.jvm.hotspot.debugger.amd64 \ |
1130 |
sun.jvm.hotspot.debugger.bsd \ |
1184 |
sun.jvm.hotspot.debugger.bsd \ |
Lines 1203-1210
Link Here
|
1203 |
sun/jvm/hotspot/runtime/solaris_amd64/*.java \ |
1257 |
sun/jvm/hotspot/runtime/solaris_amd64/*.java \ |
1204 |
sun/jvm/hotspot/runtime/solaris_sparc/*.java \ |
1258 |
sun/jvm/hotspot/runtime/solaris_sparc/*.java \ |
1205 |
sun/jvm/hotspot/runtime/solaris_x86/*.java \ |
1259 |
sun/jvm/hotspot/runtime/solaris_x86/*.java \ |
1206 |
--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat Oct 06 10:25:04 2018 +0100 |
1260 |
--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat Jun 23 21:01:40 2018 -0700 |
1207 |
+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat Dec 01 12:42:05 2018 -0800 |
1261 |
+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Mon Sep 03 11:13:04 2018 -0700 |
1208 |
@@ -42,6 +42,10 @@ |
1262 |
@@ -42,6 +42,10 @@ |
1209 |
#include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h" |
1263 |
#include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h" |
1210 |
#endif |
1264 |
#endif |
Lines 1273-1280
Link Here
|
1273 |
|
1327 |
|
1274 |
(*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT); |
1328 |
(*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT); |
1275 |
return array; |
1329 |
return array; |
1276 |
--- ./hotspot/agent/src/os/bsd/Makefile Sat Oct 06 10:25:04 2018 +0100 |
1330 |
--- ./hotspot/agent/src/os/bsd/Makefile Sat Jun 23 21:01:40 2018 -0700 |
1277 |
+++ ./hotspot/agent/src/os/bsd/Makefile Sat Dec 01 12:42:05 2018 -0800 |
1331 |
+++ ./hotspot/agent/src/os/bsd/Makefile Mon Sep 03 11:13:04 2018 -0700 |
1278 |
@@ -85,6 +85,9 @@ |
1332 |
@@ -85,6 +85,9 @@ |
1279 |
LFLAGS_LIBSA = -Xlinker --version-script=mapfile |
1333 |
LFLAGS_LIBSA = -Xlinker --version-script=mapfile |
1280 |
endif |
1334 |
endif |
Lines 1285-1292
Link Here
|
1285 |
$(LIBSA): $(OBJSPLUS) mapfile |
1339 |
$(LIBSA): $(OBJSPLUS) mapfile |
1286 |
if [ ! -d $(ARCH) ] ; then mkdir $(ARCH) ; fi |
1340 |
if [ ! -d $(ARCH) ] ; then mkdir $(ARCH) ; fi |
1287 |
$(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(FOUNDATIONFLAGS) $(OBJSPLUS) $(LIBS) $(SALIBS) |
1341 |
$(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(FOUNDATIONFLAGS) $(OBJSPLUS) $(LIBS) $(SALIBS) |
1288 |
--- ./hotspot/agent/src/os/bsd/elfmacros.h Sat Oct 06 10:25:04 2018 +0100 |
1342 |
--- ./hotspot/agent/src/os/bsd/elfmacros.h Sat Jun 23 21:01:40 2018 -0700 |
1289 |
+++ ./hotspot/agent/src/os/bsd/elfmacros.h Sat Dec 01 12:42:05 2018 -0800 |
1343 |
+++ ./hotspot/agent/src/os/bsd/elfmacros.h Mon Sep 03 11:13:04 2018 -0700 |
1290 |
@@ -34,6 +34,7 @@ |
1344 |
@@ -34,6 +34,7 @@ |
1291 |
#define ELF_SYM Elf64_Sym |
1345 |
#define ELF_SYM Elf64_Sym |
1292 |
#define ELF_DYN Elf64_Dyn |
1346 |
#define ELF_DYN Elf64_Dyn |
Lines 1303-1310
Link Here
|
1303 |
|
1357 |
|
1304 |
#ifndef ELF_ST_TYPE |
1358 |
#ifndef ELF_ST_TYPE |
1305 |
#define ELF_ST_TYPE ELF32_ST_TYPE |
1359 |
#define ELF_ST_TYPE ELF32_ST_TYPE |
1306 |
--- ./hotspot/agent/src/os/bsd/ps_core.c Sat Oct 06 10:25:04 2018 +0100 |
1360 |
--- ./hotspot/agent/src/os/bsd/ps_core.c Sat Jun 23 21:01:40 2018 -0700 |
1307 |
+++ ./hotspot/agent/src/os/bsd/ps_core.c Sat Dec 01 12:42:05 2018 -0800 |
1361 |
+++ ./hotspot/agent/src/os/bsd/ps_core.c Mon Sep 03 11:13:04 2018 -0700 |
1308 |
@@ -1091,6 +1091,18 @@ |
1362 |
@@ -1091,6 +1091,18 @@ |
1309 |
if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true) { |
1363 |
if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true) { |
1310 |
return false; |
1364 |
return false; |
Lines 1351-1358
Link Here
|
1351 |
goto err; |
1405 |
goto err; |
1352 |
} |
1406 |
} |
1353 |
|
1407 |
|
1354 |
--- ./hotspot/agent/src/os/bsd/symtab.c Sat Oct 06 10:25:04 2018 +0100 |
1408 |
--- ./hotspot/agent/src/os/bsd/symtab.c Sat Jun 23 21:01:40 2018 -0700 |
1355 |
+++ ./hotspot/agent/src/os/bsd/symtab.c Sat Dec 01 12:42:05 2018 -0800 |
1409 |
+++ ./hotspot/agent/src/os/bsd/symtab.c Mon Sep 03 11:13:04 2018 -0700 |
1356 |
@@ -211,6 +211,10 @@ |
1410 |
@@ -211,6 +211,10 @@ |
1357 |
|
1411 |
|
1358 |
// Reading of elf header |
1412 |
// Reading of elf header |
Lines 1393-1400
Link Here
|
1393 |
|
1447 |
|
1394 |
key.data = sym_name; |
1448 |
key.data = sym_name; |
1395 |
key.size = strlen(sym_name) + 1; |
1449 |
key.size = strlen(sym_name) + 1; |
1396 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Oct 06 10:25:04 2018 +0100 |
1450 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Jun 23 21:01:40 2018 -0700 |
1397 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Dec 01 12:42:05 2018 -0800 |
1451 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Mon Sep 03 11:13:04 2018 -0700 |
1398 |
@@ -33,6 +33,7 @@ |
1452 |
@@ -33,6 +33,7 @@ |
1399 |
import sun.jvm.hotspot.debugger.JVMDebugger; |
1453 |
import sun.jvm.hotspot.debugger.JVMDebugger; |
1400 |
import sun.jvm.hotspot.debugger.MachineDescription; |
1454 |
import sun.jvm.hotspot.debugger.MachineDescription; |
Lines 1413-1419
Link Here
|
1413 |
if (LinuxDebuggerLocal.getAddressSize()==8) { |
1467 |
if (LinuxDebuggerLocal.getAddressSize()==8) { |
1414 |
machDesc = new MachineDescriptionSPARC64Bit(); |
1468 |
machDesc = new MachineDescriptionSPARC64Bit(); |
1415 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1469 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1416 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Sat Dec 01 12:42:05 2018 -0800 |
1470 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Mon Sep 03 11:13:04 2018 -0700 |
1417 |
@@ -0,0 +1,43 @@ |
1471 |
@@ -0,0 +1,43 @@ |
1418 |
+/* |
1472 |
+/* |
1419 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
1473 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 1458-1465
Link Here
|
1458 |
+ return false; |
1512 |
+ return false; |
1459 |
+ } |
1513 |
+ } |
1460 |
+} |
1514 |
+} |
1461 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat Oct 06 10:25:04 2018 +0100 |
1515 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat Jun 23 21:01:40 2018 -0700 |
1462 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat Dec 01 12:42:05 2018 -0800 |
1516 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Mon Sep 03 11:13:04 2018 -0700 |
1463 |
@@ -30,8 +30,10 @@ |
1517 |
@@ -30,8 +30,10 @@ |
1464 |
import sun.jvm.hotspot.debugger.cdbg.*; |
1518 |
import sun.jvm.hotspot.debugger.cdbg.*; |
1465 |
import sun.jvm.hotspot.debugger.x86.*; |
1519 |
import sun.jvm.hotspot.debugger.x86.*; |
Lines 1485-1492
Link Here
|
1485 |
} else { |
1539 |
} else { |
1486 |
throw new DebuggerException(cpu + " is not yet supported"); |
1540 |
throw new DebuggerException(cpu + " is not yet supported"); |
1487 |
} |
1541 |
} |
1488 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat Oct 06 10:25:04 2018 +0100 |
1542 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat Jun 23 21:01:40 2018 -0700 |
1489 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat Dec 01 12:42:05 2018 -0800 |
1543 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Mon Sep 03 11:13:04 2018 -0700 |
1490 |
@@ -27,6 +27,7 @@ |
1544 |
@@ -27,6 +27,7 @@ |
1491 |
import sun.jvm.hotspot.debugger.*; |
1545 |
import sun.jvm.hotspot.debugger.*; |
1492 |
import sun.jvm.hotspot.debugger.bsd.amd64.*; |
1546 |
import sun.jvm.hotspot.debugger.bsd.amd64.*; |
Lines 1505-1511
Link Here
|
1505 |
throw new RuntimeException("cpu " + cpu + " is not yet supported"); |
1559 |
throw new RuntimeException("cpu " + cpu + " is not yet supported"); |
1506 |
} |
1560 |
} |
1507 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1561 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1508 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Sat Dec 01 12:42:05 2018 -0800 |
1562 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Mon Sep 03 11:13:04 2018 -0700 |
1509 |
@@ -0,0 +1,79 @@ |
1563 |
@@ -0,0 +1,79 @@ |
1510 |
+/* |
1564 |
+/* |
1511 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
1565 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 1587-1593
Link Here
|
1587 |
+ private BsdDebugger dbg; |
1641 |
+ private BsdDebugger dbg; |
1588 |
+} |
1642 |
+} |
1589 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1643 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1590 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Sat Dec 01 12:42:05 2018 -0800 |
1644 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Mon Sep 03 11:13:04 2018 -0700 |
1591 |
@@ -0,0 +1,46 @@ |
1645 |
@@ -0,0 +1,46 @@ |
1592 |
+/* |
1646 |
+/* |
1593 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
1647 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 1636-1642
Link Here
|
1636 |
+ } |
1690 |
+ } |
1637 |
+} |
1691 |
+} |
1638 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1692 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1639 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Sat Dec 01 12:42:05 2018 -0800 |
1693 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Mon Sep 03 11:13:04 2018 -0700 |
1640 |
@@ -0,0 +1,123 @@ |
1694 |
@@ -0,0 +1,123 @@ |
1641 |
+/* |
1695 |
+/* |
1642 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
1696 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 1761-1768
Link Here
|
1761 |
+ public abstract Address getRegisterAsAddress(int index); |
1815 |
+ public abstract Address getRegisterAsAddress(int index); |
1762 |
+ |
1816 |
+ |
1763 |
+} |
1817 |
+} |
1764 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat Oct 06 10:25:04 2018 +0100 |
1818 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat Jun 23 21:01:40 2018 -0700 |
1765 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat Dec 01 12:42:05 2018 -0800 |
1819 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Mon Sep 03 11:13:04 2018 -0700 |
1766 |
@@ -32,7 +32,9 @@ |
1820 |
@@ -32,7 +32,9 @@ |
1767 |
import sun.jvm.hotspot.debugger.cdbg.*; |
1821 |
import sun.jvm.hotspot.debugger.cdbg.*; |
1768 |
import sun.jvm.hotspot.debugger.proc.amd64.*; |
1822 |
import sun.jvm.hotspot.debugger.proc.amd64.*; |
Lines 1785-1791
Link Here
|
1785 |
try { |
1839 |
try { |
1786 |
Class tfc = Class.forName("sun.jvm.hotspot.debugger.proc." + |
1840 |
Class tfc = Class.forName("sun.jvm.hotspot.debugger.proc." + |
1787 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1841 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1788 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Sat Dec 01 12:42:05 2018 -0800 |
1842 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Mon Sep 03 11:13:04 2018 -0700 |
1789 |
@@ -0,0 +1,86 @@ |
1843 |
@@ -0,0 +1,86 @@ |
1790 |
+/* |
1844 |
+/* |
1791 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
1845 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 1874-1880
Link Here
|
1874 |
+ } |
1928 |
+ } |
1875 |
+} |
1929 |
+} |
1876 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1930 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1877 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Sat Dec 01 12:42:05 2018 -0800 |
1931 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Mon Sep 03 11:13:04 2018 -0700 |
1878 |
@@ -0,0 +1,46 @@ |
1932 |
@@ -0,0 +1,46 @@ |
1879 |
+/* |
1933 |
+/* |
1880 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
1934 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 1923-1929
Link Here
|
1923 |
+ } |
1977 |
+ } |
1924 |
+} |
1978 |
+} |
1925 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1979 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1926 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Sat Dec 01 12:42:05 2018 -0800 |
1980 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Mon Sep 03 11:13:04 2018 -0700 |
1927 |
@@ -0,0 +1,44 @@ |
1981 |
@@ -0,0 +1,44 @@ |
1928 |
+/* |
1982 |
+/* |
1929 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
1983 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 1969-1976
Link Here
|
1969 |
+ return new ProcPPC64Thread(debugger, id); |
2023 |
+ return new ProcPPC64Thread(debugger, id); |
1970 |
+ } |
2024 |
+ } |
1971 |
+} |
2025 |
+} |
1972 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat Oct 06 10:25:04 2018 +0100 |
2026 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat Jun 23 21:01:40 2018 -0700 |
1973 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat Dec 01 12:42:05 2018 -0800 |
2027 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Mon Sep 03 11:13:04 2018 -0700 |
1974 |
@@ -33,6 +33,7 @@ |
2028 |
@@ -33,6 +33,7 @@ |
1975 |
import sun.jvm.hotspot.debugger.remote.sparc.*; |
2029 |
import sun.jvm.hotspot.debugger.remote.sparc.*; |
1976 |
import sun.jvm.hotspot.debugger.remote.x86.*; |
2030 |
import sun.jvm.hotspot.debugger.remote.x86.*; |
Lines 1992-1998
Link Here
|
1992 |
try { |
2046 |
try { |
1993 |
Class tf = Class.forName("sun.jvm.hotspot.debugger.remote." + |
2047 |
Class tf = Class.forName("sun.jvm.hotspot.debugger.remote." + |
1994 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2048 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1995 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java Sat Dec 01 12:42:05 2018 -0800 |
2049 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java Mon Sep 03 11:13:04 2018 -0700 |
1996 |
@@ -0,0 +1,53 @@ |
2050 |
@@ -0,0 +1,53 @@ |
1997 |
+/* |
2051 |
+/* |
1998 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
2052 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 2048-2054
Link Here
|
2048 |
+ } |
2102 |
+ } |
2049 |
+} |
2103 |
+} |
2050 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2104 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2051 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java Sat Dec 01 12:42:05 2018 -0800 |
2105 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java Mon Sep 03 11:13:04 2018 -0700 |
2052 |
@@ -0,0 +1,50 @@ |
2106 |
@@ -0,0 +1,50 @@ |
2053 |
+/* |
2107 |
+/* |
2054 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
2108 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 2101-2107
Link Here
|
2101 |
+ } |
2155 |
+ } |
2102 |
+} |
2156 |
+} |
2103 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2157 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2104 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java Sat Dec 01 12:42:05 2018 -0800 |
2158 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java Mon Sep 03 11:13:04 2018 -0700 |
2105 |
@@ -0,0 +1,44 @@ |
2159 |
@@ -0,0 +1,44 @@ |
2106 |
+/* |
2160 |
+/* |
2107 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
2161 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 2147-2154
Link Here
|
2147 |
+ return new RemotePPC64Thread(debugger, id); |
2201 |
+ return new RemotePPC64Thread(debugger, id); |
2148 |
+ } |
2202 |
+ } |
2149 |
+} |
2203 |
+} |
2150 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Sat Oct 06 10:25:04 2018 +0100 |
2204 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Sat Jun 23 21:01:40 2018 -0700 |
2151 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Sat Dec 01 12:42:05 2018 -0800 |
2205 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Mon Sep 03 11:13:04 2018 -0700 |
2152 |
@@ -37,6 +37,7 @@ |
2206 |
@@ -37,6 +37,7 @@ |
2153 |
import sun.jvm.hotspot.runtime.linux_sparc.LinuxSPARCJavaThreadPDAccess; |
2207 |
import sun.jvm.hotspot.runtime.linux_sparc.LinuxSPARCJavaThreadPDAccess; |
2154 |
import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess; |
2208 |
import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess; |
Lines 2167-2173
Link Here
|
2167 |
} else if (os.equals("darwin")) { |
2221 |
} else if (os.equals("darwin")) { |
2168 |
if (cpu.equals("amd64") || cpu.equals("x86_64")) { |
2222 |
if (cpu.equals("amd64") || cpu.equals("x86_64")) { |
2169 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2223 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2170 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java Sat Dec 01 12:42:05 2018 -0800 |
2224 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java Mon Sep 03 11:13:04 2018 -0700 |
2171 |
@@ -0,0 +1,132 @@ |
2225 |
@@ -0,0 +1,132 @@ |
2172 |
+/* |
2226 |
+/* |
2173 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
2227 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 2302-2308
Link Here
|
2302 |
+ } |
2356 |
+ } |
2303 |
+} |
2357 |
+} |
2304 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2358 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2305 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Sat Dec 01 12:42:05 2018 -0800 |
2359 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Mon Sep 03 11:13:04 2018 -0700 |
2306 |
@@ -0,0 +1,176 @@ |
2360 |
@@ -0,0 +1,176 @@ |
2307 |
+/* |
2361 |
+/* |
2308 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
2362 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 2481-2487
Link Here
|
2481 |
+ } |
2535 |
+ } |
2482 |
+} |
2536 |
+} |
2483 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2537 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2484 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Sat Dec 01 12:42:05 2018 -0800 |
2538 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Mon Sep 03 11:13:04 2018 -0700 |
2485 |
@@ -0,0 +1,508 @@ |
2539 |
@@ -0,0 +1,508 @@ |
2486 |
+/* |
2540 |
+/* |
2487 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
2541 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 2992-2998
Link Here
|
2992 |
+ } |
3046 |
+ } |
2993 |
+} |
3047 |
+} |
2994 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
3048 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2995 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Sat Dec 01 12:42:05 2018 -0800 |
3049 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Mon Sep 03 11:13:04 2018 -0700 |
2996 |
@@ -0,0 +1,43 @@ |
3050 |
@@ -0,0 +1,43 @@ |
2997 |
+/* |
3051 |
+/* |
2998 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
3052 |
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 3038-3044
Link Here
|
3038 |
+ |
3092 |
+ |
3039 |
+} |
3093 |
+} |
3040 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
3094 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
3041 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Sat Dec 01 12:42:05 2018 -0800 |
3095 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Mon Sep 03 11:13:04 2018 -0700 |
3042 |
@@ -0,0 +1,51 @@ |
3096 |
@@ -0,0 +1,51 @@ |
3043 |
+/* |
3097 |
+/* |
3044 |
+ * Copyright (c) 20014, Oracle and/or its affiliates. All rights reserved. |
3098 |
+ * Copyright (c) 20014, Oracle and/or its affiliates. All rights reserved. |
Lines 3091-3098
Link Here
|
3091 |
+ protected void initializeFromPD(RegisterMap map) {} |
3145 |
+ protected void initializeFromPD(RegisterMap map) {} |
3092 |
+ protected Address getLocationPD(VMReg reg) { return null; } |
3146 |
+ protected Address getLocationPD(VMReg reg) { return null; } |
3093 |
+} |
3147 |
+} |
3094 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Sat Oct 06 10:25:04 2018 +0100 |
3148 |
--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Sat Jun 23 21:01:40 2018 -0700 |
3095 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Sat Dec 01 12:42:05 2018 -0800 |
3149 |
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Mon Sep 03 11:13:04 2018 -0700 |
3096 |
@@ -61,7 +61,7 @@ |
3150 |
@@ -61,7 +61,7 @@ |
3097 |
return "x86"; |
3151 |
return "x86"; |
3098 |
} else if (cpu.equals("sparc") || cpu.equals("sparcv9")) { |
3152 |
} else if (cpu.equals("sparc") || cpu.equals("sparcv9")) { |
Lines 3102-3109
Link Here
|
3102 |
return cpu; |
3156 |
return cpu; |
3103 |
} else { |
3157 |
} else { |
3104 |
try { |
3158 |
try { |
3105 |
--- ./hotspot/make/bsd/Makefile Sat Oct 06 10:25:04 2018 +0100 |
3159 |
--- ./hotspot/make/bsd/Makefile Sat Jun 23 21:01:40 2018 -0700 |
3106 |
+++ ./hotspot/make/bsd/Makefile Sat Dec 01 12:42:05 2018 -0800 |
3160 |
+++ ./hotspot/make/bsd/Makefile Mon Sep 03 11:13:04 2018 -0700 |
3107 |
@@ -66,6 +66,10 @@ |
3161 |
@@ -66,6 +66,10 @@ |
3108 |
FORCE_TIERED=1 |
3162 |
FORCE_TIERED=1 |
3109 |
endif |
3163 |
endif |
Lines 3115-3122
Link Here
|
3115 |
|
3169 |
|
3116 |
ifdef LP64 |
3170 |
ifdef LP64 |
3117 |
ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","") |
3171 |
ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","") |
3118 |
--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat Oct 06 10:25:04 2018 +0100 |
3172 |
--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat Jun 23 21:01:40 2018 -0700 |
3119 |
+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat Dec 01 12:42:05 2018 -0800 |
3173 |
+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Mon Sep 03 11:13:04 2018 -0700 |
3120 |
@@ -1,12 +1,28 @@ |
3174 |
@@ -1,12 +1,28 @@ |
3121 |
#!/bin/sh |
3175 |
#!/bin/sh |
3122 |
|
3176 |
|
Lines 3152-3159
Link Here
|
3152 |
+ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" |
3206 |
+ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" |
3153 |
+ }' | sort -u ;; |
3207 |
+ }' | sort -u ;; |
3154 |
+esac |
3208 |
+esac |
3155 |
--- ./hotspot/make/bsd/makefiles/debug.make Sat Oct 06 10:25:04 2018 +0100 |
3209 |
--- ./hotspot/make/bsd/makefiles/debug.make Sat Jun 23 21:01:40 2018 -0700 |
3156 |
+++ ./hotspot/make/bsd/makefiles/debug.make Sat Dec 01 12:42:05 2018 -0800 |
3210 |
+++ ./hotspot/make/bsd/makefiles/debug.make Mon Sep 03 11:13:04 2018 -0700 |
3157 |
@@ -35,7 +35,10 @@ |
3211 |
@@ -35,7 +35,10 @@ |
3158 |
# to inhibit the effect of the previous line on CFLAGS. |
3212 |
# to inhibit the effect of the previous line on CFLAGS. |
3159 |
|
3213 |
|
Lines 3166-3173
Link Here
|
3166 |
|
3220 |
|
3167 |
VERSION = debug |
3221 |
VERSION = debug |
3168 |
SYSDEFS += -DASSERT |
3222 |
SYSDEFS += -DASSERT |
3169 |
--- ./hotspot/make/bsd/makefiles/defs.make Sat Oct 06 10:25:04 2018 +0100 |
3223 |
--- ./hotspot/make/bsd/makefiles/defs.make Sat Jun 23 21:01:40 2018 -0700 |
3170 |
+++ ./hotspot/make/bsd/makefiles/defs.make Sat Dec 01 12:42:05 2018 -0800 |
3224 |
+++ ./hotspot/make/bsd/makefiles/defs.make Mon Sep 03 11:13:04 2018 -0700 |
3171 |
@@ -29,7 +29,15 @@ |
3225 |
@@ -29,7 +29,15 @@ |
3172 |
SLASH_JAVA ?= /java |
3226 |
SLASH_JAVA ?= /java |
3173 |
|
3227 |
|
Lines 3266-3273
Link Here
|
3266 |
ADD_SA_BINARIES/ia64 = |
3320 |
ADD_SA_BINARIES/ia64 = |
3267 |
ADD_SA_BINARIES/arm = |
3321 |
ADD_SA_BINARIES/arm = |
3268 |
ADD_SA_BINARIES/zero = |
3322 |
ADD_SA_BINARIES/zero = |
3269 |
--- ./hotspot/make/bsd/makefiles/fastdebug.make Sat Oct 06 10:25:04 2018 +0100 |
3323 |
--- ./hotspot/make/bsd/makefiles/fastdebug.make Sat Jun 23 21:01:40 2018 -0700 |
3270 |
+++ ./hotspot/make/bsd/makefiles/fastdebug.make Sat Dec 01 12:42:05 2018 -0800 |
3324 |
+++ ./hotspot/make/bsd/makefiles/fastdebug.make Mon Sep 03 11:13:04 2018 -0700 |
3271 |
@@ -56,7 +56,10 @@ |
3325 |
@@ -56,7 +56,10 @@ |
3272 |
# to inhibit the effect of the previous line on CFLAGS. |
3326 |
# to inhibit the effect of the previous line on CFLAGS. |
3273 |
|
3327 |
|
Lines 3280-3287
Link Here
|
3280 |
|
3334 |
|
3281 |
VERSION = fastdebug |
3335 |
VERSION = fastdebug |
3282 |
SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS |
3336 |
SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS |
3283 |
--- ./hotspot/make/bsd/makefiles/gcc.make Sat Oct 06 10:25:04 2018 +0100 |
3337 |
--- ./hotspot/make/bsd/makefiles/gcc.make Sat Jun 23 21:01:40 2018 -0700 |
3284 |
+++ ./hotspot/make/bsd/makefiles/gcc.make Sat Dec 01 12:42:05 2018 -0800 |
3338 |
+++ ./hotspot/make/bsd/makefiles/gcc.make Mon Sep 03 11:13:04 2018 -0700 |
3285 |
@@ -168,6 +168,9 @@ |
3339 |
@@ -168,6 +168,9 @@ |
3286 |
CFLAGS += -DDONT_USE_PRECOMPILED_HEADER |
3340 |
CFLAGS += -DDONT_USE_PRECOMPILED_HEADER |
3287 |
endif |
3341 |
endif |
Lines 3438-3445
Link Here
|
3438 |
endif |
3492 |
endif |
3439 |
endif |
3493 |
endif |
3440 |
|
3494 |
|
|
|
3495 |
--- ./hotspot/make/bsd/makefiles/jsig.make Sat Jun 23 21:01:40 2018 -0700 |
3496 |
+++ ./hotspot/make/bsd/makefiles/jsig.make Mon Sep 03 11:13:04 2018 -0700 |
3497 |
@@ -52,7 +52,7 @@ |
3498 |
# cause problems with interposing. See CR: 6466665 |
3499 |
# LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) |
3500 |
|
3501 |
-LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) |
3502 |
+LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) |
3503 |
|
3504 |
# DEBUG_BINARIES overrides everything, use full -g debug information |
3505 |
ifeq ($(DEBUG_BINARIES), true) |
3441 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
3506 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
3442 |
+++ ./hotspot/make/bsd/makefiles/launcher.make Sat Dec 01 12:42:05 2018 -0800 |
3507 |
+++ ./hotspot/make/bsd/makefiles/launcher.make Mon Sep 03 11:13:04 2018 -0700 |
3443 |
@@ -0,0 +1,117 @@ |
3508 |
@@ -0,0 +1,117 @@ |
3444 |
+# |
3509 |
+# |
3445 |
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. |
3510 |
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. |
Lines 3558-3565
Link Here
|
3558 |
+ $(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@ |
3623 |
+ $(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@ |
3559 |
+ $(QUIETLY) chmod +x $@ |
3624 |
+ $(QUIETLY) chmod +x $@ |
3560 |
+ |
3625 |
+ |
3561 |
--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Sat Oct 06 10:25:04 2018 +0100 |
3626 |
--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Sat Jun 23 21:01:40 2018 -0700 |
3562 |
+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Sat Dec 01 12:42:05 2018 -0800 |
3627 |
+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Sep 03 11:13:04 2018 -0700 |
3563 |
@@ -21,246 +21,254 @@ |
3628 |
@@ -21,246 +21,254 @@ |
3564 |
# questions. |
3629 |
# questions. |
3565 |
# |
3630 |
# |
Lines 4047-4053
Link Here
|
4047 |
+ *; |
4112 |
+ *; |
4048 |
+}; |
4113 |
+}; |
4049 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
4114 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
4050 |
+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Sat Dec 01 12:42:05 2018 -0800 |
4115 |
+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Mon Sep 03 11:13:04 2018 -0700 |
4051 |
@@ -0,0 +1,266 @@ |
4116 |
@@ -0,0 +1,266 @@ |
4052 |
+# |
4117 |
+# |
4053 |
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. |
4118 |
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 4315-4322
Link Here
|
4315 |
+ |
4380 |
+ |
4316 |
+ # INSERT VTABLE SYMBOLS HERE |
4381 |
+ # INSERT VTABLE SYMBOLS HERE |
4317 |
+ |
4382 |
+ |
4318 |
--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat Oct 06 10:25:04 2018 +0100 |
4383 |
--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat Jun 23 21:01:40 2018 -0700 |
4319 |
+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat Dec 01 12:42:05 2018 -0800 |
4384 |
+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Sep 03 11:13:04 2018 -0700 |
4320 |
@@ -21,241 +21,249 @@ |
4385 |
@@ -21,241 +21,249 @@ |
4321 |
# questions. |
4386 |
# questions. |
4322 |
# |
4387 |
# |
Lines 4795-4801
Link Here
|
4795 |
+ *; |
4860 |
+ *; |
4796 |
+}; |
4861 |
+}; |
4797 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
4862 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
4798 |
+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Sat Dec 01 12:42:05 2018 -0800 |
4863 |
+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Mon Sep 03 11:13:04 2018 -0700 |
4799 |
@@ -0,0 +1,261 @@ |
4864 |
@@ -0,0 +1,261 @@ |
4800 |
+# |
4865 |
+# |
4801 |
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. |
4866 |
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. |
Lines 5058-5065
Link Here
|
5058 |
+ |
5123 |
+ |
5059 |
+ # INSERT VTABLE SYMBOLS HERE |
5124 |
+ # INSERT VTABLE SYMBOLS HERE |
5060 |
+ |
5125 |
+ |
5061 |
--- ./hotspot/make/bsd/makefiles/optimized.make Sat Oct 06 10:25:04 2018 +0100 |
5126 |
--- ./hotspot/make/bsd/makefiles/optimized.make Sat Jun 23 21:01:40 2018 -0700 |
5062 |
+++ ./hotspot/make/bsd/makefiles/optimized.make Sat Dec 01 12:42:05 2018 -0800 |
5127 |
+++ ./hotspot/make/bsd/makefiles/optimized.make Mon Sep 03 11:13:04 2018 -0700 |
5063 |
@@ -38,6 +38,9 @@ |
5128 |
@@ -38,6 +38,9 @@ |
5064 |
# to inhibit the effect of the previous line on CFLAGS. |
5129 |
# to inhibit the effect of the previous line on CFLAGS. |
5065 |
|
5130 |
|
Lines 5072-5078
Link Here
|
5072 |
|
5137 |
|
5073 |
VERSION = optimized |
5138 |
VERSION = optimized |
5074 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
5139 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
5075 |
+++ ./hotspot/make/bsd/makefiles/ppc64.make Sat Dec 01 12:42:05 2018 -0800 |
5140 |
+++ ./hotspot/make/bsd/makefiles/ppc64.make Mon Sep 03 11:13:04 2018 -0700 |
5076 |
@@ -0,0 +1,51 @@ |
5141 |
@@ -0,0 +1,51 @@ |
5077 |
+# |
5142 |
+# |
5078 |
+# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. |
5143 |
+# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 5125-5132
Link Here
|
5125 |
+ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. |
5190 |
+ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. |
5126 |
+ CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string |
5191 |
+ CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string |
5127 |
+endif |
5192 |
+endif |
5128 |
--- ./hotspot/make/bsd/makefiles/product.make Sat Oct 06 10:25:04 2018 +0100 |
5193 |
--- ./hotspot/make/bsd/makefiles/product.make Sat Jun 23 21:01:40 2018 -0700 |
5129 |
+++ ./hotspot/make/bsd/makefiles/product.make Sat Dec 01 12:42:05 2018 -0800 |
5194 |
+++ ./hotspot/make/bsd/makefiles/product.make Mon Sep 03 11:13:04 2018 -0700 |
5130 |
@@ -38,7 +38,10 @@ |
5195 |
@@ -38,7 +38,10 @@ |
5131 |
# to inhibit the effect of the previous line on CFLAGS. |
5196 |
# to inhibit the effect of the previous line on CFLAGS. |
5132 |
|
5197 |
|
Lines 5139-5146
Link Here
|
5139 |
|
5204 |
|
5140 |
SYSDEFS += -DPRODUCT |
5205 |
SYSDEFS += -DPRODUCT |
5141 |
VERSION = optimized |
5206 |
VERSION = optimized |
5142 |
--- ./hotspot/make/bsd/makefiles/rules.make Sat Oct 06 10:25:04 2018 +0100 |
5207 |
--- ./hotspot/make/bsd/makefiles/rules.make Sat Jun 23 21:01:40 2018 -0700 |
5143 |
+++ ./hotspot/make/bsd/makefiles/rules.make Sat Dec 01 12:42:05 2018 -0800 |
5208 |
+++ ./hotspot/make/bsd/makefiles/rules.make Mon Sep 03 11:13:04 2018 -0700 |
5144 |
@@ -34,7 +34,7 @@ |
5209 |
@@ -34,7 +34,7 @@ |
5145 |
CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) |
5210 |
CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) |
5146 |
CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) |
5211 |
CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) |
Lines 5150-5157
Link Here
|
5150 |
|
5215 |
|
5151 |
COMPILE.CC = $(CC_COMPILE) -c |
5216 |
COMPILE.CC = $(CC_COMPILE) -c |
5152 |
GENASM.CC = $(CC_COMPILE) -S |
5217 |
GENASM.CC = $(CC_COMPILE) -S |
5153 |
--- ./hotspot/make/bsd/makefiles/sa.make Sat Oct 06 10:25:04 2018 +0100 |
5218 |
--- ./hotspot/make/bsd/makefiles/sa.make Sat Jun 23 21:01:40 2018 -0700 |
5154 |
+++ ./hotspot/make/bsd/makefiles/sa.make Sat Dec 01 12:42:05 2018 -0800 |
5219 |
+++ ./hotspot/make/bsd/makefiles/sa.make Mon Sep 03 11:13:04 2018 -0700 |
5155 |
@@ -1,5 +1,5 @@ |
5220 |
@@ -1,5 +1,5 @@ |
5156 |
# |
5221 |
# |
5157 |
-# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. |
5222 |
-# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. |
Lines 5266-5273
Link Here
|
5266 |
rm -rf $(AGENT_FILES_LIST) |
5331 |
rm -rf $(AGENT_FILES_LIST) |
5267 |
+ |
5332 |
+ |
5268 |
+-include $(HS_ALT_MAKE)/bsd/makefiles/sa-rules.make |
5333 |
+-include $(HS_ALT_MAKE)/bsd/makefiles/sa-rules.make |
5269 |
--- ./hotspot/make/bsd/makefiles/saproc.make Sat Oct 06 10:25:04 2018 +0100 |
5334 |
--- ./hotspot/make/bsd/makefiles/saproc.make Sat Jun 23 21:01:40 2018 -0700 |
5270 |
+++ ./hotspot/make/bsd/makefiles/saproc.make Sat Dec 01 12:42:05 2018 -0800 |
5335 |
+++ ./hotspot/make/bsd/makefiles/saproc.make Mon Sep 03 11:13:04 2018 -0700 |
5271 |
@@ -99,10 +99,10 @@ |
5336 |
@@ -99,10 +99,10 @@ |
5272 |
endif |
5337 |
endif |
5273 |
|
5338 |
|
Lines 5307-5314
Link Here
|
5307 |
+ cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done" |
5372 |
+ cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done" |
5308 |
|
5373 |
|
5309 |
.PHONY: install_saproc |
5374 |
.PHONY: install_saproc |
5310 |
--- ./hotspot/make/bsd/makefiles/vm.make Sat Oct 06 10:25:04 2018 +0100 |
5375 |
--- ./hotspot/make/bsd/makefiles/vm.make Sat Jun 23 21:01:40 2018 -0700 |
5311 |
+++ ./hotspot/make/bsd/makefiles/vm.make Sat Dec 01 12:42:05 2018 -0800 |
5376 |
+++ ./hotspot/make/bsd/makefiles/vm.make Mon Sep 03 11:13:04 2018 -0700 |
5312 |
@@ -107,7 +107,7 @@ |
5377 |
@@ -107,7 +107,7 @@ |
5313 |
# File specific flags |
5378 |
# File specific flags |
5314 |
CXXFLAGS += $(CXXFLAGS/BYFILE) |
5379 |
CXXFLAGS += $(CXXFLAGS/BYFILE) |
Lines 5318-5336
Link Here
|
5318 |
CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" |
5383 |
CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" |
5319 |
endif |
5384 |
endif |
5320 |
|
5385 |
|
5321 |
@@ -130,9 +130,7 @@ |
|
|
5322 |
|
5323 |
LIBS += -lm |
5324 |
|
5325 |
-ifeq ($(USE_CLANG),) |
5326 |
- LIBS += -pthread |
5327 |
-endif |
5328 |
+LIBS += -pthread |
5329 |
|
5330 |
# By default, link the *.o into the library, not the executable. |
5331 |
LINK_INTO$(LINK_INTO) = LIBJVM |
5332 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
5386 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
5333 |
+++ ./hotspot/make/bsd/platform_ppc64 Sat Dec 01 12:42:05 2018 -0800 |
5387 |
+++ ./hotspot/make/bsd/platform_ppc64 Mon Sep 03 11:13:04 2018 -0700 |
5334 |
@@ -0,0 +1,17 @@ |
5388 |
@@ -0,0 +1,17 @@ |
5335 |
+os_family = bsd |
5389 |
+os_family = bsd |
5336 |
+ |
5390 |
+ |
Lines 5349-5356
Link Here
|
5349 |
+gnu_dis_arch = ppc64 |
5403 |
+gnu_dis_arch = ppc64 |
5350 |
+ |
5404 |
+ |
5351 |
+sysdefs = -DBSD -D_ALLBSD_SOURCE -D_GNU_SOURCE -DPPC64 |
5405 |
+sysdefs = -DBSD -D_ALLBSD_SOURCE -D_GNU_SOURCE -DPPC64 |
5352 |
--- ./hotspot/make/sa.files Sat Oct 06 10:25:04 2018 +0100 |
5406 |
--- ./hotspot/make/sa.files Sat Jun 23 21:01:40 2018 -0700 |
5353 |
+++ ./hotspot/make/sa.files Sat Dec 01 12:42:05 2018 -0800 |
5407 |
+++ ./hotspot/make/sa.files Mon Sep 03 11:13:04 2018 -0700 |
5354 |
@@ -45,6 +45,7 @@ |
5408 |
@@ -45,6 +45,7 @@ |
5355 |
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \ |
5409 |
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \ |
5356 |
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \ |
5410 |
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \ |
Lines 5391-5398
Link Here
|
5391 |
$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/*.java \ |
5445 |
$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/*.java \ |
5392 |
$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/jcore/*.java \ |
5446 |
$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/jcore/*.java \ |
5393 |
$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/soql/*.java \ |
5447 |
$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/soql/*.java \ |
5394 |
--- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Sat Oct 06 10:25:04 2018 +0100 |
5448 |
--- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Sat Jun 23 21:01:40 2018 -0700 |
5395 |
+++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Sat Dec 01 12:42:05 2018 -0800 |
5449 |
+++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 |
5396 |
@@ -277,5 +277,9 @@ |
5450 |
@@ -277,5 +277,9 @@ |
5397 |
#if defined(TARGET_OS_ARCH_linux_ppc) |
5451 |
#if defined(TARGET_OS_ARCH_linux_ppc) |
5398 |
#include "bytes_linux_ppc.inline.hpp" |
5452 |
#include "bytes_linux_ppc.inline.hpp" |
Lines 5403-5410
Link Here
|
5403 |
+ |
5457 |
+ |
5404 |
|
5458 |
|
5405 |
#endif // CPU_PPC_VM_BYTES_PPC_HPP |
5459 |
#endif // CPU_PPC_VM_BYTES_PPC_HPP |
5406 |
--- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Sat Oct 06 10:25:04 2018 +0100 |
5460 |
--- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Sat Jun 23 21:01:40 2018 -0700 |
5407 |
+++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Sat Dec 01 12:42:05 2018 -0800 |
5461 |
+++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Mon Sep 03 11:13:04 2018 -0700 |
5408 |
@@ -307,6 +307,8 @@ |
5462 |
@@ -307,6 +307,8 @@ |
5409 |
// Although AIX runs on big endian CPU, float is in most significant |
5463 |
// Although AIX runs on big endian CPU, float is in most significant |
5410 |
// word of an argument slot. |
5464 |
// word of an argument slot. |
Lines 5414-5421
Link Here
|
5414 |
#else |
5468 |
#else |
5415 |
#error "unknown OS" |
5469 |
#error "unknown OS" |
5416 |
#endif |
5470 |
#endif |
5417 |
--- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Sat Oct 06 10:25:04 2018 +0100 |
5471 |
--- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Sat Jun 23 21:01:40 2018 -0700 |
5418 |
+++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Sat Dec 01 12:42:05 2018 -0800 |
5472 |
+++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Mon Sep 03 11:13:04 2018 -0700 |
5419 |
@@ -780,6 +780,8 @@ |
5473 |
@@ -780,6 +780,8 @@ |
5420 |
// Although AIX runs on big endian CPU, float is in the most |
5474 |
// Although AIX runs on big endian CPU, float is in the most |
5421 |
// significant word of an argument slot. |
5475 |
// significant word of an argument slot. |
Lines 5425-5458
Link Here
|
5425 |
#else |
5479 |
#else |
5426 |
#error "unknown OS" |
5480 |
#error "unknown OS" |
5427 |
#endif |
5481 |
#endif |
5428 |
--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp Sat Oct 06 10:25:04 2018 +0100 |
5482 |
--- ./hotspot/src/cpu/x86/vm/jni_x86.h Sat Jun 23 21:01:40 2018 -0700 |
5429 |
+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp Sat Dec 01 12:42:05 2018 -0800 |
5483 |
+++ ./hotspot/src/cpu/x86/vm/jni_x86.h Mon Sep 03 11:13:04 2018 -0700 |
5430 |
@@ -650,7 +650,7 @@ |
|
|
5431 |
|
5432 |
bind(loop); |
5433 |
// check if current entry is used |
5434 |
- cmpptr(Address(c_rarg1, BasicObjectLock::obj_offset_in_bytes()), (int32_t) NULL); |
5435 |
+ cmpptr(Address(c_rarg1, BasicObjectLock::obj_offset_in_bytes()), 0); |
5436 |
jcc(Assembler::notEqual, exception); |
5437 |
|
5438 |
addptr(c_rarg1, entry_size); // otherwise advance to next entry |
5439 |
--- ./hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp Sat Oct 06 10:25:04 2018 +0100 |
5440 |
+++ ./hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp Sat Dec 01 12:42:05 2018 -0800 |
5441 |
@@ -428,10 +428,10 @@ |
5442 |
_from -= Interpreter::stackElementSize; |
5443 |
|
5444 |
if (_num_int_args < Argument::n_int_register_parameters_c-1) { |
5445 |
- *_int_args++ = (*from_addr == 0) ? NULL : (intptr_t)from_addr; |
5446 |
+ *_int_args++ = (*from_addr == 0) ? 0L : (intptr_t) from_addr; |
5447 |
_num_int_args++; |
5448 |
} else { |
5449 |
- *_to++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr; |
5450 |
+ *_to++ = (*from_addr == 0) ? 0L : (intptr_t) from_addr; |
5451 |
} |
5452 |
} |
5453 |
|
5454 |
--- ./hotspot/src/cpu/x86/vm/jni_x86.h Sat Oct 06 10:25:04 2018 +0100 |
5455 |
+++ ./hotspot/src/cpu/x86/vm/jni_x86.h Sat Dec 01 12:42:05 2018 -0800 |
5456 |
@@ -34,7 +34,7 @@ |
5484 |
@@ -34,7 +34,7 @@ |
5457 |
#ifndef __has_attribute |
5485 |
#ifndef __has_attribute |
5458 |
#define __has_attribute(x) 0 |
5486 |
#define __has_attribute(x) 0 |
Lines 5462-5469
Link Here
|
5462 |
#define JNIEXPORT __attribute__((visibility("default"))) |
5490 |
#define JNIEXPORT __attribute__((visibility("default"))) |
5463 |
#define JNIIMPORT __attribute__((visibility("default"))) |
5491 |
#define JNIIMPORT __attribute__((visibility("default"))) |
5464 |
#else |
5492 |
#else |
5465 |
--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sat Oct 06 10:25:04 2018 +0100 |
5493 |
--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sat Jun 23 21:01:40 2018 -0700 |
5466 |
+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sat Dec 01 12:42:05 2018 -0800 |
5494 |
+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Sep 03 11:13:04 2018 -0700 |
5467 |
@@ -2266,7 +2266,7 @@ |
5495 |
@@ -2266,7 +2266,7 @@ |
5468 |
if (!is_critical_native) { |
5496 |
if (!is_critical_native) { |
5469 |
// reset handle block |
5497 |
// reset handle block |
Lines 5473-5480
Link Here
|
5473 |
|
5501 |
|
5474 |
// Any exception pending? |
5502 |
// Any exception pending? |
5475 |
__ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD); |
5503 |
__ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD); |
5476 |
--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Sat Oct 06 10:25:04 2018 +0100 |
5504 |
--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Sat Jun 23 21:01:40 2018 -0700 |
5477 |
+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Sat Dec 01 12:42:05 2018 -0800 |
5505 |
+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Mon Sep 03 11:13:04 2018 -0700 |
5478 |
@@ -23,9 +23,12 @@ |
5506 |
@@ -23,9 +23,12 @@ |
5479 |
*/ |
5507 |
*/ |
5480 |
|
5508 |
|
Lines 5489-5507
Link Here
|
5489 |
#include "asm/macroAssembler.hpp" |
5517 |
#include "asm/macroAssembler.hpp" |
5490 |
#include "asm/macroAssembler.inline.hpp" |
5518 |
#include "asm/macroAssembler.inline.hpp" |
5491 |
#include "code/debugInfoRec.hpp" |
5519 |
#include "code/debugInfoRec.hpp" |
5492 |
--- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Sat Oct 06 10:25:04 2018 +0100 |
5520 |
--- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Sat Jun 23 21:01:40 2018 -0700 |
5493 |
+++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Sat Dec 01 12:42:05 2018 -0800 |
5521 |
+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Mon Sep 03 11:13:04 2018 -0700 |
5494 |
@@ -489,7 +489,7 @@ |
|
|
5495 |
// make sure this code is only executed if there is a pending exception |
5496 |
{ |
5497 |
Label L; |
5498 |
- __ cmpptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t) NULL); |
5499 |
+ __ cmpptr(Address(r15_thread, Thread::pending_exception_offset()), 0); |
5500 |
__ jcc(Assembler::notEqual, L); |
5501 |
__ stop("StubRoutines::forward exception: no pending exception (1)"); |
5502 |
__ bind(L); |
5503 |
--- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Sat Oct 06 10:25:04 2018 +0100 |
5504 |
+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Sat Dec 01 12:42:05 2018 -0800 |
5505 |
@@ -1293,7 +1293,7 @@ |
5522 |
@@ -1293,7 +1293,7 @@ |
5506 |
|
5523 |
|
5507 |
// reset handle block |
5524 |
// reset handle block |
Lines 5511-5518
Link Here
|
5511 |
|
5528 |
|
5512 |
// If result was an oop then unbox and save it in the frame |
5529 |
// If result was an oop then unbox and save it in the frame |
5513 |
{ Label L; |
5530 |
{ Label L; |
5514 |
--- ./hotspot/src/cpu/x86/vm/x86_32.ad Sat Oct 06 10:25:04 2018 +0100 |
5531 |
--- ./hotspot/src/cpu/x86/vm/x86_32.ad Sat Jun 23 21:01:40 2018 -0700 |
5515 |
+++ ./hotspot/src/cpu/x86/vm/x86_32.ad Sat Dec 01 12:42:05 2018 -0800 |
5532 |
+++ ./hotspot/src/cpu/x86/vm/x86_32.ad Mon Sep 03 11:13:04 2018 -0700 |
5516 |
@@ -1250,6 +1250,7 @@ |
5533 |
@@ -1250,6 +1250,7 @@ |
5517 |
|
5534 |
|
5518 |
|
5535 |
|
Lines 5521-5529
Link Here
|
5521 |
} |
5538 |
} |
5522 |
|
5539 |
|
5523 |
#ifndef PRODUCT |
5540 |
#ifndef PRODUCT |
5524 |
--- ./hotspot/src/os/aix/vm/os_aix.cpp Sat Oct 06 10:25:04 2018 +0100 |
5541 |
--- ./hotspot/src/os/aix/vm/os_aix.cpp Sat Jun 23 21:01:40 2018 -0700 |
5525 |
+++ ./hotspot/src/os/aix/vm/os_aix.cpp Sat Dec 01 12:42:05 2018 -0800 |
5542 |
+++ ./hotspot/src/os/aix/vm/os_aix.cpp Mon Sep 03 11:13:04 2018 -0700 |
5526 |
@@ -5246,6 +5246,10 @@ |
5543 |
@@ -5236,6 +5236,10 @@ |
5527 |
return 0; |
5544 |
return 0; |
5528 |
} |
5545 |
} |
5529 |
|
5546 |
|
Lines 5535-5541
Link Here
|
5535 |
} |
5552 |
} |
5536 |
|
5553 |
|
5537 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
5554 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
5538 |
+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sat Dec 01 12:42:05 2018 -0800 |
5555 |
+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Mon Sep 03 11:13:04 2018 -0700 |
5539 |
@@ -0,0 +1,53 @@ |
5556 |
@@ -0,0 +1,53 @@ |
5540 |
+/* |
5557 |
+/* |
5541 |
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. |
5558 |
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. |
Lines 5590-5597
Link Here
|
5590 |
+ return false; |
5607 |
+ return false; |
5591 |
+} |
5608 |
+} |
5592 |
+#endif |
5609 |
+#endif |
5593 |
--- ./hotspot/src/os/bsd/vm/jsig.c Sat Oct 06 10:25:04 2018 +0100 |
5610 |
--- ./hotspot/src/os/bsd/vm/jsig.c Sat Jun 23 21:01:40 2018 -0700 |
5594 |
+++ ./hotspot/src/os/bsd/vm/jsig.c Sat Dec 01 12:42:05 2018 -0800 |
5611 |
+++ ./hotspot/src/os/bsd/vm/jsig.c Mon Sep 03 11:13:04 2018 -0700 |
5595 |
@@ -165,9 +165,8 @@ |
5612 |
@@ -165,9 +165,8 @@ |
5596 |
} |
5613 |
} |
5597 |
|
5614 |
|
Lines 5604-5611
Link Here
|
5604 |
|
5621 |
|
5605 |
static int call_os_sigaction(int sig, const struct sigaction *act, |
5622 |
static int call_os_sigaction(int sig, const struct sigaction *act, |
5606 |
struct sigaction *oact) { |
5623 |
struct sigaction *oact) { |
5607 |
--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Sat Oct 06 10:25:04 2018 +0100 |
5624 |
--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Sat Jun 23 21:01:40 2018 -0700 |
5608 |
+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Sat Dec 01 12:42:05 2018 -0800 |
5625 |
+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Mon Sep 03 11:13:04 2018 -0700 |
5609 |
@@ -50,6 +50,7 @@ |
5626 |
@@ -50,6 +50,7 @@ |
5610 |
case INTERRUPT_SIGNAL: |
5627 |
case INTERRUPT_SIGNAL: |
5611 |
case SIGFPE: |
5628 |
case SIGFPE: |
Lines 5715-5722
Link Here
|
5715 |
+ jio_snprintf(buf, len, "SIG%s", signame); |
5732 |
+ jio_snprintf(buf, len, "SIG%s", signame); |
5716 |
+ return true; |
5733 |
+ return true; |
5717 |
} |
5734 |
} |
5718 |
--- ./hotspot/src/os/bsd/vm/jvm_bsd.h Sat Oct 06 10:25:04 2018 +0100 |
5735 |
--- ./hotspot/src/os/bsd/vm/jvm_bsd.h Sat Jun 23 21:01:40 2018 -0700 |
5719 |
+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Sat Dec 01 12:42:05 2018 -0800 |
5736 |
+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Mon Sep 03 11:13:04 2018 -0700 |
5720 |
@@ -112,20 +112,6 @@ |
5737 |
@@ -112,20 +112,6 @@ |
5721 |
#define SHUTDOWN2_SIGNAL SIGINT |
5738 |
#define SHUTDOWN2_SIGNAL SIGINT |
5722 |
#define SHUTDOWN3_SIGNAL SIGTERM |
5739 |
#define SHUTDOWN3_SIGNAL SIGTERM |
Lines 5738-5745
Link Here
|
5738 |
#endif /* JVM_MD_H */ |
5755 |
#endif /* JVM_MD_H */ |
5739 |
|
5756 |
|
5740 |
#endif // OS_BSD_VM_JVM_BSD_H |
5757 |
#endif // OS_BSD_VM_JVM_BSD_H |
5741 |
--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Sat Oct 06 10:25:04 2018 +0100 |
5758 |
--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Sat Jun 23 21:01:40 2018 -0700 |
5742 |
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Sat Dec 01 12:42:05 2018 -0800 |
5759 |
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Mon Sep 03 11:13:04 2018 -0700 |
5743 |
@@ -30,7 +30,7 @@ |
5760 |
@@ -30,7 +30,7 @@ |
5744 |
|
5761 |
|
5745 |
void OSThread::pd_initialize() { |
5762 |
void OSThread::pd_initialize() { |
Lines 5749-5756
Link Here
|
5749 |
_thread_id = 0; |
5766 |
_thread_id = 0; |
5750 |
#else |
5767 |
#else |
5751 |
_thread_id = NULL; |
5768 |
_thread_id = NULL; |
5752 |
--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Sat Oct 06 10:25:04 2018 +0100 |
5769 |
--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Sat Jun 23 21:01:40 2018 -0700 |
5753 |
+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sat Dec 01 12:42:05 2018 -0800 |
5770 |
+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Sep 03 11:13:04 2018 -0700 |
5754 |
@@ -97,16 +97,31 @@ |
5771 |
@@ -97,16 +97,31 @@ |
5755 |
# include <sys/shm.h> |
5772 |
# include <sys/shm.h> |
5756 |
#ifndef __APPLE__ |
5773 |
#ifndef __APPLE__ |
Lines 5972-5986
Link Here
|
5972 |
#else |
5989 |
#else |
5973 |
return (intx)::pthread_self(); |
5990 |
return (intx)::pthread_self(); |
5974 |
#endif |
5991 |
#endif |
5975 |
@@ -1563,7 +1631,7 @@ |
|
|
5976 |
// Identify compatability class for VM's architecture and library's architecture |
5977 |
// Obtain string descriptions for architectures |
5978 |
|
5979 |
- arch_t lib_arch={elf_head.e_machine,0,elf_head.e_ident[EI_CLASS], elf_head.e_ident[EI_DATA], NULL}; |
5980 |
+ arch_t lib_arch={ elf_head.e_machine, 0, (char) elf_head.e_ident[EI_CLASS], (char) elf_head.e_ident[EI_DATA], NULL}; |
5981 |
int running_arch_index=-1; |
5982 |
|
5983 |
for (unsigned int i=0 ; i < ARRAY_SIZE(arch_array) ; i++ ) { |
5984 |
@@ -1691,14 +1759,14 @@ |
5992 |
@@ -1691,14 +1759,14 @@ |
5985 |
} |
5993 |
} |
5986 |
|
5994 |
|
Lines 6210-6219
Link Here
|
6210 |
#ifdef __APPLE__ |
6218 |
#ifdef __APPLE__ |
6211 |
// XXXDARWIN |
6219 |
// XXXDARWIN |
6212 |
// Work around the unaligned VM callbacks in hotspot's |
6220 |
// Work around the unaligned VM callbacks in hotspot's |
6213 |
@@ -3775,6 +3889,20 @@ |
6221 |
@@ -3765,6 +3879,19 @@ |
6214 |
return ActiveProcessorCount; |
6222 |
}; |
6215 |
} |
|
|
6216 |
|
6223 |
|
|
|
6224 |
int os::active_processor_count() { |
6217 |
+#ifdef __FreeBSD__ |
6225 |
+#ifdef __FreeBSD__ |
6218 |
+ int online_cpus = 0; |
6226 |
+ int online_cpus = 0; |
6219 |
+ cpuset_t mask; |
6227 |
+ cpuset_t mask; |
Lines 6227-6237
Link Here
|
6227 |
+ if (online_cpus >= 1) |
6235 |
+ if (online_cpus >= 1) |
6228 |
+ return online_cpus; |
6236 |
+ return online_cpus; |
6229 |
+#endif |
6237 |
+#endif |
6230 |
+ |
|
|
6231 |
return _processor_count; |
6238 |
return _processor_count; |
6232 |
} |
6239 |
} |
6233 |
|
6240 |
|
6234 |
@@ -3986,7 +4114,10 @@ |
6241 |
@@ -3976,7 +4103,10 @@ |
6235 |
} |
6242 |
} |
6236 |
int fd; |
6243 |
int fd; |
6237 |
int o_delete = (oflag & O_DELETE); |
6244 |
int o_delete = (oflag & O_DELETE); |
Lines 6243-6249
Link Here
|
6243 |
|
6250 |
|
6244 |
fd = ::open(path, oflag, mode); |
6251 |
fd = ::open(path, oflag, mode); |
6245 |
if (fd == -1) return -1; |
6252 |
if (fd == -1) return -1; |
6246 |
@@ -4031,7 +4162,7 @@ |
6253 |
@@ -4021,7 +4151,7 @@ |
6247 |
* 4843136: (process) pipe file descriptor from Runtime.exec not being closed |
6254 |
* 4843136: (process) pipe file descriptor from Runtime.exec not being closed |
6248 |
* 6339493: (process) Runtime.exec does not close all file descriptors on Solaris 9 |
6255 |
* 6339493: (process) Runtime.exec does not close all file descriptors on Solaris 9 |
6249 |
*/ |
6256 |
*/ |
Lines 6252-6258
Link Here
|
6252 |
{ |
6259 |
{ |
6253 |
int flags = ::fcntl(fd, F_GETFD); |
6260 |
int flags = ::fcntl(fd, F_GETFD); |
6254 |
if (flags != -1) |
6261 |
if (flags != -1) |
6255 |
@@ -4171,8 +4302,9 @@ |
6262 |
@@ -4161,8 +4291,9 @@ |
6256 |
#ifdef __APPLE__ |
6263 |
#ifdef __APPLE__ |
6257 |
return os::thread_cpu_time(Thread::current(), true /* user + sys */); |
6264 |
return os::thread_cpu_time(Thread::current(), true /* user + sys */); |
6258 |
#else |
6265 |
#else |
Lines 6264-6270
Link Here
|
6264 |
#endif |
6271 |
#endif |
6265 |
} |
6272 |
} |
6266 |
|
6273 |
|
6267 |
@@ -4180,8 +4312,9 @@ |
6274 |
@@ -4170,8 +4301,9 @@ |
6268 |
#ifdef __APPLE__ |
6275 |
#ifdef __APPLE__ |
6269 |
return os::thread_cpu_time(thread, true /* user + sys */); |
6276 |
return os::thread_cpu_time(thread, true /* user + sys */); |
6270 |
#else |
6277 |
#else |
Lines 6276-6282
Link Here
|
6276 |
#endif |
6283 |
#endif |
6277 |
} |
6284 |
} |
6278 |
|
6285 |
|
6279 |
@@ -4189,8 +4322,9 @@ |
6286 |
@@ -4179,8 +4311,9 @@ |
6280 |
#ifdef __APPLE__ |
6287 |
#ifdef __APPLE__ |
6281 |
return os::thread_cpu_time(Thread::current(), user_sys_cpu_time); |
6288 |
return os::thread_cpu_time(Thread::current(), user_sys_cpu_time); |
6282 |
#else |
6289 |
#else |
Lines 6288-6294
Link Here
|
6288 |
#endif |
6295 |
#endif |
6289 |
} |
6296 |
} |
6290 |
|
6297 |
|
6291 |
@@ -4215,8 +4349,41 @@ |
6298 |
@@ -4205,8 +4338,41 @@ |
6292 |
return ((jlong)tinfo.user_time.seconds * 1000000000) + ((jlong)tinfo.user_time.microseconds * (jlong)1000); |
6299 |
return ((jlong)tinfo.user_time.seconds * 1000000000) + ((jlong)tinfo.user_time.microseconds * (jlong)1000); |
6293 |
} |
6300 |
} |
6294 |
#else |
6301 |
#else |
Lines 6332-6338
Link Here
|
6332 |
#endif |
6339 |
#endif |
6333 |
} |
6340 |
} |
6334 |
|
6341 |
|
6335 |
@@ -4239,7 +4406,7 @@ |
6342 |
@@ -4229,7 +4395,7 @@ |
6336 |
#ifdef __APPLE__ |
6343 |
#ifdef __APPLE__ |
6337 |
return true; |
6344 |
return true; |
6338 |
#else |
6345 |
#else |
Lines 6341-6347
Link Here
|
6341 |
#endif |
6348 |
#endif |
6342 |
} |
6349 |
} |
6343 |
|
6350 |
|
6344 |
@@ -4337,21 +4504,36 @@ |
6351 |
@@ -4327,21 +4493,36 @@ |
6345 |
|
6352 |
|
6346 |
static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) { |
6353 |
static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) { |
6347 |
if (millis < 0) millis = 0; |
6354 |
if (millis < 0) millis = 0; |
Lines 6387-6393
Link Here
|
6387 |
return abstime; |
6394 |
return abstime; |
6388 |
} |
6395 |
} |
6389 |
|
6396 |
|
6390 |
@@ -4443,7 +4625,7 @@ |
6397 |
@@ -4433,7 +4614,7 @@ |
6391 |
status = os::Bsd::safe_cond_timedwait(_cond, _mutex, &abst); |
6398 |
status = os::Bsd::safe_cond_timedwait(_cond, _mutex, &abst); |
6392 |
if (status != 0 && WorkAroundNPTLTimedWaitHang) { |
6399 |
if (status != 0 && WorkAroundNPTLTimedWaitHang) { |
6393 |
pthread_cond_destroy (_cond); |
6400 |
pthread_cond_destroy (_cond); |
Lines 6396-6402
Link Here
|
6396 |
} |
6403 |
} |
6397 |
assert_status(status == 0 || status == EINTR || |
6404 |
assert_status(status == 0 || status == EINTR || |
6398 |
status == ETIMEDOUT, |
6405 |
status == ETIMEDOUT, |
6399 |
@@ -4544,32 +4726,50 @@ |
6406 |
@@ -4534,32 +4715,50 @@ |
6400 |
|
6407 |
|
6401 |
static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) { |
6408 |
static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) { |
6402 |
assert (time > 0, "convertTime"); |
6409 |
assert (time > 0, "convertTime"); |
Lines 6467-6473
Link Here
|
6467 |
if (absTime->tv_nsec >= NANOSECS_PER_SEC) { |
6474 |
if (absTime->tv_nsec >= NANOSECS_PER_SEC) { |
6468 |
absTime->tv_nsec -= NANOSECS_PER_SEC; |
6475 |
absTime->tv_nsec -= NANOSECS_PER_SEC; |
6469 |
++absTime->tv_sec; // note: this must be <= max_secs |
6476 |
++absTime->tv_sec; // note: this must be <= max_secs |
6470 |
@@ -4649,15 +4849,19 @@ |
6477 |
@@ -4639,15 +4838,19 @@ |
6471 |
jt->set_suspend_equivalent(); |
6478 |
jt->set_suspend_equivalent(); |
6472 |
// cleared by handle_special_suspend_equivalent_condition() or java_suspend_self() |
6479 |
// cleared by handle_special_suspend_equivalent_condition() or java_suspend_self() |
6473 |
|
6480 |
|
Lines 6491-6497
Link Here
|
6491 |
assert_status(status == 0 || status == EINTR || |
6498 |
assert_status(status == 0 || status == EINTR || |
6492 |
status == ETIMEDOUT, |
6499 |
status == ETIMEDOUT, |
6493 |
status, "cond_timedwait"); |
6500 |
status, "cond_timedwait"); |
6494 |
@@ -4686,17 +4890,26 @@ |
6501 |
@@ -4676,17 +4879,26 @@ |
6495 |
s = _counter; |
6502 |
s = _counter; |
6496 |
_counter = 1; |
6503 |
_counter = 1; |
6497 |
if (s < 1) { |
6504 |
if (s < 1) { |
Lines 6527-6533
Link Here
|
6527 |
} else { |
6534 |
} else { |
6528 |
pthread_mutex_unlock(_mutex); |
6535 |
pthread_mutex_unlock(_mutex); |
6529 |
assert (status == 0, "invariant") ; |
6536 |
assert (status == 0, "invariant") ; |
6530 |
@@ -4827,13 +5040,29 @@ |
6537 |
@@ -4817,13 +5029,29 @@ |
6531 |
|
6538 |
|
6532 |
// Get the default path to the core file |
6539 |
// Get the default path to the core file |
6533 |
// Returns the length of the string |
6540 |
// Returns the length of the string |
Lines 6564-6571
Link Here
|
6564 |
} |
6571 |
} |
6565 |
|
6572 |
|
6566 |
#ifndef PRODUCT |
6573 |
#ifndef PRODUCT |
6567 |
--- ./hotspot/src/os/bsd/vm/os_bsd.hpp Sat Oct 06 10:25:04 2018 +0100 |
6574 |
--- ./hotspot/src/os/bsd/vm/os_bsd.hpp Sat Jun 23 21:01:40 2018 -0700 |
6568 |
+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sat Dec 01 12:42:05 2018 -0800 |
6575 |
+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Mon Sep 03 11:13:04 2018 -0700 |
6569 |
@@ -58,12 +58,16 @@ |
6576 |
@@ -58,12 +58,16 @@ |
6570 |
// For signal flags diagnostics |
6577 |
// For signal flags diagnostics |
6571 |
static int sigflags[MAXSIGNUM]; |
6578 |
static int sigflags[MAXSIGNUM]; |
Lines 6583-6590
Link Here
|
6583 |
#endif |
6590 |
#endif |
6584 |
|
6591 |
|
6585 |
static GrowableArray<int>* _cpu_to_node; |
6592 |
static GrowableArray<int>* _cpu_to_node; |
6586 |
@@ -94,6 +98,9 @@ |
6593 |
@@ -95,6 +99,9 @@ |
6587 |
|
6594 |
static bool is_initial_thread(void); |
6588 |
static pid_t gettid(); |
6595 |
static pid_t gettid(); |
6589 |
|
6596 |
|
6590 |
+ static address initial_thread_stack_bottom(void) { return _initial_thread_stack_bottom; } |
6597 |
+ static address initial_thread_stack_bottom(void) { return _initial_thread_stack_bottom; } |
Lines 6593-6599
Link Here
|
6593 |
static int page_size(void) { return _page_size; } |
6600 |
static int page_size(void) { return _page_size; } |
6594 |
static void set_page_size(int val) { _page_size = val; } |
6601 |
static void set_page_size(int val) { _page_size = val; } |
6595 |
|
6602 |
|
6596 |
@@ -147,6 +154,13 @@ |
6603 |
@@ -148,6 +155,13 @@ |
6597 |
#endif |
6604 |
#endif |
6598 |
} |
6605 |
} |
6599 |
|
6606 |
|
Lines 6607-6613
Link Here
|
6607 |
// Stack repair handling |
6614 |
// Stack repair handling |
6608 |
|
6615 |
|
6609 |
// none present |
6616 |
// none present |
6610 |
@@ -212,7 +226,7 @@ |
6617 |
@@ -213,7 +227,7 @@ |
6611 |
public: |
6618 |
public: |
6612 |
PlatformEvent() { |
6619 |
PlatformEvent() { |
6613 |
int status; |
6620 |
int status; |
Lines 6616-6622
Link Here
|
6616 |
assert_status(status == 0, status, "cond_init"); |
6623 |
assert_status(status == 0, status, "cond_init"); |
6617 |
status = pthread_mutex_init (_mutex, NULL); |
6624 |
status = pthread_mutex_init (_mutex, NULL); |
6618 |
assert_status(status == 0, status, "mutex_init"); |
6625 |
assert_status(status == 0, status, "mutex_init"); |
6619 |
@@ -227,14 +241,19 @@ |
6626 |
@@ -228,14 +242,19 @@ |
6620 |
void park () ; |
6627 |
void park () ; |
6621 |
void unpark () ; |
6628 |
void unpark () ; |
6622 |
int TryPark () ; |
6629 |
int TryPark () ; |
Lines 6638-6644
Link Here
|
6638 |
|
6645 |
|
6639 |
public: // TODO-FIXME: make dtor private |
6646 |
public: // TODO-FIXME: make dtor private |
6640 |
~PlatformParker() { guarantee (0, "invariant") ; } |
6647 |
~PlatformParker() { guarantee (0, "invariant") ; } |
6641 |
@@ -242,10 +261,13 @@ |
6648 |
@@ -243,10 +262,13 @@ |
6642 |
public: |
6649 |
public: |
6643 |
PlatformParker() { |
6650 |
PlatformParker() { |
6644 |
int status; |
6651 |
int status; |
Lines 6654-6661
Link Here
|
6654 |
} |
6661 |
} |
6655 |
}; |
6662 |
}; |
6656 |
|
6663 |
|
6657 |
--- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Sat Oct 06 10:25:04 2018 +0100 |
6664 |
--- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Sat Jun 23 21:01:40 2018 -0700 |
6658 |
+++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Sat Dec 01 12:42:05 2018 -0800 |
6665 |
+++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Mon Sep 03 11:13:04 2018 -0700 |
6659 |
@@ -33,30 +33,50 @@ |
6666 |
@@ -33,30 +33,50 @@ |
6660 |
#include <sys/syscall.h> |
6667 |
#include <sys/syscall.h> |
6661 |
#include <unistd.h> |
6668 |
#include <unistd.h> |
Lines 6717-6725
Link Here
|
6717 |
os::fork_and_exec(buf); |
6724 |
os::fork_and_exec(buf); |
6718 |
yes = false; |
6725 |
yes = false; |
6719 |
} |
6726 |
} |
6720 |
--- ./hotspot/src/os/linux/vm/os_linux.cpp Sat Oct 06 10:25:04 2018 +0100 |
6727 |
--- ./hotspot/src/os/linux/vm/os_linux.cpp Sat Jun 23 21:01:40 2018 -0700 |
6721 |
+++ ./hotspot/src/os/linux/vm/os_linux.cpp Sat Dec 01 12:42:05 2018 -0800 |
6728 |
+++ ./hotspot/src/os/linux/vm/os_linux.cpp Mon Sep 03 11:13:04 2018 -0700 |
6722 |
@@ -6435,6 +6435,10 @@ |
6729 |
@@ -6285,6 +6285,10 @@ |
6723 |
return 0; |
6730 |
return 0; |
6724 |
} |
6731 |
} |
6725 |
|
6732 |
|
Lines 6730-6737
Link Here
|
6730 |
return strlen(buffer); |
6737 |
return strlen(buffer); |
6731 |
} |
6738 |
} |
6732 |
|
6739 |
|
6733 |
--- ./hotspot/src/os/posix/vm/os_posix.cpp Sat Oct 06 10:25:04 2018 +0100 |
6740 |
--- ./hotspot/src/os/posix/vm/os_posix.cpp Sat Jun 23 21:01:40 2018 -0700 |
6734 |
+++ ./hotspot/src/os/posix/vm/os_posix.cpp Sat Dec 01 12:42:05 2018 -0800 |
6741 |
+++ ./hotspot/src/os/posix/vm/os_posix.cpp Mon Sep 03 11:13:04 2018 -0700 |
6735 |
@@ -53,12 +53,11 @@ |
6742 |
@@ -53,12 +53,11 @@ |
6736 |
n = get_core_path(buffer, bufferSize); |
6743 |
n = get_core_path(buffer, bufferSize); |
6737 |
|
6744 |
|
Lines 6794-6802
Link Here
|
6794 |
// Linux specific |
6801 |
// Linux specific |
6795 |
#ifdef SI_TKILL |
6802 |
#ifdef SI_TKILL |
6796 |
{ SI_TKILL, "SI_TKILL", "Signal sent by tkill (pthread_kill)" }, |
6803 |
{ SI_TKILL, "SI_TKILL", "Signal sent by tkill (pthread_kill)" }, |
6797 |
--- ./hotspot/src/os/solaris/vm/os_solaris.cpp Sat Oct 06 10:25:04 2018 +0100 |
6804 |
--- ./hotspot/src/os/solaris/vm/os_solaris.cpp Sat Jun 23 21:01:40 2018 -0700 |
6798 |
+++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Sat Dec 01 12:42:05 2018 -0800 |
6805 |
+++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Mon Sep 03 11:13:04 2018 -0700 |
6799 |
@@ -6386,6 +6386,10 @@ |
6806 |
@@ -6375,6 +6375,10 @@ |
6800 |
return 0; |
6807 |
return 0; |
6801 |
} |
6808 |
} |
6802 |
|
6809 |
|
Lines 6808-6814
Link Here
|
6808 |
} |
6815 |
} |
6809 |
|
6816 |
|
6810 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
6817 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
6811 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp Sat Dec 01 12:42:05 2018 -0800 |
6818 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp Mon Sep 03 11:13:04 2018 -0700 |
6812 |
@@ -0,0 +1,400 @@ |
6819 |
@@ -0,0 +1,400 @@ |
6813 |
+/* |
6820 |
+/* |
6814 |
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
6821 |
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 7211-7217
Link Here
|
7211 |
+ |
7218 |
+ |
7212 |
+#endif // OS_CPU_BSD_PPC_VM_ATOMIC_BSD_PPC_INLINE_HPP |
7219 |
+#endif // OS_CPU_BSD_PPC_VM_ATOMIC_BSD_PPC_INLINE_HPP |
7213 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
7220 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
7214 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp Sat Dec 01 12:42:05 2018 -0800 |
7221 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp Mon Sep 03 11:13:04 2018 -0700 |
7215 |
@@ -0,0 +1,39 @@ |
7222 |
@@ -0,0 +1,39 @@ |
7216 |
+/* |
7223 |
+/* |
7217 |
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. |
7224 |
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 7253-7259
Link Here
|
7253 |
+ |
7260 |
+ |
7254 |
+#endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP |
7261 |
+#endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP |
7255 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
7262 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
7256 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp Sat Dec 01 12:42:05 2018 -0800 |
7263 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 |
7257 |
@@ -0,0 +1,54 @@ |
7264 |
@@ -0,0 +1,54 @@ |
7258 |
+/* |
7265 |
+/* |
7259 |
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. |
7266 |
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 7310-7316
Link Here
|
7310 |
+ |
7317 |
+ |
7311 |
+#endif // OS_CPU_BSD_PPC_VM_GLOBALS_BSD_PPC_HPP |
7318 |
+#endif // OS_CPU_BSD_PPC_VM_GLOBALS_BSD_PPC_HPP |
7312 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
7319 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
7313 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp Sat Dec 01 12:42:05 2018 -0800 |
7320 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp Mon Sep 03 11:13:04 2018 -0700 |
7314 |
@@ -0,0 +1,149 @@ |
7321 |
@@ -0,0 +1,149 @@ |
7315 |
+/* |
7322 |
+/* |
7316 |
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
7323 |
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 7462-7468
Link Here
|
7462 |
+ |
7469 |
+ |
7463 |
+#endif // OS_CPU_BSD_PPC_VM_ORDERACCESS_BSD_PPC_INLINE_HPP |
7470 |
+#endif // OS_CPU_BSD_PPC_VM_ORDERACCESS_BSD_PPC_INLINE_HPP |
7464 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
7471 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
7465 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp Sat Dec 01 12:42:05 2018 -0800 |
7472 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp Mon Sep 03 11:13:04 2018 -0700 |
7466 |
@@ -0,0 +1,666 @@ |
7473 |
@@ -0,0 +1,666 @@ |
7467 |
+/* |
7474 |
+/* |
7468 |
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. |
7475 |
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 8131-8137
Link Here
|
8131 |
+} |
8138 |
+} |
8132 |
+#endif |
8139 |
+#endif |
8133 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8140 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8134 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp Sat Dec 01 12:42:05 2018 -0800 |
8141 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 |
8135 |
@@ -0,0 +1,35 @@ |
8142 |
@@ -0,0 +1,35 @@ |
8136 |
+/* |
8143 |
+/* |
8137 |
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. |
8144 |
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 8169-8175
Link Here
|
8169 |
+ |
8176 |
+ |
8170 |
+#endif // OS_CPU_BSD_PPC_VM_OS_BSD_PPC_HPP |
8177 |
+#endif // OS_CPU_BSD_PPC_VM_OS_BSD_PPC_HPP |
8171 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8178 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8172 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp Sat Dec 01 12:42:05 2018 -0800 |
8179 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp Mon Sep 03 11:13:04 2018 -0700 |
8173 |
@@ -0,0 +1,50 @@ |
8180 |
@@ -0,0 +1,50 @@ |
8174 |
+/* |
8181 |
+/* |
8175 |
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
8182 |
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 8222-8228
Link Here
|
8222 |
+ |
8229 |
+ |
8223 |
+#endif // OS_CPU_BSD_PPC_VM_PREFETCH_BSD_PPC_INLINE_HPP |
8230 |
+#endif // OS_CPU_BSD_PPC_VM_PREFETCH_BSD_PPC_INLINE_HPP |
8224 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8231 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8225 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp Sat Dec 01 12:42:05 2018 -0800 |
8232 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp Mon Sep 03 11:13:04 2018 -0700 |
8226 |
@@ -0,0 +1,39 @@ |
8233 |
@@ -0,0 +1,39 @@ |
8227 |
+/* |
8234 |
+/* |
8228 |
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
8235 |
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 8264-8270
Link Here
|
8264 |
+ os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread); |
8271 |
+ os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread); |
8265 |
+} |
8272 |
+} |
8266 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8273 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8267 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp Sat Dec 01 12:42:05 2018 -0800 |
8274 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 |
8268 |
@@ -0,0 +1,36 @@ |
8275 |
@@ -0,0 +1,36 @@ |
8269 |
+/* |
8276 |
+/* |
8270 |
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
8277 |
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 8303-8309
Link Here
|
8303 |
+ |
8310 |
+ |
8304 |
+#endif // OS_CPU_BSD_PPC_VM_THREADLS_BSD_PPC_HPP |
8311 |
+#endif // OS_CPU_BSD_PPC_VM_THREADLS_BSD_PPC_HPP |
8305 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8312 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8306 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp Sat Dec 01 12:42:05 2018 -0800 |
8313 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp Mon Sep 03 11:13:04 2018 -0700 |
8307 |
@@ -0,0 +1,36 @@ |
8314 |
@@ -0,0 +1,36 @@ |
8308 |
+/* |
8315 |
+/* |
8309 |
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
8316 |
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 8342-8348
Link Here
|
8342 |
+ |
8349 |
+ |
8343 |
+void JavaThread::cache_global_variables() { } |
8350 |
+void JavaThread::cache_global_variables() { } |
8344 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8351 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8345 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp Sat Dec 01 12:42:05 2018 -0800 |
8352 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 |
8346 |
@@ -0,0 +1,83 @@ |
8353 |
@@ -0,0 +1,83 @@ |
8347 |
+/* |
8354 |
+/* |
8348 |
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
8355 |
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 8428-8434
Link Here
|
8428 |
+ |
8435 |
+ |
8429 |
+#endif // OS_CPU_BSD_PPC_VM_THREAD_BSD_PPC_HPP |
8436 |
+#endif // OS_CPU_BSD_PPC_VM_THREAD_BSD_PPC_HPP |
8430 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8437 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
8431 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp Sat Dec 01 12:42:05 2018 -0800 |
8438 |
+++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 |
8432 |
@@ -0,0 +1,55 @@ |
8439 |
@@ -0,0 +1,55 @@ |
8433 |
+/* |
8440 |
+/* |
8434 |
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
8441 |
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 8485-8515
Link Here
|
8485 |
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) |
8492 |
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) |
8486 |
+ |
8493 |
+ |
8487 |
+#endif // OS_CPU_BSD_PPC_VM_VMSTRUCTS_BSD_PPC_HPP |
8494 |
+#endif // OS_CPU_BSD_PPC_VM_VMSTRUCTS_BSD_PPC_HPP |
8488 |
--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sat Oct 06 10:25:04 2018 +0100 |
8495 |
--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sat Jun 23 21:01:40 2018 -0700 |
8489 |
+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sat Dec 01 12:42:05 2018 -0800 |
8496 |
+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Mon Sep 03 11:13:04 2018 -0700 |
8490 |
@@ -281,11 +281,11 @@ |
|
|
8491 |
address os::current_stack_pointer() { |
8492 |
#if defined(__clang__) || defined(__llvm__) |
8493 |
register void *esp; |
8494 |
- __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp)); |
8495 |
+ __asm__("mov %%" SPELL_REG_SP ", %0" : "=r" (esp)); |
8496 |
return (address) esp; |
8497 |
#elif defined(SPARC_WORKS) |
8498 |
register void *esp; |
8499 |
- __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp)); |
8500 |
+ __asm__("mov %%" SPELL_REG_SP ", %0" : "=r" (esp)); |
8501 |
return (address) ((char*)esp + sizeof(long)*2); |
8502 |
#else |
8503 |
register void *esp __asm__ (SPELL_REG_SP); |
8504 |
@@ -368,7 +368,7 @@ |
8505 |
intptr_t* _get_previous_fp() { |
8506 |
#if defined(SPARC_WORKS) || defined(__clang__) || defined(__llvm__) |
8507 |
register intptr_t **ebp; |
8508 |
- __asm__("mov %%"SPELL_REG_FP", %0":"=r"(ebp)); |
8509 |
+ __asm__("mov %%" SPELL_REG_FP ", %0" : "=r" (ebp)); |
8510 |
#else |
8511 |
register intptr_t **ebp __asm__ (SPELL_REG_FP); |
8512 |
#endif |
8513 |
@@ -594,7 +594,11 @@ |
8497 |
@@ -594,7 +594,11 @@ |
8514 |
stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL); |
8498 |
stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL); |
8515 |
} |
8499 |
} |
Lines 8522-8628
Link Here
|
8522 |
thread->doing_unsafe_access()) { |
8506 |
thread->doing_unsafe_access()) { |
8523 |
stub = StubRoutines::handler_for_unsafe_access(); |
8507 |
stub = StubRoutines::handler_for_unsafe_access(); |
8524 |
} |
8508 |
} |
8525 |
--- ./hotspot/src/share/vm/code/compiledIC.cpp Sat Oct 06 10:25:04 2018 +0100 |
8509 |
--- ./hotspot/src/share/vm/opto/lcm.cpp Sat Jun 23 21:01:40 2018 -0700 |
8526 |
+++ ./hotspot/src/share/vm/code/compiledIC.cpp Sat Dec 01 12:42:05 2018 -0800 |
8510 |
+++ ./hotspot/src/share/vm/opto/lcm.cpp Mon Sep 03 11:13:04 2018 -0700 |
8527 |
@@ -222,7 +222,7 @@ |
|
|
8528 |
assert(bytecode == Bytecodes::_invokeinterface, ""); |
8529 |
int itable_index = call_info->itable_index(); |
8530 |
entry = VtableStubs::find_itable_stub(itable_index); |
8531 |
- if (entry == false) { |
8532 |
+ if (entry == NULL) { |
8533 |
return false; |
8534 |
} |
8535 |
#ifdef ASSERT |
8536 |
--- ./hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp Sat Oct 06 10:25:04 2018 +0100 |
8537 |
+++ ./hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp Sat Dec 01 12:42:05 2018 -0800 |
8538 |
@@ -49,10 +49,11 @@ |
8539 |
|
8540 |
#define check_index(index, msg) \ |
8541 |
assert((index) < (_reserved.word_size() >> LogN_words), \ |
8542 |
- err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \ |
8543 |
+ err_msg("%s - index: " SIZE_FORMAT \ |
8544 |
+ ", _vs.committed_size: " SIZE_FORMAT, \ |
8545 |
msg, (index), (_reserved.word_size() >> LogN_words))); \ |
8546 |
assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \ |
8547 |
- err_msg("Index "SIZE_FORMAT" corresponding to "PTR_FORMAT \ |
8548 |
+ err_msg("Index " SIZE_FORMAT " corresponding to " PTR_FORMAT \ |
8549 |
" (%u) is not in committed area.", \ |
8550 |
(index), \ |
8551 |
p2i(address_for_index_raw(index)), \ |
8552 |
--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Sat Oct 06 10:25:04 2018 +0100 |
8553 |
+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Sat Dec 01 12:42:05 2018 -0800 |
8554 |
@@ -668,7 +668,7 @@ |
8555 |
jlong ret_val = now - _time_of_last_gc; |
8556 |
// XXX See note in genCollectedHeap::millis_since_last_gc(). |
8557 |
if (ret_val < 0) { |
8558 |
- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);) |
8559 |
+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);) |
8560 |
return 0; |
8561 |
} |
8562 |
return ret_val; |
8563 |
--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Sat Oct 06 10:25:04 2018 +0100 |
8564 |
+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Sat Dec 01 12:42:05 2018 -0800 |
8565 |
@@ -3291,7 +3291,7 @@ |
8566 |
jlong ret_val = now - _time_of_last_gc; |
8567 |
// XXX See note in genCollectedHeap::millis_since_last_gc(). |
8568 |
if (ret_val < 0) { |
8569 |
- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);) |
8570 |
+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);) |
8571 |
return 0; |
8572 |
} |
8573 |
return ret_val; |
8574 |
--- ./hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp Sat Oct 06 10:25:04 2018 +0100 |
8575 |
+++ ./hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp Sat Dec 01 12:42:05 2018 -0800 |
8576 |
@@ -98,10 +98,10 @@ |
8577 |
if (_allocated == 0) { |
8578 |
assert(_unused == 0, |
8579 |
err_msg("Inconsistency in PLAB stats: " |
8580 |
- "_allocated: "SIZE_FORMAT", " |
8581 |
- "_wasted: "SIZE_FORMAT", " |
8582 |
- "_unused: "SIZE_FORMAT", " |
8583 |
- "_used : "SIZE_FORMAT, |
8584 |
+ "_allocated: " SIZE_FORMAT ", " |
8585 |
+ "_wasted: " SIZE_FORMAT ", " |
8586 |
+ "_unused: " SIZE_FORMAT ", " |
8587 |
+ "_used : " SIZE_FORMAT, |
8588 |
_allocated, _wasted, _unused, _used)); |
8589 |
|
8590 |
_allocated = 1; |
8591 |
--- ./hotspot/src/share/vm/memory/genCollectedHeap.cpp Sat Oct 06 10:25:04 2018 +0100 |
8592 |
+++ ./hotspot/src/share/vm/memory/genCollectedHeap.cpp Sat Dec 01 12:42:05 2018 -0800 |
8593 |
@@ -1403,7 +1403,7 @@ |
8594 |
// back a time later than 'now'. |
8595 |
jlong retVal = now - tolgc_cl.time(); |
8596 |
if (retVal < 0) { |
8597 |
- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);) |
8598 |
+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, (int64_t) retVal);) |
8599 |
return 0; |
8600 |
} |
8601 |
return retVal; |
8602 |
--- ./hotspot/src/share/vm/memory/generation.hpp Sat Oct 06 10:25:04 2018 +0100 |
8603 |
+++ ./hotspot/src/share/vm/memory/generation.hpp Sat Dec 01 12:42:05 2018 -0800 |
8604 |
@@ -422,7 +422,7 @@ |
8605 |
// have to guard against non-monotonicity. |
8606 |
NOT_PRODUCT( |
8607 |
if (now < _time_of_last_gc) { |
8608 |
- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now); |
8609 |
+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now); |
8610 |
} |
8611 |
) |
8612 |
return _time_of_last_gc; |
8613 |
--- ./hotspot/src/share/vm/memory/referenceProcessor.cpp Sat Oct 06 10:25:04 2018 +0100 |
8614 |
+++ ./hotspot/src/share/vm/memory/referenceProcessor.cpp Sat Dec 01 12:42:05 2018 -0800 |
8615 |
@@ -161,7 +161,7 @@ |
8616 |
|
8617 |
NOT_PRODUCT( |
8618 |
if (now < _soft_ref_timestamp_clock) { |
8619 |
- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, |
8620 |
+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, |
8621 |
_soft_ref_timestamp_clock, now); |
8622 |
} |
8623 |
) |
8624 |
--- ./hotspot/src/share/vm/opto/lcm.cpp Sat Oct 06 10:25:04 2018 +0100 |
8625 |
+++ ./hotspot/src/share/vm/opto/lcm.cpp Sat Dec 01 12:42:05 2018 -0800 |
8626 |
@@ -49,7 +49,7 @@ |
8511 |
@@ -49,7 +49,7 @@ |
8627 |
// Check whether val is not-null-decoded compressed oop, |
8512 |
// Check whether val is not-null-decoded compressed oop, |
8628 |
// i.e. will grab into the base of the heap if it represents NULL. |
8513 |
// i.e. will grab into the base of the heap if it represents NULL. |
Lines 8632-8639
Link Here
|
8632 |
if (val && val->is_Mach()) { |
8517 |
if (val && val->is_Mach()) { |
8633 |
if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) { |
8518 |
if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) { |
8634 |
// This assumes all Decodes with TypePtr::NotNull are matched to nodes that |
8519 |
// This assumes all Decodes with TypePtr::NotNull are matched to nodes that |
8635 |
--- ./hotspot/src/share/vm/opto/loopPredicate.cpp Sat Oct 06 10:25:04 2018 +0100 |
8520 |
--- ./hotspot/src/share/vm/opto/loopPredicate.cpp Sat Jun 23 21:01:40 2018 -0700 |
8636 |
+++ ./hotspot/src/share/vm/opto/loopPredicate.cpp Sat Dec 01 12:42:05 2018 -0800 |
8521 |
+++ ./hotspot/src/share/vm/opto/loopPredicate.cpp Mon Sep 03 11:13:04 2018 -0700 |
8637 |
@@ -869,7 +869,7 @@ |
8522 |
@@ -869,7 +869,7 @@ |
8638 |
Node* idx = cmp->in(1); |
8523 |
Node* idx = cmp->in(1); |
8639 |
assert(!invar.is_invariant(idx), "index is variant"); |
8524 |
assert(!invar.is_invariant(idx), "index is variant"); |
Lines 8643-8650
Link Here
|
8643 |
assert(invar.is_invariant(rng), "range must be invariant"); |
8528 |
assert(invar.is_invariant(rng), "range must be invariant"); |
8644 |
int scale = 1; |
8529 |
int scale = 1; |
8645 |
Node* offset = zero; |
8530 |
Node* offset = zero; |
8646 |
--- ./hotspot/src/share/vm/opto/node.cpp Sat Oct 06 10:25:04 2018 +0100 |
8531 |
--- ./hotspot/src/share/vm/opto/node.cpp Sat Jun 23 21:01:40 2018 -0700 |
8647 |
+++ ./hotspot/src/share/vm/opto/node.cpp Sat Dec 01 12:42:05 2018 -0800 |
8532 |
+++ ./hotspot/src/share/vm/opto/node.cpp Mon Sep 03 11:13:04 2018 -0700 |
8648 |
@@ -286,6 +286,10 @@ |
8533 |
@@ -286,6 +286,10 @@ |
8649 |
#ifdef _MSC_VER // the IDX_INIT hack falls foul of warning C4355 |
8534 |
#ifdef _MSC_VER // the IDX_INIT hack falls foul of warning C4355 |
8650 |
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list |
8535 |
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list |
Lines 8667-8698
Link Here
|
8667 |
|
8552 |
|
8668 |
//------------------------------clone------------------------------------------ |
8553 |
//------------------------------clone------------------------------------------ |
8669 |
// Clone a Node. |
8554 |
// Clone a Node. |
8670 |
--- ./hotspot/src/share/vm/prims/unsafe.cpp Sat Oct 06 10:25:04 2018 +0100 |
8555 |
--- ./hotspot/src/share/vm/prims/whitebox.cpp Sat Jun 23 21:01:40 2018 -0700 |
8671 |
+++ ./hotspot/src/share/vm/prims/unsafe.cpp Sat Dec 01 12:42:05 2018 -0800 |
8556 |
+++ ./hotspot/src/share/vm/prims/whitebox.cpp Mon Sep 03 11:13:04 2018 -0700 |
8672 |
@@ -985,7 +985,7 @@ |
8557 |
@@ -158,7 +158,7 @@ |
8673 |
UNSAFE_END |
|
|
8674 |
|
8675 |
|
8676 |
-#define DAC_Args CLS"[B["OBJ |
8677 |
+#define DAC_Args CLS "[B[" OBJ |
8678 |
// define a class but do not make it known to the class loader or system dictionary |
8679 |
// - host_class: supplies context for linkage, access control, protection domain, and class loader |
8680 |
// - data: bytes of a class file, a raw memory address (length gives the number of bytes) |
8681 |
--- ./hotspot/src/share/vm/prims/whitebox.cpp Sat Oct 06 10:25:04 2018 +0100 |
8682 |
+++ ./hotspot/src/share/vm/prims/whitebox.cpp Sat Dec 01 12:42:05 2018 -0800 |
8683 |
@@ -158,8 +158,10 @@ |
8684 |
} |
8558 |
} |
8685 |
WB_END |
8559 |
WB_END |
8686 |
|
8560 |
|
8687 |
-#ifdef LINUX |
8561 |
-#ifdef LINUX |
8688 |
+#if defined(LINUX) || defined(_ALLBSD_SOURCE) |
8562 |
+#if defined(LINUX) || defined(_ALLBSD_SOURCE) |
8689 |
#include "utilities/elfFile.hpp" |
8563 |
#include "utilities/elfFile.hpp" |
8690 |
+#endif |
|
|
8691 |
+#if defined(LINUX) |
8692 |
#include "osContainer_linux.hpp" |
8693 |
#endif |
8564 |
#endif |
8694 |
|
8565 |
|
8695 |
@@ -1017,7 +1019,7 @@ |
8566 |
@@ -1016,7 +1016,7 @@ |
8696 |
// Checks that the library libfile has the noexecstack bit set. |
8567 |
// Checks that the library libfile has the noexecstack bit set. |
8697 |
WB_ENTRY(jboolean, WB_CheckLibSpecifiesNoexecstack(JNIEnv* env, jobject o, jstring libfile)) |
8568 |
WB_ENTRY(jboolean, WB_CheckLibSpecifiesNoexecstack(JNIEnv* env, jobject o, jstring libfile)) |
8698 |
jboolean ret = false; |
8569 |
jboolean ret = false; |
Lines 8701-8708
Link Here
|
8701 |
// Can't be in VM when we call JNI. |
8572 |
// Can't be in VM when we call JNI. |
8702 |
ThreadToNativeFromVM ttnfv(thread); |
8573 |
ThreadToNativeFromVM ttnfv(thread); |
8703 |
const char* lf = env->GetStringUTFChars(libfile, NULL); |
8574 |
const char* lf = env->GetStringUTFChars(libfile, NULL); |
8704 |
--- ./hotspot/src/share/vm/runtime/atomic.inline.hpp Sat Oct 06 10:25:04 2018 +0100 |
8575 |
--- ./hotspot/src/share/vm/runtime/atomic.inline.hpp Sat Jun 23 21:01:40 2018 -0700 |
8705 |
+++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp Sat Dec 01 12:42:05 2018 -0800 |
8576 |
+++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp Mon Sep 03 11:13:04 2018 -0700 |
8706 |
@@ -63,6 +63,9 @@ |
8577 |
@@ -63,6 +63,9 @@ |
8707 |
#endif |
8578 |
#endif |
8708 |
|
8579 |
|
Lines 8713-8720
Link Here
|
8713 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8584 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8714 |
# include "atomic_bsd_x86.inline.hpp" |
8585 |
# include "atomic_bsd_x86.inline.hpp" |
8715 |
#endif |
8586 |
#endif |
8716 |
--- ./hotspot/src/share/vm/runtime/globals.hpp Sat Oct 06 10:25:04 2018 +0100 |
8587 |
--- ./hotspot/src/share/vm/runtime/globals.hpp Sat Jun 23 21:01:40 2018 -0700 |
8717 |
+++ ./hotspot/src/share/vm/runtime/globals.hpp Sat Dec 01 12:42:05 2018 -0800 |
8588 |
+++ ./hotspot/src/share/vm/runtime/globals.hpp Mon Sep 03 11:13:04 2018 -0700 |
8718 |
@@ -94,6 +94,9 @@ |
8589 |
@@ -94,6 +94,9 @@ |
8719 |
#ifdef TARGET_OS_ARCH_aix_ppc |
8590 |
#ifdef TARGET_OS_ARCH_aix_ppc |
8720 |
# include "globals_aix_ppc.hpp" |
8591 |
# include "globals_aix_ppc.hpp" |
Lines 8725-8732
Link Here
|
8725 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8596 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8726 |
# include "globals_bsd_x86.hpp" |
8597 |
# include "globals_bsd_x86.hpp" |
8727 |
#endif |
8598 |
#endif |
8728 |
--- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Sat Oct 06 10:25:04 2018 +0100 |
8599 |
--- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Sat Jun 23 21:01:40 2018 -0700 |
8729 |
+++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Sat Dec 01 12:42:05 2018 -0800 |
8600 |
+++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Mon Sep 03 11:13:04 2018 -0700 |
8730 |
@@ -64,6 +64,9 @@ |
8601 |
@@ -64,6 +64,9 @@ |
8731 |
#endif |
8602 |
#endif |
8732 |
|
8603 |
|
Lines 8737-8745
Link Here
|
8737 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8608 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8738 |
# include "orderAccess_bsd_x86.inline.hpp" |
8609 |
# include "orderAccess_bsd_x86.inline.hpp" |
8739 |
#endif |
8610 |
#endif |
8740 |
--- ./hotspot/src/share/vm/runtime/os.cpp Sat Oct 06 10:25:04 2018 +0100 |
8611 |
--- ./hotspot/src/share/vm/runtime/os.cpp Sat Jun 23 21:01:40 2018 -0700 |
8741 |
+++ ./hotspot/src/share/vm/runtime/os.cpp Sat Dec 01 12:42:05 2018 -0800 |
8612 |
+++ ./hotspot/src/share/vm/runtime/os.cpp Mon Sep 03 11:13:04 2018 -0700 |
8742 |
@@ -434,15 +434,6 @@ |
8613 |
@@ -426,15 +426,6 @@ |
8743 |
if (_native_java_library == NULL) { |
8614 |
if (_native_java_library == NULL) { |
8744 |
vm_exit_during_initialization("Unable to load native library", ebuf); |
8615 |
vm_exit_during_initialization("Unable to load native library", ebuf); |
8745 |
} |
8616 |
} |
Lines 8755-8763
Link Here
|
8755 |
} |
8626 |
} |
8756 |
static jboolean onLoaded = JNI_FALSE; |
8627 |
static jboolean onLoaded = JNI_FALSE; |
8757 |
if (onLoaded) { |
8628 |
if (onLoaded) { |
8758 |
--- ./hotspot/src/share/vm/runtime/os.hpp Sat Oct 06 10:25:04 2018 +0100 |
8629 |
--- ./hotspot/src/share/vm/runtime/os.hpp Sat Jun 23 21:01:40 2018 -0700 |
8759 |
+++ ./hotspot/src/share/vm/runtime/os.hpp Sat Dec 01 12:42:05 2018 -0800 |
8630 |
+++ ./hotspot/src/share/vm/runtime/os.hpp Mon Sep 03 11:13:04 2018 -0700 |
8760 |
@@ -868,6 +868,9 @@ |
8631 |
@@ -843,6 +843,9 @@ |
8761 |
#ifdef TARGET_OS_ARCH_aix_ppc |
8632 |
#ifdef TARGET_OS_ARCH_aix_ppc |
8762 |
# include "os_aix_ppc.hpp" |
8633 |
# include "os_aix_ppc.hpp" |
8763 |
#endif |
8634 |
#endif |
Lines 8767-8774
Link Here
|
8767 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8638 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8768 |
# include "os_bsd_x86.hpp" |
8639 |
# include "os_bsd_x86.hpp" |
8769 |
#endif |
8640 |
#endif |
8770 |
--- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Sat Oct 06 10:25:04 2018 +0100 |
8641 |
--- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Sat Jun 23 21:01:40 2018 -0700 |
8771 |
+++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Sat Dec 01 12:42:05 2018 -0800 |
8642 |
+++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Mon Sep 03 11:13:04 2018 -0700 |
8772 |
@@ -63,6 +63,9 @@ |
8643 |
@@ -63,6 +63,9 @@ |
8773 |
#endif |
8644 |
#endif |
8774 |
|
8645 |
|
Lines 8779-8786
Link Here
|
8779 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8650 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8780 |
# include "prefetch_bsd_x86.inline.hpp" |
8651 |
# include "prefetch_bsd_x86.inline.hpp" |
8781 |
#endif |
8652 |
#endif |
8782 |
--- ./hotspot/src/share/vm/runtime/thread.hpp Sat Oct 06 10:25:04 2018 +0100 |
8653 |
--- ./hotspot/src/share/vm/runtime/thread.hpp Sat Jun 23 21:01:40 2018 -0700 |
8783 |
+++ ./hotspot/src/share/vm/runtime/thread.hpp Sat Dec 01 12:42:05 2018 -0800 |
8654 |
+++ ./hotspot/src/share/vm/runtime/thread.hpp Mon Sep 03 11:13:04 2018 -0700 |
8784 |
@@ -1730,6 +1730,9 @@ |
8655 |
@@ -1730,6 +1730,9 @@ |
8785 |
#ifdef TARGET_OS_ARCH_aix_ppc |
8656 |
#ifdef TARGET_OS_ARCH_aix_ppc |
8786 |
# include "thread_aix_ppc.hpp" |
8657 |
# include "thread_aix_ppc.hpp" |
Lines 8791-8798
Link Here
|
8791 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8662 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8792 |
# include "thread_bsd_x86.hpp" |
8663 |
# include "thread_bsd_x86.hpp" |
8793 |
#endif |
8664 |
#endif |
8794 |
--- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Sat Oct 06 10:25:04 2018 +0100 |
8665 |
--- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Sat Jun 23 21:01:40 2018 -0700 |
8795 |
+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Sat Dec 01 12:42:05 2018 -0800 |
8666 |
+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Mon Sep 03 11:13:04 2018 -0700 |
8796 |
@@ -75,6 +75,9 @@ |
8667 |
@@ -75,6 +75,9 @@ |
8797 |
#ifdef TARGET_OS_ARCH_aix_ppc |
8668 |
#ifdef TARGET_OS_ARCH_aix_ppc |
8798 |
# include "threadLS_aix_ppc.hpp" |
8669 |
# include "threadLS_aix_ppc.hpp" |
Lines 8803-8810
Link Here
|
8803 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8674 |
#ifdef TARGET_OS_ARCH_bsd_x86 |
8804 |
# include "threadLS_bsd_x86.hpp" |
8675 |
# include "threadLS_bsd_x86.hpp" |
8805 |
#endif |
8676 |
#endif |
8806 |
--- ./hotspot/src/share/vm/runtime/virtualspace.cpp Sat Oct 06 10:25:04 2018 +0100 |
8677 |
--- ./hotspot/src/share/vm/runtime/virtualspace.cpp Sat Jun 23 21:01:40 2018 -0700 |
8807 |
+++ ./hotspot/src/share/vm/runtime/virtualspace.cpp Sat Dec 01 12:42:05 2018 -0800 |
8678 |
+++ ./hotspot/src/share/vm/runtime/virtualspace.cpp Mon Sep 03 11:13:04 2018 -0700 |
8808 |
@@ -342,7 +342,7 @@ |
8679 |
@@ -342,7 +342,7 @@ |
8809 |
(UseCompressedOops && (Universe::narrow_oop_base() != NULL) && |
8680 |
(UseCompressedOops && (Universe::narrow_oop_base() != NULL) && |
8810 |
Universe::narrow_oop_use_implicit_null_checks()) ? |
8681 |
Universe::narrow_oop_use_implicit_null_checks()) ? |
Lines 8814-8821
Link Here
|
8814 |
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); |
8685 |
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); |
8815 |
} |
8686 |
} |
8816 |
|
8687 |
|
8817 |
--- ./hotspot/src/share/vm/runtime/vmStructs.cpp Sat Oct 06 10:25:04 2018 +0100 |
8688 |
--- ./hotspot/src/share/vm/runtime/vmStructs.cpp Sat Jun 23 21:01:40 2018 -0700 |
8818 |
+++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Sat Dec 01 12:42:05 2018 -0800 |
8689 |
+++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Mon Sep 03 11:13:04 2018 -0700 |
8819 |
@@ -146,6 +146,9 @@ |
8690 |
@@ -146,6 +146,9 @@ |
8820 |
#ifdef TARGET_OS_ARCH_aix_ppc |
8691 |
#ifdef TARGET_OS_ARCH_aix_ppc |
8821 |
# include "vmStructs_aix_ppc.hpp" |
8692 |
# include "vmStructs_aix_ppc.hpp" |
Lines 8835-8842
Link Here
|
8835 |
\ |
8706 |
\ |
8836 |
NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset))) \ |
8707 |
NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset))) \ |
8837 |
declare_constant(frame::pc_return_offset) \ |
8708 |
declare_constant(frame::pc_return_offset) \ |
8838 |
--- ./hotspot/src/share/vm/services/mallocSiteTable.hpp Sat Oct 06 10:25:04 2018 +0100 |
8709 |
--- ./hotspot/src/share/vm/services/mallocSiteTable.hpp Sat Jun 23 21:01:40 2018 -0700 |
8839 |
+++ ./hotspot/src/share/vm/services/mallocSiteTable.hpp Sat Dec 01 12:42:05 2018 -0800 |
8710 |
+++ ./hotspot/src/share/vm/services/mallocSiteTable.hpp Mon Sep 03 11:13:04 2018 -0700 |
8840 |
@@ -42,7 +42,7 @@ |
8711 |
@@ -42,7 +42,7 @@ |
8841 |
|
8712 |
|
8842 |
public: |
8713 |
public: |
Lines 8846-8853
Link Here
|
8846 |
|
8717 |
|
8847 |
MallocSite(const NativeCallStack& stack, MEMFLAGS flags) : |
8718 |
MallocSite(const NativeCallStack& stack, MEMFLAGS flags) : |
8848 |
AllocationSite<MemoryCounter>(stack), _flags(flags) {} |
8719 |
AllocationSite<MemoryCounter>(stack), _flags(flags) {} |
8849 |
--- ./hotspot/src/share/vm/services/memTracker.cpp Sat Oct 06 10:25:04 2018 +0100 |
8720 |
--- ./hotspot/src/share/vm/services/memTracker.cpp Sat Jun 23 21:01:40 2018 -0700 |
8850 |
+++ ./hotspot/src/share/vm/services/memTracker.cpp Sat Dec 01 12:42:05 2018 -0800 |
8721 |
+++ ./hotspot/src/share/vm/services/memTracker.cpp Mon Sep 03 11:13:04 2018 -0700 |
8851 |
@@ -67,10 +67,6 @@ |
8722 |
@@ -67,10 +67,6 @@ |
8852 |
os::unsetenv(buf); |
8723 |
os::unsetenv(buf); |
8853 |
} |
8724 |
} |
Lines 8859-8866
Link Here
|
8859 |
if (!MallocTracker::initialize(level) || |
8730 |
if (!MallocTracker::initialize(level) || |
8860 |
!VirtualMemoryTracker::initialize(level)) { |
8731 |
!VirtualMemoryTracker::initialize(level)) { |
8861 |
level = NMT_off; |
8732 |
level = NMT_off; |
8862 |
--- ./hotspot/src/share/vm/services/memTracker.hpp Sat Oct 06 10:25:04 2018 +0100 |
8733 |
--- ./hotspot/src/share/vm/services/memTracker.hpp Sat Jun 23 21:01:40 2018 -0700 |
8863 |
+++ ./hotspot/src/share/vm/services/memTracker.hpp Sat Dec 01 12:42:05 2018 -0800 |
8734 |
+++ ./hotspot/src/share/vm/services/memTracker.hpp Mon Sep 03 11:13:04 2018 -0700 |
8864 |
@@ -31,8 +31,8 @@ |
8735 |
@@ -31,8 +31,8 @@ |
8865 |
|
8736 |
|
8866 |
#if !INCLUDE_NMT |
8737 |
#if !INCLUDE_NMT |
Lines 8884-8891
Link Here
|
8884 |
|
8755 |
|
8885 |
class MemBaseline; |
8756 |
class MemBaseline; |
8886 |
class Mutex; |
8757 |
class Mutex; |
8887 |
--- ./hotspot/src/share/vm/services/virtualMemoryTracker.cpp Sat Oct 06 10:25:04 2018 +0100 |
8758 |
--- ./hotspot/src/share/vm/services/virtualMemoryTracker.cpp Sat Jun 23 21:01:40 2018 -0700 |
8888 |
+++ ./hotspot/src/share/vm/services/virtualMemoryTracker.cpp Sat Dec 01 12:42:05 2018 -0800 |
8759 |
+++ ./hotspot/src/share/vm/services/virtualMemoryTracker.cpp Mon Sep 03 11:13:04 2018 -0700 |
8889 |
@@ -167,7 +167,7 @@ |
8760 |
@@ -167,7 +167,7 @@ |
8890 |
// higher part |
8761 |
// higher part |
8891 |
address high_base = addr + sz; |
8762 |
address high_base = addr + sz; |
Lines 8895-8902
Link Here
|
8895 |
return add_committed_region(high_rgn); |
8766 |
return add_committed_region(high_rgn); |
8896 |
} else { |
8767 |
} else { |
8897 |
return false; |
8768 |
return false; |
8898 |
--- ./hotspot/src/share/vm/services/virtualMemoryTracker.hpp Sat Oct 06 10:25:04 2018 +0100 |
8769 |
--- ./hotspot/src/share/vm/services/virtualMemoryTracker.hpp Sat Jun 23 21:01:40 2018 -0700 |
8899 |
+++ ./hotspot/src/share/vm/services/virtualMemoryTracker.hpp Sat Dec 01 12:42:05 2018 -0800 |
8770 |
+++ ./hotspot/src/share/vm/services/virtualMemoryTracker.hpp Mon Sep 03 11:13:04 2018 -0700 |
8900 |
@@ -305,7 +305,7 @@ |
8771 |
@@ -305,7 +305,7 @@ |
8901 |
|
8772 |
|
8902 |
|
8773 |
|
Lines 8906-8913
Link Here
|
8906 |
_all_committed(false) { } |
8777 |
_all_committed(false) { } |
8907 |
|
8778 |
|
8908 |
// Copy constructor |
8779 |
// Copy constructor |
8909 |
--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Sat Oct 06 10:25:04 2018 +0100 |
8780 |
--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Sat Jun 23 21:01:40 2018 -0700 |
8910 |
+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Sat Dec 01 12:42:05 2018 -0800 |
8781 |
+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Mon Sep 03 11:13:04 2018 -0700 |
8911 |
@@ -30,6 +30,11 @@ |
8782 |
@@ -30,6 +30,11 @@ |
8912 |
// This file holds compiler-dependent includes, |
8783 |
// This file holds compiler-dependent includes, |
8913 |
// globally used constants & types, class (forward) |
8784 |
// globally used constants & types, class (forward) |
Lines 8939-8946
Link Here
|
8939 |
#define CAN_USE_NAN_DEFINE 1 |
8810 |
#define CAN_USE_NAN_DEFINE 1 |
8940 |
#endif |
8811 |
#endif |
8941 |
|
8812 |
|
8942 |
--- ./hotspot/src/share/vm/utilities/nativeCallStack.cpp Sat Oct 06 10:25:04 2018 +0100 |
8813 |
--- ./hotspot/src/share/vm/utilities/nativeCallStack.cpp Sat Jun 23 21:01:40 2018 -0700 |
8943 |
+++ ./hotspot/src/share/vm/utilities/nativeCallStack.cpp Sat Dec 01 12:42:05 2018 -0800 |
8814 |
+++ ./hotspot/src/share/vm/utilities/nativeCallStack.cpp Mon Sep 03 11:13:04 2018 -0700 |
8944 |
@@ -27,7 +27,10 @@ |
8815 |
@@ -27,7 +27,10 @@ |
8945 |
#include "utilities/globalDefinitions.hpp" |
8816 |
#include "utilities/globalDefinitions.hpp" |
8946 |
#include "utilities/nativeCallStack.hpp" |
8817 |
#include "utilities/nativeCallStack.hpp" |
Lines 8953-8960
Link Here
|
8953 |
|
8824 |
|
8954 |
NativeCallStack::NativeCallStack(int toSkip, bool fillStack) : |
8825 |
NativeCallStack::NativeCallStack(int toSkip, bool fillStack) : |
8955 |
_hash_value(0) { |
8826 |
_hash_value(0) { |
8956 |
--- ./hotspot/src/share/vm/utilities/nativeCallStack.hpp Sat Oct 06 10:25:04 2018 +0100 |
8827 |
--- ./hotspot/src/share/vm/utilities/nativeCallStack.hpp Sat Jun 23 21:01:40 2018 -0700 |
8957 |
+++ ./hotspot/src/share/vm/utilities/nativeCallStack.hpp Sat Dec 01 12:42:05 2018 -0800 |
8828 |
+++ ./hotspot/src/share/vm/utilities/nativeCallStack.hpp Mon Sep 03 11:13:04 2018 -0700 |
8958 |
@@ -53,7 +53,7 @@ |
8829 |
@@ -53,7 +53,7 @@ |
8959 |
*/ |
8830 |
*/ |
8960 |
class NativeCallStack : public StackObj { |
8831 |
class NativeCallStack : public StackObj { |
Lines 8963-8971
Link Here
|
8963 |
+ static const NativeCallStack& EMPTY_STACK(); |
8834 |
+ static const NativeCallStack& EMPTY_STACK(); |
8964 |
|
8835 |
|
8965 |
private: |
8836 |
private: |
8966 |
address _stack[NMT_TrackingStackDepth]; |
8837 |
address _stack[NMT_TrackingStackDepth]; |
8967 |
--- ./hotspot/src/share/vm/utilities/vmError.cpp Sat Oct 06 10:25:04 2018 +0100 |
8838 |
--- ./hotspot/src/share/vm/utilities/vmError.cpp Sat Jun 23 21:01:40 2018 -0700 |
8968 |
+++ ./hotspot/src/share/vm/utilities/vmError.cpp Sat Dec 01 12:42:05 2018 -0800 |
8839 |
+++ ./hotspot/src/share/vm/utilities/vmError.cpp Mon Sep 03 11:13:04 2018 -0700 |
8969 |
@@ -22,7 +22,6 @@ |
8840 |
@@ -22,7 +22,6 @@ |
8970 |
* |
8841 |
* |
8971 |
*/ |
8842 |
*/ |
Lines 8974-8992
Link Here
|
8974 |
#include "precompiled.hpp" |
8845 |
#include "precompiled.hpp" |
8975 |
#include "compiler/compileBroker.hpp" |
8846 |
#include "compiler/compileBroker.hpp" |
8976 |
#include "gc_interface/collectedHeap.hpp" |
8847 |
#include "gc_interface/collectedHeap.hpp" |
8977 |
--- ./hotspot/src/share/vm/utilities/vmError.hpp Sat Oct 06 10:25:04 2018 +0100 |
8848 |
--- ./jdk/make/CompileDemos.gmk Sat Jun 23 21:02:10 2018 -0700 |
8978 |
+++ ./hotspot/src/share/vm/utilities/vmError.hpp Sat Dec 01 12:42:05 2018 -0800 |
8849 |
+++ ./jdk/make/CompileDemos.gmk Sun Sep 02 07:33:40 2018 -0700 |
8979 |
@@ -34,7 +34,7 @@ |
|
|
8980 |
friend class VM_ReportJavaOutOfMemory; |
8981 |
friend class Decoder; |
8982 |
|
8983 |
- int _id; // Solaris/Linux signals: 0 - SIGRTMAX |
8984 |
+ unsigned int _id; // Solaris/Linux signals: 0 - SIGRTMAX |
8985 |
// Windows exceptions: 0xCxxxxxxx system errors |
8986 |
// 0x8xxxxxxx system warnings |
8987 |
|
8988 |
--- ./jdk/make/CompileDemos.gmk Sat Oct 06 10:26:40 2018 +0100 |
8989 |
+++ ./jdk/make/CompileDemos.gmk Sat Dec 01 12:24:15 2018 -0800 |
8990 |
@@ -323,7 +323,7 @@ |
8850 |
@@ -323,7 +323,7 @@ |
8991 |
$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \ |
8851 |
$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \ |
8992 |
-I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \ |
8852 |
-I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \ |
Lines 8996-9003
Link Here
|
8996 |
|
8856 |
|
8997 |
$(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo)) |
8857 |
$(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo)) |
8998 |
$(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo)) |
8858 |
$(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo)) |
8999 |
--- ./jdk/make/CompileJavaClasses.gmk Sat Oct 06 10:26:40 2018 +0100 |
8859 |
--- ./jdk/make/CompileJavaClasses.gmk Sat Jun 23 21:02:10 2018 -0700 |
9000 |
+++ ./jdk/make/CompileJavaClasses.gmk Sat Dec 01 12:24:15 2018 -0800 |
8860 |
+++ ./jdk/make/CompileJavaClasses.gmk Sun Sep 02 07:33:40 2018 -0700 |
9001 |
@@ -128,23 +128,32 @@ |
8861 |
@@ -128,23 +128,32 @@ |
9002 |
sun/nio/fs/LinuxFileStore.java \ |
8862 |
sun/nio/fs/LinuxFileStore.java \ |
9003 |
sun/nio/fs/LinuxFileSystem.java \ |
8863 |
sun/nio/fs/LinuxFileSystem.java \ |
Lines 9099-9106
Link Here
|
9099 |
$(CLOSED_SRC_DIRS), \ |
8959 |
$(CLOSED_SRC_DIRS), \ |
9100 |
INCLUDES := $(SECURITY_PKGS), \ |
8960 |
INCLUDES := $(SECURITY_PKGS), \ |
9101 |
EXCLUDES := $(EXCLUDES), \ |
8961 |
EXCLUDES := $(EXCLUDES), \ |
9102 |
--- ./jdk/make/CompileLaunchers.gmk Sat Oct 06 10:26:40 2018 +0100 |
8962 |
--- ./jdk/make/CompileLaunchers.gmk Sat Jun 23 21:02:10 2018 -0700 |
9103 |
+++ ./jdk/make/CompileLaunchers.gmk Sat Dec 01 12:24:15 2018 -0800 |
8963 |
+++ ./jdk/make/CompileLaunchers.gmk Sun Sep 02 07:33:40 2018 -0700 |
9104 |
@@ -49,7 +49,7 @@ |
8964 |
@@ -49,7 +49,7 @@ |
9105 |
ORIGIN_ROOT := /.. |
8965 |
ORIGIN_ROOT := /.. |
9106 |
endif |
8966 |
endif |
Lines 9205-9212
Link Here
|
9205 |
BUILD_JSPAWNHELPER := 1 |
9065 |
BUILD_JSPAWNHELPER := 1 |
9206 |
endif |
9066 |
endif |
9207 |
|
9067 |
|
9208 |
--- ./jdk/make/CopyFiles.gmk Sat Oct 06 10:26:40 2018 +0100 |
9068 |
--- ./jdk/make/CopyFiles.gmk Sat Jun 23 21:02:10 2018 -0700 |
9209 |
+++ ./jdk/make/CopyFiles.gmk Sat Dec 01 12:24:15 2018 -0800 |
9069 |
+++ ./jdk/make/CopyFiles.gmk Sun Sep 02 07:33:40 2018 -0700 |
9210 |
@@ -29,6 +29,8 @@ |
9070 |
@@ -29,6 +29,8 @@ |
9211 |
|
9071 |
|
9212 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
9072 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
Lines 9216-9222
Link Here
|
9216 |
else ifeq ($(OPENJDK_TARGET_OS), macosx) |
9076 |
else ifeq ($(OPENJDK_TARGET_OS), macosx) |
9217 |
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin |
9077 |
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin |
9218 |
endif |
9078 |
endif |
9219 |
@@ -335,23 +337,23 @@ |
9079 |
@@ -323,23 +325,23 @@ |
9220 |
$(RM) $(@) |
9080 |
$(RM) $(@) |
9221 |
# Now check for other permutations |
9081 |
# Now check for other permutations |
9222 |
ifeq ($(JVM_VARIANT_SERVER), true) |
9082 |
ifeq ($(JVM_VARIANT_SERVER), true) |
Lines 9249-9256
Link Here
|
9249 |
endif |
9109 |
endif |
9250 |
endif |
9110 |
endif |
9251 |
endif |
9111 |
endif |
9252 |
--- ./jdk/make/Images.gmk Sat Oct 06 10:26:40 2018 +0100 |
9112 |
--- ./jdk/make/Images.gmk Sat Jun 23 21:02:10 2018 -0700 |
9253 |
+++ ./jdk/make/Images.gmk Sat Dec 01 12:24:15 2018 -0800 |
9113 |
+++ ./jdk/make/Images.gmk Sun Sep 02 07:33:40 2018 -0700 |
9254 |
@@ -236,11 +236,11 @@ |
9114 |
@@ -236,11 +236,11 @@ |
9255 |
endif |
9115 |
endif |
9256 |
|
9116 |
|
Lines 9321-9327
Link Here
|
9321 |
|
9181 |
|
9322 |
################################################################################ |
9182 |
################################################################################ |
9323 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
9183 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
9324 |
+++ ./jdk/make/data/classlist/classlist.bsd Sat Dec 01 12:24:15 2018 -0800 |
9184 |
+++ ./jdk/make/data/classlist/classlist.bsd Sun Sep 02 07:33:40 2018 -0700 |
9325 |
@@ -0,0 +1,2559 @@ |
9185 |
@@ -0,0 +1,2559 @@ |
9326 |
+java/lang/Object |
9186 |
+java/lang/Object |
9327 |
+java/lang/String |
9187 |
+java/lang/String |
Lines 11882-11889
Link Here
|
11882 |
+java/awt/MenuBar |
11742 |
+java/awt/MenuBar |
11883 |
+sun/awt/X11/XErrorEvent |
11743 |
+sun/awt/X11/XErrorEvent |
11884 |
+# eea35d9d56e0006e |
11744 |
+# eea35d9d56e0006e |
11885 |
--- ./jdk/make/gendata/GendataFontConfig.gmk Sat Oct 06 10:26:40 2018 +0100 |
11745 |
--- ./jdk/make/gendata/GendataFontConfig.gmk Sat Jun 23 21:02:10 2018 -0700 |
11886 |
+++ ./jdk/make/gendata/GendataFontConfig.gmk Sat Dec 01 12:24:15 2018 -0800 |
11746 |
+++ ./jdk/make/gendata/GendataFontConfig.gmk Sun Sep 02 07:33:40 2018 -0700 |
11887 |
@@ -73,6 +73,13 @@ |
11747 |
@@ -73,6 +73,13 @@ |
11888 |
GENDATA_FONT_CONFIG_SRC_PREFIX := aix. |
11748 |
GENDATA_FONT_CONFIG_SRC_PREFIX := aix. |
11889 |
endif |
11749 |
endif |
Lines 11898-11906
Link Here
|
11898 |
### |
11758 |
### |
11899 |
|
11759 |
|
11900 |
$(GENDATA_FONT_CONFIG_DST)/%.src: \ |
11760 |
$(GENDATA_FONT_CONFIG_DST)/%.src: \ |
11901 |
--- ./jdk/make/lib/Awt2dLibraries.gmk Sat Oct 06 10:26:40 2018 +0100 |
11761 |
--- ./jdk/make/lib/Awt2dLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 |
11902 |
+++ ./jdk/make/lib/Awt2dLibraries.gmk Sat Dec 01 12:24:15 2018 -0800 |
11762 |
+++ ./jdk/make/lib/Awt2dLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 |
11903 |
@@ -306,7 +306,7 @@ |
11763 |
@@ -309,7 +309,7 @@ |
11904 |
debug_trace.c \ |
11764 |
debug_trace.c \ |
11905 |
debug_util.c |
11765 |
debug_util.c |
11906 |
|
11766 |
|
Lines 11909-11915
Link Here
|
11909 |
LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c |
11769 |
LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c |
11910 |
endif |
11770 |
endif |
11911 |
|
11771 |
|
11912 |
@@ -477,6 +477,7 @@ |
11772 |
@@ -481,6 +481,7 @@ |
11913 |
LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \ |
11773 |
LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \ |
11914 |
LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \ |
11774 |
LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \ |
11915 |
LDFLAGS_SUFFIX_aix :=-ljvm $(LIBM) $(LIBDL) -ljava -lm,\ |
11775 |
LDFLAGS_SUFFIX_aix :=-ljvm $(LIBM) $(LIBDL) -ljava -lm,\ |
Lines 11917-11923
Link Here
|
11917 |
LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \ |
11777 |
LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \ |
11918 |
-framework Cocoa \ |
11778 |
-framework Cocoa \ |
11919 |
-framework OpenGL \ |
11779 |
-framework OpenGL \ |
11920 |
@@ -553,6 +554,16 @@ |
11780 |
@@ -557,6 +558,16 @@ |
11921 |
endif |
11781 |
endif |
11922 |
endif |
11782 |
endif |
11923 |
|
11783 |
|
Lines 11934-11940
Link Here
|
11934 |
ifeq ($(MILESTONE), internal) |
11794 |
ifeq ($(MILESTONE), internal) |
11935 |
LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD |
11795 |
LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD |
11936 |
endif |
11796 |
endif |
11937 |
@@ -621,6 +632,11 @@ |
11797 |
@@ -625,6 +636,11 @@ |
11938 |
LIBAWT_XAWT_LDFLAGS += -lpthread |
11798 |
LIBAWT_XAWT_LDFLAGS += -lpthread |
11939 |
endif |
11799 |
endif |
11940 |
|
11800 |
|
Lines 11946-11960
Link Here
|
11946 |
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \ |
11806 |
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \ |
11947 |
LIBRARY := awt_xawt, \ |
11807 |
LIBRARY := awt_xawt, \ |
11948 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
11808 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
11949 |
@@ -635,6 +651,7 @@ |
11809 |
@@ -646,6 +662,7 @@ |
11950 |
$(X_LIBS) $(LIBAWT_XAWT_LDFLAGS) \ |
11810 |
-R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \ |
11951 |
$(call SET_SHARED_LIBRARY_ORIGIN) \ |
11811 |
$(call SET_SHARED_LIBRARY_ORIGIN) \ |
11952 |
$(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
11812 |
$(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
11953 |
+ LDFLAGS_bsd := $(call SET_SHARED_LIBRARY_ORIGIN), \ |
11813 |
+ LDFLAGS_bsd := $(call SET_SHARED_LIBRARY_ORIGIN), \ |
11954 |
LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \ |
11814 |
LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \ |
11955 |
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
11815 |
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
11956 |
RC_FLAGS := $(RC_FLAGS) \ |
11816 |
RC_FLAGS := $(RC_FLAGS) \ |
11957 |
@@ -678,6 +695,7 @@ |
11817 |
@@ -689,6 +706,7 @@ |
11958 |
LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \ |
11818 |
LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \ |
11959 |
LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \ |
11819 |
LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \ |
11960 |
LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\ |
11820 |
LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\ |
Lines 11962-11968
Link Here
|
11962 |
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
11822 |
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
11963 |
RC_FLAGS := $(RC_FLAGS) \ |
11823 |
RC_FLAGS := $(RC_FLAGS) \ |
11964 |
-D "JDK_FNAME=lcms.dll" \ |
11824 |
-D "JDK_FNAME=lcms.dll" \ |
11965 |
@@ -834,6 +852,7 @@ |
11825 |
@@ -847,6 +865,7 @@ |
11966 |
LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \ |
11826 |
LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \ |
11967 |
LDFLAGS_SUFFIX_aix := -ljvm -lawt -ljava,\ |
11827 |
LDFLAGS_SUFFIX_aix := -ljvm -lawt -ljava,\ |
11968 |
LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \ |
11828 |
LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \ |
Lines 11970-11976
Link Here
|
11970 |
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \ |
11830 |
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \ |
11971 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
11831 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
11972 |
|
11832 |
|
11973 |
@@ -916,6 +935,7 @@ |
11833 |
@@ -924,6 +943,7 @@ |
11974 |
LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
11834 |
LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
11975 |
LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ |
11835 |
LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ |
11976 |
LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\ |
11836 |
LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\ |
Lines 11978-11984
Link Here
|
11978 |
LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ |
11838 |
LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ |
11979 |
-ljava -ljvm, \ |
11839 |
-ljava -ljvm, \ |
11980 |
LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
11840 |
LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
11981 |
@@ -1059,6 +1079,7 @@ |
11841 |
@@ -1067,6 +1087,7 @@ |
11982 |
OPTIMIZATION := LOW, \ |
11842 |
OPTIMIZATION := LOW, \ |
11983 |
CFLAGS := $(CFLAGS_JDKLIB), \ |
11843 |
CFLAGS := $(CFLAGS_JDKLIB), \ |
11984 |
CFLAGS_linux := $(HEADLESS_CFLAG), \ |
11844 |
CFLAGS_linux := $(HEADLESS_CFLAG), \ |
Lines 11986-11992
Link Here
|
11986 |
CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \ |
11846 |
CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \ |
11987 |
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \ |
11847 |
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \ |
11988 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
11848 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
11989 |
@@ -1067,6 +1088,7 @@ |
11849 |
@@ -1075,6 +1096,7 @@ |
11990 |
LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ |
11850 |
LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ |
11991 |
LDFLAGS_SUFFIX_aix := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\ |
11851 |
LDFLAGS_SUFFIX_aix := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\ |
11992 |
LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \ |
11852 |
LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \ |
Lines 11994-12000
Link Here
|
11994 |
LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \ |
11854 |
LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \ |
11995 |
-framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \ |
11855 |
-framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \ |
11996 |
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \ |
11856 |
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \ |
11997 |
@@ -1185,7 +1207,7 @@ |
11857 |
@@ -1193,7 +1215,7 @@ |
11998 |
$(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen |
11858 |
$(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen |
11999 |
|
11859 |
|
12000 |
ifeq ($(USE_EXTERNAL_LIBGIF), true) |
11860 |
ifeq ($(USE_EXTERNAL_LIBGIF), true) |
Lines 12003-12019
Link Here
|
12003 |
else |
11863 |
else |
12004 |
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib |
11864 |
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib |
12005 |
GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib |
11865 |
GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib |
12006 |
@@ -1235,7 +1257,7 @@ |
11866 |
@@ -1226,6 +1248,11 @@ |
12007 |
-framework JavaNativeFoundation |
11867 |
LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 |
12008 |
else ifeq ($(OPENJDK_TARGET_OS), windows) |
11868 |
else ifeq ($(OPENJDK_TARGET_OS), solaris) |
12009 |
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll |
11869 |
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions |
12010 |
- else |
11870 |
+ else ifeq ($(OPENJDK_TARGET_OS), bsd) |
12011 |
+ else # .. all other Unixes can use X_LIBS |
11871 |
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include |
|
|
11872 |
+ ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) |
11873 |
+ LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG |
11874 |
+ endif |
11875 |
else |
11876 |
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) |
11877 |
endif |
11878 |
@@ -1248,6 +1275,8 @@ |
11879 |
else ifeq ($(OPENJDK_TARGET_OS), solaris) |
11880 |
# Solaris still uses OPENWIN_LIB .. |
11881 |
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread |
11882 |
+ else ifeq ($(OPENJDK_TARGET_OS), bsd) |
11883 |
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread |
11884 |
else # .. all other Unixes can use X_LIBS |
12012 |
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread |
11885 |
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread |
12013 |
endif |
11886 |
endif |
12014 |
|
11887 |
--- ./jdk/make/lib/CoreLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 |
12015 |
--- ./jdk/make/lib/CoreLibraries.gmk Sat Oct 06 10:26:40 2018 +0100 |
11888 |
+++ ./jdk/make/lib/CoreLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 |
12016 |
+++ ./jdk/make/lib/CoreLibraries.gmk Sat Dec 01 12:24:15 2018 -0800 |
|
|
12017 |
@@ -100,7 +100,7 @@ |
11889 |
@@ -100,7 +100,7 @@ |
12018 |
endif |
11890 |
endif |
12019 |
|
11891 |
|
Lines 12039-12045
Link Here
|
12039 |
LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \ |
11911 |
LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \ |
12040 |
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
11912 |
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
12041 |
RC_FLAGS := $(RC_FLAGS) \ |
11913 |
RC_FLAGS := $(RC_FLAGS) \ |
12042 |
@@ -407,7 +409,7 @@ |
11914 |
@@ -402,7 +404,7 @@ |
12043 |
# Append defines depending on target platform |
11915 |
# Append defines depending on target platform |
12044 |
LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS) |
11916 |
LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS) |
12045 |
|
11917 |
|
Lines 12048-12054
Link Here
|
12048 |
LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" |
11920 |
LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" |
12049 |
endif |
11921 |
endif |
12050 |
|
11922 |
|
12051 |
@@ -442,11 +444,13 @@ |
11923 |
@@ -437,11 +439,13 @@ |
12052 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
11924 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
12053 |
LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
11925 |
LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
12054 |
LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
11926 |
LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
Lines 12062-12068
Link Here
|
12062 |
LDFLAGS_SUFFIX_windows := \ |
11934 |
LDFLAGS_SUFFIX_windows := \ |
12063 |
-export:JLI_Launch \ |
11935 |
-export:JLI_Launch \ |
12064 |
-export:JLI_ManifestIterate \ |
11936 |
-export:JLI_ManifestIterate \ |
12065 |
@@ -490,9 +494,9 @@ |
11937 |
@@ -485,9 +489,9 @@ |
12066 |
|
11938 |
|
12067 |
BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC) |
11939 |
BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC) |
12068 |
|
11940 |
|
Lines 12074-12080
Link Here
|
12074 |
# code it here...rather than add support to NativeCompilation |
11946 |
# code it here...rather than add support to NativeCompilation |
12075 |
# as this is first time I see it |
11947 |
# as this is first time I see it |
12076 |
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ |
11948 |
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ |
12077 |
@@ -531,6 +535,13 @@ |
11949 |
@@ -526,6 +530,13 @@ |
12078 |
|
11950 |
|
12079 |
########################################################################################## |
11951 |
########################################################################################## |
12080 |
|
11952 |
|
Lines 12088-12094
Link Here
|
12088 |
$(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \ |
11960 |
$(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \ |
12089 |
LIBRARY := npt, \ |
11961 |
LIBRARY := npt, \ |
12090 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
11962 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
12091 |
@@ -540,9 +551,11 @@ |
11963 |
@@ -535,9 +546,11 @@ |
12092 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
11964 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
12093 |
-I$(JDK_TOPDIR)/src/share/npt \ |
11965 |
-I$(JDK_TOPDIR)/src/share/npt \ |
12094 |
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \ |
11966 |
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \ |
Lines 12100-12107
Link Here
|
12100 |
LDFLAGS_macosx := -liconv, \ |
11972 |
LDFLAGS_macosx := -liconv, \ |
12101 |
LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \ |
11973 |
LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \ |
12102 |
LDFLAGS_SUFFIX_solaris := -lc, \ |
11974 |
LDFLAGS_SUFFIX_solaris := -lc, \ |
12103 |
--- ./jdk/make/lib/NetworkingLibraries.gmk Sat Oct 06 10:26:40 2018 +0100 |
11975 |
--- ./jdk/make/lib/NetworkingLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 |
12104 |
+++ ./jdk/make/lib/NetworkingLibraries.gmk Sat Dec 01 12:24:15 2018 -0800 |
11976 |
+++ ./jdk/make/lib/NetworkingLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 |
12105 |
@@ -42,7 +42,7 @@ |
11977 |
@@ -42,7 +42,7 @@ |
12106 |
LIBNET_EXCLUDE_FILES += linux_close.c |
11978 |
LIBNET_EXCLUDE_FILES += linux_close.c |
12107 |
endif |
11979 |
endif |
Lines 12130-12137
Link Here
|
12130 |
LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \ |
12002 |
LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \ |
12131 |
delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \ |
12003 |
delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \ |
12132 |
-DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \ |
12004 |
-DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \ |
12133 |
--- ./jdk/make/lib/NioLibraries.gmk Sat Oct 06 10:26:40 2018 +0100 |
12005 |
--- ./jdk/make/lib/NioLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 |
12134 |
+++ ./jdk/make/lib/NioLibraries.gmk Sat Dec 01 12:24:15 2018 -0800 |
12006 |
+++ ./jdk/make/lib/NioLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 |
12135 |
@@ -77,9 +77,28 @@ |
12007 |
@@ -77,9 +77,28 @@ |
12136 |
UnixNativeDispatcher.c |
12008 |
UnixNativeDispatcher.c |
12137 |
endif |
12009 |
endif |
Lines 12192-12199
Link Here
|
12192 |
endif |
12064 |
endif |
12193 |
+ endif |
12065 |
+ endif |
12194 |
endif |
12066 |
endif |
12195 |
--- ./jdk/make/lib/ServiceabilityLibraries.gmk Sat Oct 06 10:26:40 2018 +0100 |
12067 |
--- ./jdk/make/lib/ServiceabilityLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 |
12196 |
+++ ./jdk/make/lib/ServiceabilityLibraries.gmk Sat Dec 01 12:24:15 2018 -0800 |
12068 |
+++ ./jdk/make/lib/ServiceabilityLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 |
12197 |
@@ -34,7 +34,7 @@ |
12069 |
@@ -34,7 +34,7 @@ |
12198 |
ifneq ($(OPENJDK_TARGET_OS), linux) |
12070 |
ifneq ($(OPENJDK_TARGET_OS), linux) |
12199 |
LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c |
12071 |
LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c |
Lines 12277-12284
Link Here
|
12277 |
ifeq ($(ENABLE_DEBUG_SYMBOLS), true) |
12149 |
ifeq ($(ENABLE_DEBUG_SYMBOLS), true) |
12278 |
LIBHPROF_OPTIMIZATION := LOW |
12150 |
LIBHPROF_OPTIMIZATION := LOW |
12279 |
endif |
12151 |
endif |
12280 |
--- ./jdk/make/lib/SoundLibraries.gmk Sat Oct 06 10:26:40 2018 +0100 |
12152 |
--- ./jdk/make/lib/SoundLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 |
12281 |
+++ ./jdk/make/lib/SoundLibraries.gmk Sat Dec 01 12:24:15 2018 -0800 |
12153 |
+++ ./jdk/make/lib/SoundLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 |
12282 |
@@ -75,6 +75,13 @@ |
12154 |
@@ -75,6 +75,13 @@ |
12283 |
LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX |
12155 |
LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX |
12284 |
endif # OPENJDK_TARGET_OS aix |
12156 |
endif # OPENJDK_TARGET_OS aix |
Lines 12310-12317
Link Here
|
12310 |
LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \ |
12182 |
LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \ |
12311 |
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \ |
12183 |
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \ |
12312 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
12184 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
12313 |
--- ./jdk/make/mapfiles/launchers/mapfile-ppc64 Sat Oct 06 10:26:40 2018 +0100 |
12185 |
--- ./jdk/make/mapfiles/launchers/mapfile-ppc64 Sat Jun 23 21:02:10 2018 -0700 |
12314 |
+++ ./jdk/make/mapfiles/launchers/mapfile-ppc64 Sat Dec 01 12:24:15 2018 -0800 |
12186 |
+++ ./jdk/make/mapfiles/launchers/mapfile-ppc64 Sun Sep 02 07:33:40 2018 -0700 |
12315 |
@@ -33,6 +33,7 @@ |
12187 |
@@ -33,6 +33,7 @@ |
12316 |
environ; # Public symbols and required by Java run time |
12188 |
environ; # Public symbols and required by Java run time |
12317 |
_environ; |
12189 |
_environ; |
Lines 12320-12327
Link Here
|
12320 |
|
12192 |
|
12321 |
local: |
12193 |
local: |
12322 |
*; |
12194 |
*; |
12323 |
--- ./jdk/make/mapfiles/launchers/mapfile-x86 Sat Oct 06 10:26:40 2018 +0100 |
12195 |
--- ./jdk/make/mapfiles/launchers/mapfile-x86 Sat Jun 23 21:02:10 2018 -0700 |
12324 |
+++ ./jdk/make/mapfiles/launchers/mapfile-x86 Sat Dec 01 12:24:15 2018 -0800 |
12196 |
+++ ./jdk/make/mapfiles/launchers/mapfile-x86 Sun Sep 02 07:33:40 2018 -0700 |
12325 |
@@ -33,6 +33,7 @@ |
12197 |
@@ -33,6 +33,7 @@ |
12326 |
environ; # Public symbols and required by Java run time |
12198 |
environ; # Public symbols and required by Java run time |
12327 |
_environ; |
12199 |
_environ; |
Lines 12330-12337
Link Here
|
12330 |
___Argv; # The following are private, but as they are |
12202 |
___Argv; # The following are private, but as they are |
12331 |
_start; # exported from ctr1/crtn, the clever hacker |
12203 |
_start; # exported from ctr1/crtn, the clever hacker |
12332 |
_init; # might know about them. However note, that |
12204 |
_init; # might know about them. However note, that |
12333 |
--- ./jdk/make/mapfiles/launchers/mapfile-x86_64 Sat Oct 06 10:26:40 2018 +0100 |
12205 |
--- ./jdk/make/mapfiles/launchers/mapfile-x86_64 Sat Jun 23 21:02:10 2018 -0700 |
12334 |
+++ ./jdk/make/mapfiles/launchers/mapfile-x86_64 Sat Dec 01 12:24:15 2018 -0800 |
12206 |
+++ ./jdk/make/mapfiles/launchers/mapfile-x86_64 Sun Sep 02 07:33:40 2018 -0700 |
12335 |
@@ -33,6 +33,7 @@ |
12207 |
@@ -33,6 +33,7 @@ |
12336 |
environ; # Public symbols and required by Java run time |
12208 |
environ; # Public symbols and required by Java run time |
12337 |
_environ; |
12209 |
_environ; |
Lines 12341-12347
Link Here
|
12341 |
local: |
12213 |
local: |
12342 |
*; |
12214 |
*; |
12343 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12215 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12344 |
+++ ./jdk/make/mapfiles/libattach/mapfile-bsd Sat Dec 01 12:24:15 2018 -0800 |
12216 |
+++ ./jdk/make/mapfiles/libattach/mapfile-bsd Sun Sep 02 07:33:40 2018 -0700 |
12345 |
@@ -0,0 +1,42 @@ |
12217 |
@@ -0,0 +1,42 @@ |
12346 |
+# |
12218 |
+# |
12347 |
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. |
12219 |
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. |
Lines 12386-12392
Link Here
|
12386 |
+ *; |
12258 |
+ *; |
12387 |
+}; |
12259 |
+}; |
12388 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12260 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12389 |
+++ ./jdk/make/mapfiles/libnio/mapfile-bsd Sat Dec 01 12:24:15 2018 -0800 |
12261 |
+++ ./jdk/make/mapfiles/libnio/mapfile-bsd Sun Sep 02 07:33:40 2018 -0700 |
12390 |
@@ -0,0 +1,195 @@ |
12262 |
@@ -0,0 +1,195 @@ |
12391 |
+# |
12263 |
+# |
12392 |
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. |
12264 |
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 12583-12590
Link Here
|
12583 |
+ local: |
12455 |
+ local: |
12584 |
+ *; |
12456 |
+ *; |
12585 |
+}; |
12457 |
+}; |
12586 |
--- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Sat Oct 06 10:26:40 2018 +0100 |
12458 |
--- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Sat Jun 23 21:02:10 2018 -0700 |
12587 |
+++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Sat Dec 01 12:24:15 2018 -0800 |
12459 |
+++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Sun Sep 02 07:33:40 2018 -0700 |
12588 |
@@ -26,6 +26,9 @@ |
12460 |
@@ -26,6 +26,9 @@ |
12589 |
# Define library interface. |
12461 |
# Define library interface. |
12590 |
|
12462 |
|
Lines 12596-12602
Link Here
|
12596 |
*; |
12468 |
*; |
12597 |
}; |
12469 |
}; |
12598 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12470 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12599 |
+++ ./jdk/make/netbeans/common/bsd-sources.ent Sat Dec 01 12:24:15 2018 -0800 |
12471 |
+++ ./jdk/make/netbeans/common/bsd-sources.ent Sun Sep 02 07:33:40 2018 -0700 |
12600 |
@@ -0,0 +1,45 @@ |
12472 |
@@ -0,0 +1,45 @@ |
12601 |
+<?xml version="1.0" encoding="UTF-8"?> |
12473 |
+<?xml version="1.0" encoding="UTF-8"?> |
12602 |
+ |
12474 |
+ |
Lines 12644-12650
Link Here
|
12644 |
+ <location>${root}/src/bsd/classes</location> |
12516 |
+ <location>${root}/src/bsd/classes</location> |
12645 |
+</source-folder> |
12517 |
+</source-folder> |
12646 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12518 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12647 |
+++ ./jdk/make/netbeans/common/bsd-view.ent Sat Dec 01 12:24:15 2018 -0800 |
12519 |
+++ ./jdk/make/netbeans/common/bsd-view.ent Sun Sep 02 07:33:40 2018 -0700 |
12648 |
@@ -0,0 +1,39 @@ |
12520 |
@@ -0,0 +1,39 @@ |
12649 |
+<?xml version="1.0" encoding="UTF-8"?> |
12521 |
+<?xml version="1.0" encoding="UTF-8"?> |
12650 |
+ |
12522 |
+ |
Lines 12685-12692
Link Here
|
12685 |
+ <includes>${includes}</includes> |
12557 |
+ <includes>${includes}</includes> |
12686 |
+ <excludes>${excludes}</excludes> |
12558 |
+ <excludes>${excludes}</excludes> |
12687 |
+</source-folder> |
12559 |
+</source-folder> |
12688 |
--- ./jdk/make/netbeans/common/java-data-native.ent Sat Oct 06 10:26:40 2018 +0100 |
12560 |
--- ./jdk/make/netbeans/common/java-data-native.ent Sat Jun 23 21:02:10 2018 -0700 |
12689 |
+++ ./jdk/make/netbeans/common/java-data-native.ent Sat Dec 01 12:24:15 2018 -0800 |
12561 |
+++ ./jdk/make/netbeans/common/java-data-native.ent Sun Sep 02 07:33:40 2018 -0700 |
12690 |
@@ -34,6 +34,7 @@ |
12562 |
@@ -34,6 +34,7 @@ |
12691 |
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4"> |
12563 |
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4"> |
12692 |
<compilation-unit> |
12564 |
<compilation-unit> |
Lines 12695-12702
Link Here
|
12695 |
<package-root>${root}/src/macosx/classes</package-root> |
12567 |
<package-root>${root}/src/macosx/classes</package-root> |
12696 |
<package-root>${root}/src/solaris/classes</package-root> |
12568 |
<package-root>${root}/src/solaris/classes</package-root> |
12697 |
<package-root>${root}/src/windows/classes</package-root> |
12569 |
<package-root>${root}/src/windows/classes</package-root> |
12698 |
--- ./jdk/make/netbeans/common/make.xml Sat Oct 06 10:26:40 2018 +0100 |
12570 |
--- ./jdk/make/netbeans/common/make.xml Sat Jun 23 21:02:10 2018 -0700 |
12699 |
+++ ./jdk/make/netbeans/common/make.xml Sat Dec 01 12:24:15 2018 -0800 |
12571 |
+++ ./jdk/make/netbeans/common/make.xml Sun Sep 02 07:33:40 2018 -0700 |
12700 |
@@ -32,16 +32,21 @@ |
12572 |
@@ -32,16 +32,21 @@ |
12701 |
--> |
12573 |
--> |
12702 |
|
12574 |
|
Lines 12731-12738
Link Here
|
12731 |
<macrodef name="make-run"> |
12603 |
<macrodef name="make-run"> |
12732 |
<attribute name="target"/> |
12604 |
<attribute name="target"/> |
12733 |
<attribute name="dir"/> |
12605 |
<attribute name="dir"/> |
12734 |
--- ./jdk/make/netbeans/j2se/nbproject/project.xml Sat Oct 06 10:26:40 2018 +0100 |
12606 |
--- ./jdk/make/netbeans/j2se/nbproject/project.xml Sat Jun 23 21:02:10 2018 -0700 |
12735 |
+++ ./jdk/make/netbeans/j2se/nbproject/project.xml Sat Dec 01 12:24:15 2018 -0800 |
12607 |
+++ ./jdk/make/netbeans/j2se/nbproject/project.xml Sun Sep 02 07:33:40 2018 -0700 |
12736 |
@@ -34,6 +34,7 @@ |
12608 |
@@ -34,6 +34,7 @@ |
12737 |
<!DOCTYPE project [ |
12609 |
<!DOCTYPE project [ |
12738 |
<!ENTITY properties SYSTEM "../../common/properties.ent"> |
12610 |
<!ENTITY properties SYSTEM "../../common/properties.ent"> |
Lines 12765-12772
Link Here
|
12765 |
&macosx-view; |
12637 |
&macosx-view; |
12766 |
&unix-view; |
12638 |
&unix-view; |
12767 |
&windows-view; |
12639 |
&windows-view; |
12768 |
--- ./jdk/make/netbeans/world/nbproject/project.xml Sat Oct 06 10:26:40 2018 +0100 |
12640 |
--- ./jdk/make/netbeans/world/nbproject/project.xml Sat Jun 23 21:02:10 2018 -0700 |
12769 |
+++ ./jdk/make/netbeans/world/nbproject/project.xml Sat Dec 01 12:24:15 2018 -0800 |
12641 |
+++ ./jdk/make/netbeans/world/nbproject/project.xml Sun Sep 02 07:33:40 2018 -0700 |
12770 |
@@ -34,12 +34,14 @@ |
12642 |
@@ -34,12 +34,14 @@ |
12771 |
<!DOCTYPE project [ |
12643 |
<!DOCTYPE project [ |
12772 |
<!ENTITY properties SYSTEM "../../common/properties.ent"> |
12644 |
<!ENTITY properties SYSTEM "../../common/properties.ent"> |
Lines 12799-12805
Link Here
|
12799 |
&unix-view; |
12671 |
&unix-view; |
12800 |
&windows-view; |
12672 |
&windows-view; |
12801 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12673 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12802 |
+++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java Sat Dec 01 12:24:15 2018 -0800 |
12674 |
+++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java Sun Sep 02 07:33:40 2018 -0700 |
12803 |
@@ -0,0 +1,97 @@ |
12675 |
@@ -0,0 +1,97 @@ |
12804 |
+/* |
12676 |
+/* |
12805 |
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
12677 |
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 12899-12905
Link Here
|
12899 |
+ } |
12771 |
+ } |
12900 |
+} |
12772 |
+} |
12901 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12773 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12902 |
+++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java Sat Dec 01 12:24:15 2018 -0800 |
12774 |
+++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java Sun Sep 02 07:33:40 2018 -0700 |
12903 |
@@ -0,0 +1,48 @@ |
12775 |
@@ -0,0 +1,48 @@ |
12904 |
+/* |
12776 |
+/* |
12905 |
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
12777 |
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
Lines 12950-12956
Link Here
|
12950 |
+ |
12822 |
+ |
12951 |
+} |
12823 |
+} |
12952 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12824 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12953 |
+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java Sat Dec 01 12:24:15 2018 -0800 |
12825 |
+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java Sun Sep 02 07:33:40 2018 -0700 |
12954 |
@@ -0,0 +1,213 @@ |
12826 |
@@ -0,0 +1,213 @@ |
12955 |
+/* |
12827 |
+/* |
12956 |
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
12828 |
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 13166-13172
Link Here
|
13166 |
+ private static native void interrupt(int fd); |
13038 |
+ private static native void interrupt(int fd); |
13167 |
+} |
13039 |
+} |
13168 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13040 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13169 |
+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java Sat Dec 01 12:24:15 2018 -0800 |
13041 |
+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java Sun Sep 02 07:33:40 2018 -0700 |
13170 |
@@ -0,0 +1,263 @@ |
13042 |
@@ -0,0 +1,263 @@ |
13171 |
+/* |
13043 |
+/* |
13172 |
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
13044 |
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
Lines 13432-13438
Link Here
|
13432 |
+ } |
13304 |
+ } |
13433 |
+} |
13305 |
+} |
13434 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13306 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13435 |
+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java Sat Dec 01 12:24:15 2018 -0800 |
13307 |
+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java Sun Sep 02 07:33:40 2018 -0700 |
13436 |
@@ -0,0 +1,44 @@ |
13308 |
@@ -0,0 +1,44 @@ |
13437 |
+/* |
13309 |
+/* |
13438 |
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
13310 |
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
Lines 13478-13485
Link Here
|
13478 |
+ return new KQueueSelectorImpl(this); |
13350 |
+ return new KQueueSelectorImpl(this); |
13479 |
+ } |
13351 |
+ } |
13480 |
+} |
13352 |
+} |
13481 |
--- ./jdk/src/bsd/doc/man/javah.1 Sat Oct 06 10:26:40 2018 +0100 |
13353 |
--- ./jdk/src/bsd/doc/man/javah.1 Sat Jun 23 21:02:10 2018 -0700 |
13482 |
+++ ./jdk/src/bsd/doc/man/javah.1 Sat Dec 01 12:24:15 2018 -0800 |
13354 |
+++ ./jdk/src/bsd/doc/man/javah.1 Sun Sep 02 07:33:40 2018 -0700 |
13483 |
@@ -8,7 +8,7 @@ |
13355 |
@@ -8,7 +8,7 @@ |
13484 |
.\" |
13356 |
.\" |
13485 |
.\" This code is distributed in the hope that it will be useful, but WITHOUT |
13357 |
.\" This code is distributed in the hope that it will be useful, but WITHOUT |
Lines 13498-13505
Link Here
|
13498 |
|
13370 |
|
13499 |
\fIWindows\fR: |
13371 |
\fIWindows\fR: |
13500 |
|
13372 |
|
13501 |
--- ./jdk/src/bsd/doc/man/rmic.1 Sat Oct 06 10:26:40 2018 +0100 |
13373 |
--- ./jdk/src/bsd/doc/man/rmic.1 Sat Jun 23 21:02:10 2018 -0700 |
13502 |
+++ ./jdk/src/bsd/doc/man/rmic.1 Sat Dec 01 12:24:15 2018 -0800 |
13374 |
+++ ./jdk/src/bsd/doc/man/rmic.1 Sun Sep 02 07:33:40 2018 -0700 |
13503 |
@@ -8,7 +8,7 @@ |
13375 |
@@ -8,7 +8,7 @@ |
13504 |
.\" |
13376 |
.\" |
13505 |
.\" This code is distributed in the hope that it will be useful, but WITHOUT |
13377 |
.\" This code is distributed in the hope that it will be useful, but WITHOUT |
Lines 13527-13534
Link Here
|
13527 |
.SH SEE\ ALSO |
13399 |
.SH SEE\ ALSO |
13528 |
.TP 0.2i |
13400 |
.TP 0.2i |
13529 |
\(bu |
13401 |
\(bu |
13530 |
--- ./jdk/src/bsd/doc/man/rmid.1 Sat Oct 06 10:26:40 2018 +0100 |
13402 |
--- ./jdk/src/bsd/doc/man/rmid.1 Sat Jun 23 21:02:10 2018 -0700 |
13531 |
+++ ./jdk/src/bsd/doc/man/rmid.1 Sat Dec 01 12:24:15 2018 -0800 |
13403 |
+++ ./jdk/src/bsd/doc/man/rmid.1 Sun Sep 02 07:33:40 2018 -0700 |
13532 |
@@ -8,7 +8,7 @@ |
13404 |
@@ -8,7 +8,7 @@ |
13533 |
.\" |
13405 |
.\" |
13534 |
.\" This code is distributed in the hope that it will be useful, but WITHOUT |
13406 |
.\" This code is distributed in the hope that it will be useful, but WITHOUT |
Lines 13548-13554
Link Here
|
13548 |
.TP 0.2i |
13420 |
.TP 0.2i |
13549 |
\(bu |
13421 |
\(bu |
13550 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13422 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13551 |
+++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c Sat Dec 01 12:24:15 2018 -0800 |
13423 |
+++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c Sun Sep 02 07:33:40 2018 -0700 |
13552 |
@@ -0,0 +1,171 @@ |
13424 |
@@ -0,0 +1,171 @@ |
13553 |
+/* |
13425 |
+/* |
13554 |
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
13426 |
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
Lines 13721-13727
Link Here
|
13721 |
+ } |
13593 |
+ } |
13722 |
+} |
13594 |
+} |
13723 |
+ |
13595 |
+ |
13724 |
--- ./jdk/src/macosx/classes/java/net/DefaultInterface.java Sat Oct 06 10:26:40 2018 +0100 |
13596 |
--- ./jdk/src/macosx/classes/java/net/DefaultInterface.java Sat Jun 23 21:02:10 2018 -0700 |
13725 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13597 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13726 |
@@ -1,97 +0,0 @@ |
13598 |
@@ -1,97 +0,0 @@ |
13727 |
-/* |
13599 |
-/* |
Lines 13821-13827
Link Here
|
13821 |
- return (ppp != null) ? ppp : loopback; |
13693 |
- return (ppp != null) ? ppp : loopback; |
13822 |
- } |
13694 |
- } |
13823 |
-} |
13695 |
-} |
13824 |
--- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java Sat Oct 06 10:26:40 2018 +0100 |
13696 |
--- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java Sat Jun 23 21:02:10 2018 -0700 |
13825 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13697 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13826 |
@@ -1,48 +0,0 @@ |
13698 |
@@ -1,48 +0,0 @@ |
13827 |
-/* |
13699 |
-/* |
Lines 13872-13878
Link Here
|
13872 |
- } |
13744 |
- } |
13873 |
- |
13745 |
- |
13874 |
-} |
13746 |
-} |
13875 |
--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Sat Oct 06 10:26:40 2018 +0100 |
13747 |
--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Sat Jun 23 21:02:10 2018 -0700 |
13876 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13748 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13877 |
@@ -1,213 +0,0 @@ |
13749 |
@@ -1,213 +0,0 @@ |
13878 |
-/* |
13750 |
-/* |
Lines 14088-14094
Link Here
|
14088 |
- long timeout); |
13960 |
- long timeout); |
14089 |
- private static native void interrupt(int fd); |
13961 |
- private static native void interrupt(int fd); |
14090 |
-} |
13962 |
-} |
14091 |
--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Sat Oct 06 10:26:40 2018 +0100 |
13963 |
--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Sat Jun 23 21:02:10 2018 -0700 |
14092 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
13964 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14093 |
@@ -1,263 +0,0 @@ |
13965 |
@@ -1,263 +0,0 @@ |
14094 |
-/* |
13966 |
-/* |
Lines 14354-14360
Link Here
|
14354 |
- return this; |
14226 |
- return this; |
14355 |
- } |
14227 |
- } |
14356 |
-} |
14228 |
-} |
14357 |
--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java Sat Oct 06 10:26:40 2018 +0100 |
14229 |
--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java Sat Jun 23 21:02:10 2018 -0700 |
14358 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14230 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14359 |
@@ -1,44 +0,0 @@ |
14231 |
@@ -1,44 +0,0 @@ |
14360 |
-/* |
14232 |
-/* |
Lines 14401-14407
Link Here
|
14401 |
- return new KQueueSelectorImpl(this); |
14273 |
- return new KQueueSelectorImpl(this); |
14402 |
- } |
14274 |
- } |
14403 |
-} |
14275 |
-} |
14404 |
--- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c Sat Oct 06 10:26:40 2018 +0100 |
14276 |
--- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c Sat Jun 23 21:02:10 2018 -0700 |
14405 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14277 |
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14406 |
@@ -1,171 +0,0 @@ |
14278 |
@@ -1,171 +0,0 @@ |
14407 |
-/* |
14279 |
-/* |
Lines 14575-14582
Link Here
|
14575 |
- } |
14447 |
- } |
14576 |
-} |
14448 |
-} |
14577 |
- |
14449 |
- |
14578 |
--- ./jdk/src/share/bin/jli_util.h Sat Oct 06 10:26:40 2018 +0100 |
14450 |
--- ./jdk/src/share/bin/jli_util.h Sat Jun 23 21:02:10 2018 -0700 |
14579 |
+++ ./jdk/src/share/bin/jli_util.h Sat Dec 01 12:24:15 2018 -0800 |
14451 |
+++ ./jdk/src/share/bin/jli_util.h Sun Sep 02 07:33:40 2018 -0700 |
14580 |
@@ -87,7 +87,7 @@ |
14452 |
@@ -87,7 +87,7 @@ |
14581 |
#define _LARGFILE64_SOURCE |
14453 |
#define _LARGFILE64_SOURCE |
14582 |
#define JLI_Lseek lseek64 |
14454 |
#define JLI_Lseek lseek64 |
Lines 14586-14593
Link Here
|
14586 |
#define JLI_Lseek lseek |
14458 |
#define JLI_Lseek lseek |
14587 |
#endif |
14459 |
#endif |
14588 |
#ifdef _AIX |
14460 |
#ifdef _AIX |
14589 |
--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sat Oct 06 10:26:40 2018 +0100 |
14461 |
--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sat Jun 23 21:02:10 2018 -0700 |
14590 |
+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sat Dec 01 12:24:15 2018 -0800 |
14462 |
+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sun Sep 02 07:33:40 2018 -0700 |
14591 |
@@ -1146,7 +1146,7 @@ |
14463 |
@@ -1146,7 +1146,7 @@ |
14592 |
*/ |
14464 |
*/ |
14593 |
HashMap<String, Boolean> existsMap; |
14465 |
HashMap<String, Boolean> existsMap; |
Lines 14597-14604
Link Here
|
14597 |
return false; |
14469 |
return false; |
14598 |
} else if (existsMap == null) { |
14470 |
} else if (existsMap == null) { |
14599 |
existsMap = new HashMap<String, Boolean>(); |
14471 |
existsMap = new HashMap<String, Boolean>(); |
14600 |
--- ./jdk/src/share/classes/sun/awt/OSInfo.java Sat Oct 06 10:26:40 2018 +0100 |
14472 |
--- ./jdk/src/share/classes/sun/awt/OSInfo.java Sat Jun 23 21:02:10 2018 -0700 |
14601 |
+++ ./jdk/src/share/classes/sun/awt/OSInfo.java Sat Dec 01 12:24:15 2018 -0800 |
14473 |
+++ ./jdk/src/share/classes/sun/awt/OSInfo.java Sun Sep 02 07:33:40 2018 -0700 |
14602 |
@@ -39,6 +39,7 @@ |
14474 |
@@ -39,6 +39,7 @@ |
14603 |
WINDOWS, |
14475 |
WINDOWS, |
14604 |
LINUX, |
14476 |
LINUX, |
Lines 14618-14625
Link Here
|
14618 |
if (osName.contains("OS X")) { |
14490 |
if (osName.contains("OS X")) { |
14619 |
return MACOSX; |
14491 |
return MACOSX; |
14620 |
} |
14492 |
} |
14621 |
--- ./jdk/src/share/classes/sun/font/FontUtilities.java Sat Oct 06 10:26:40 2018 +0100 |
14493 |
--- ./jdk/src/share/classes/sun/font/FontUtilities.java Sat Jun 23 21:02:10 2018 -0700 |
14622 |
+++ ./jdk/src/share/classes/sun/font/FontUtilities.java Sat Dec 01 12:24:15 2018 -0800 |
14494 |
+++ ./jdk/src/share/classes/sun/font/FontUtilities.java Sun Sep 02 07:33:40 2018 -0700 |
14623 |
@@ -48,6 +48,8 @@ |
14495 |
@@ -48,6 +48,8 @@ |
14624 |
|
14496 |
|
14625 |
public static boolean isLinux; |
14497 |
public static boolean isLinux; |
Lines 14638-14645
Link Here
|
14638 |
isMacOSX = osName.contains("OS X"); // TODO: MacOSX |
14510 |
isMacOSX = osName.contains("OS X"); // TODO: MacOSX |
14639 |
|
14511 |
|
14640 |
String t2kStr = System.getProperty("sun.java2d.font.scaler"); |
14512 |
String t2kStr = System.getProperty("sun.java2d.font.scaler"); |
14641 |
--- ./jdk/src/share/classes/sun/font/SunFontManager.java Sat Oct 06 10:26:40 2018 +0100 |
14513 |
--- ./jdk/src/share/classes/sun/font/SunFontManager.java Sat Jun 23 21:02:10 2018 -0700 |
14642 |
+++ ./jdk/src/share/classes/sun/font/SunFontManager.java Sat Dec 01 12:24:15 2018 -0800 |
14514 |
+++ ./jdk/src/share/classes/sun/font/SunFontManager.java Sun Sep 02 07:33:40 2018 -0700 |
14643 |
@@ -418,7 +418,7 @@ |
14515 |
@@ -418,7 +418,7 @@ |
14644 |
* registerFonts method as on-screen these JRE fonts |
14516 |
* registerFonts method as on-screen these JRE fonts |
14645 |
* always go through the T2K rasteriser. |
14517 |
* always go through the T2K rasteriser. |
Lines 14649-14656
Link Here
|
14649 |
/* Linux font configuration uses these fonts */ |
14521 |
/* Linux font configuration uses these fonts */ |
14650 |
registerFontDir(jreFontDirName); |
14522 |
registerFontDir(jreFontDirName); |
14651 |
} |
14523 |
} |
14652 |
--- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Sat Oct 06 10:26:40 2018 +0100 |
14524 |
--- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Sat Jun 23 21:02:10 2018 -0700 |
14653 |
+++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Sat Dec 01 12:24:15 2018 -0800 |
14525 |
+++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Sun Sep 02 07:33:40 2018 -0700 |
14654 |
@@ -1306,7 +1306,7 @@ |
14526 |
@@ -1306,7 +1306,7 @@ |
14655 |
String osName = AccessController.doPrivileged( |
14527 |
String osName = AccessController.doPrivileged( |
14656 |
new GetPropertyAction("os.name")); |
14528 |
new GetPropertyAction("os.name")); |
Lines 14660-14667
Link Here
|
14660 |
charset("x-COMPOUND_TEXT", "COMPOUND_TEXT", |
14532 |
charset("x-COMPOUND_TEXT", "COMPOUND_TEXT", |
14661 |
new String[] { |
14533 |
new String[] { |
14662 |
"COMPOUND_TEXT", // JDK historical |
14534 |
"COMPOUND_TEXT", // JDK historical |
14663 |
--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sat Oct 06 10:26:40 2018 +0100 |
14535 |
--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sat Jun 23 21:02:10 2018 -0700 |
14664 |
+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sat Dec 01 12:24:15 2018 -0800 |
14536 |
+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sun Sep 02 07:33:40 2018 -0700 |
14665 |
@@ -1587,9 +1587,31 @@ |
14537 |
@@ -1587,9 +1587,31 @@ |
14666 |
} |
14538 |
} |
14667 |
|
14539 |
|
Lines 14696-14703
Link Here
|
14696 |
if ((pFlags & PRINTER) != 0) { |
14568 |
if ((pFlags & PRINTER) != 0) { |
14697 |
execCmd[n++] = "-P" + printer; |
14569 |
execCmd[n++] = "-P" + printer; |
14698 |
} |
14570 |
} |
14699 |
--- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Sat Oct 06 10:26:40 2018 +0100 |
14571 |
--- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Sat Jun 23 21:02:10 2018 -0700 |
14700 |
+++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Sat Dec 01 12:24:15 2018 -0800 |
14572 |
+++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Sun Sep 02 07:33:40 2018 -0700 |
14701 |
@@ -48,6 +48,7 @@ |
14573 |
@@ -48,6 +48,7 @@ |
14702 |
public Boolean run() { |
14574 |
public Boolean run() { |
14703 |
String osname = System.getProperty("os.name"); |
14575 |
String osname = System.getProperty("os.name"); |
Lines 14706-14713
Link Here
|
14706 |
osname.contains("OS X") || |
14578 |
osname.contains("OS X") || |
14707 |
osname.startsWith("Linux")) { |
14579 |
osname.startsWith("Linux")) { |
14708 |
return new Boolean(System.getProperty |
14580 |
return new Boolean(System.getProperty |
14709 |
--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sat Oct 06 10:26:40 2018 +0100 |
14581 |
--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sat Jun 23 21:02:10 2018 -0700 |
14710 |
+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sat Dec 01 12:24:15 2018 -0800 |
14582 |
+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sun Sep 02 07:33:40 2018 -0700 |
14711 |
@@ -90,6 +90,12 @@ |
14583 |
@@ -90,6 +90,12 @@ |
14712 |
"libgssapi_krb5.so", |
14584 |
"libgssapi_krb5.so", |
14713 |
"libgssapi_krb5.so.2", |
14585 |
"libgssapi_krb5.so.2", |
Lines 14721-14728
Link Here
|
14721 |
} else if (osname.contains("OS X")) { |
14593 |
} else if (osname.contains("OS X")) { |
14722 |
gssLibs = new String[]{ |
14594 |
gssLibs = new String[]{ |
14723 |
"libgssapi_krb5.dylib", |
14595 |
"libgssapi_krb5.dylib", |
14724 |
--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sat Oct 06 10:26:40 2018 +0100 |
14596 |
--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sat Jun 23 21:02:10 2018 -0700 |
14725 |
+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sat Dec 01 12:24:15 2018 -0800 |
14597 |
+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sun Sep 02 07:33:40 2018 -0700 |
14726 |
@@ -31,4 +31,5 @@ |
14598 |
@@ -31,4 +31,5 @@ |
14727 |
#[windows]sun.tools.attach.WindowsAttachProvider |
14599 |
#[windows]sun.tools.attach.WindowsAttachProvider |
14728 |
#[linux]sun.tools.attach.LinuxAttachProvider |
14600 |
#[linux]sun.tools.attach.LinuxAttachProvider |
Lines 14730-14736
Link Here
|
14730 |
+#[bsd]sun.tools.attach.BsdAttachProvider |
14602 |
+#[bsd]sun.tools.attach.BsdAttachProvider |
14731 |
#[aix]sun.tools.attach.AixAttachProvider |
14603 |
#[aix]sun.tools.attach.AixAttachProvider |
14732 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14604 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
14733 |
+++ ./jdk/src/share/lib/security/java.security-bsd Sat Dec 01 12:24:15 2018 -0800 |
14605 |
+++ ./jdk/src/share/lib/security/java.security-bsd Sun Sep 02 07:33:40 2018 -0700 |
14734 |
@@ -0,0 +1,983 @@ |
14606 |
@@ -0,0 +1,983 @@ |
14735 |
+# |
14607 |
+# |
14736 |
+# This is the "master security properties file". |
14608 |
+# This is the "master security properties file". |
Lines 15715-15742
Link Here
|
15715 |
+# and javax.crypto.spec.SecretKeySpec and rejects all the others. |
15587 |
+# and javax.crypto.spec.SecretKeySpec and rejects all the others. |
15716 |
+jceks.key.serialFilter = java.lang.Enum;java.security.KeyRep;\ |
15588 |
+jceks.key.serialFilter = java.lang.Enum;java.security.KeyRep;\ |
15717 |
+ java.security.KeyRep$Type;javax.crypto.spec.SecretKeySpec;!* |
15589 |
+ java.security.KeyRep$Type;javax.crypto.spec.SecretKeySpec;!* |
15718 |
--- ./jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp Sat Oct 06 10:26:40 2018 +0100 |
15590 |
--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sat Jun 23 21:02:10 2018 -0700 |
15719 |
+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp Sat Dec 01 12:24:15 2018 -0800 |
15591 |
+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sun Sep 02 07:33:40 2018 -0700 |
15720 |
@@ -292,7 +292,7 @@ |
|
|
15721 |
|
15722 |
if (uPtr->aborting()) { |
15723 |
THROW_IOE(uPtr->get_abort_message()); |
15724 |
- return false; |
15725 |
+ return null; |
15726 |
} |
15727 |
|
15728 |
// We have fetched all the files. |
15729 |
@@ -310,7 +310,7 @@ |
15730 |
JNIEXPORT jlong JNICALL |
15731 |
Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) { |
15732 |
unpacker* uPtr = get_unpacker(env, pObj, false); |
15733 |
- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL); |
15734 |
+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0L); |
15735 |
size_t consumed = uPtr->input_consumed(); |
15736 |
free_unpacker(env, pObj, uPtr); |
15737 |
return consumed; |
15738 |
--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sat Oct 06 10:26:40 2018 +0100 |
15739 |
+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sat Dec 01 12:24:15 2018 -0800 |
15740 |
@@ -62,7 +62,7 @@ |
15592 |
@@ -62,7 +62,7 @@ |
15741 |
|
15593 |
|
15742 |
#endif // End of ZLIB |
15594 |
#endif // End of ZLIB |
Lines 15746-15753
Link Here
|
15746 |
#define SWAP_BYTES(a) \ |
15598 |
#define SWAP_BYTES(a) \ |
15747 |
((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00) |
15599 |
((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00) |
15748 |
#else |
15600 |
#else |
15749 |
--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Sat Oct 06 10:26:40 2018 +0100 |
15601 |
--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Sat Jun 23 21:02:10 2018 -0700 |
15750 |
+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Sat Dec 01 12:24:15 2018 -0800 |
15602 |
+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Sun Sep 02 07:33:40 2018 -0700 |
15751 |
@@ -121,7 +121,7 @@ |
15603 |
@@ -121,7 +121,7 @@ |
15752 |
} |
15604 |
} |
15753 |
|
15605 |
|
Lines 15775-15782
Link Here
|
15775 |
#define MAP_NATIVE2LE16(a) (a) |
15627 |
#define MAP_NATIVE2LE16(a) (a) |
15776 |
#define MAP_NATIVE2BE16(a) MAP_SWAP16_impl(a) |
15628 |
#define MAP_NATIVE2BE16(a) MAP_SWAP16_impl(a) |
15777 |
#define MAP_NATIVE2LE32(a) (a) |
15629 |
#define MAP_NATIVE2LE32(a) (a) |
15778 |
--- ./jdk/src/share/native/com/sun/media/sound/Utilities.c Sat Oct 06 10:26:40 2018 +0100 |
15630 |
--- ./jdk/src/share/native/com/sun/media/sound/Utilities.c Sat Jun 23 21:02:10 2018 -0700 |
15779 |
+++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c Sat Dec 01 12:24:15 2018 -0800 |
15631 |
+++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c Sun Sep 02 07:33:40 2018 -0700 |
15780 |
@@ -28,7 +28,7 @@ |
15632 |
@@ -28,7 +28,7 @@ |
15781 |
|
15633 |
|
15782 |
|
15634 |
|
Lines 15786-15793
Link Here
|
15786 |
return 0; |
15638 |
return 0; |
15787 |
#else |
15639 |
#else |
15788 |
return 1; |
15640 |
return 1; |
15789 |
--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sat Oct 06 10:26:40 2018 +0100 |
15641 |
--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sat Jun 23 21:02:10 2018 -0700 |
15790 |
+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sat Dec 01 12:24:15 2018 -0800 |
15642 |
+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sun Sep 02 07:33:40 2018 -0700 |
15791 |
@@ -40,7 +40,7 @@ |
15643 |
@@ -40,7 +40,7 @@ |
15792 |
#endif |
15644 |
#endif |
15793 |
#endif |
15645 |
#endif |
Lines 15797-15804
Link Here
|
15797 |
#define __HI(x) *(1+(int*)&x) |
15649 |
#define __HI(x) *(1+(int*)&x) |
15798 |
#define __LO(x) *(int*)&x |
15650 |
#define __LO(x) *(int*)&x |
15799 |
#define __HIp(x) *(1+(int*)x) |
15651 |
#define __HIp(x) *(1+(int*)x) |
15800 |
--- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Sat Oct 06 10:26:40 2018 +0100 |
15652 |
--- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Sat Jun 23 21:02:10 2018 -0700 |
15801 |
+++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Sat Dec 01 12:24:15 2018 -0800 |
15653 |
+++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Sun Sep 02 07:33:40 2018 -0700 |
15802 |
@@ -624,7 +624,7 @@ |
15654 |
@@ -624,7 +624,7 @@ |
15803 |
switch(type) { |
15655 |
switch(type) { |
15804 |
case java_awt_image_BufferedImage_TYPE_INT_ARGB: |
15656 |
case java_awt_image_BufferedImage_TYPE_INT_ARGB: |
Lines 15826-15833
Link Here
|
15826 |
colorOrder[0] = 2; |
15678 |
colorOrder[0] = 2; |
15827 |
colorOrder[1] = 1; |
15679 |
colorOrder[1] = 1; |
15828 |
colorOrder[2] = 0; |
15680 |
colorOrder[2] = 0; |
15829 |
--- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Sat Oct 06 10:26:40 2018 +0100 |
15681 |
--- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Sat Jun 23 21:02:10 2018 -0700 |
15830 |
+++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Sat Dec 01 12:24:15 2018 -0800 |
15682 |
+++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Sun Sep 02 07:33:40 2018 -0700 |
15831 |
@@ -1198,7 +1198,7 @@ |
15683 |
@@ -1198,7 +1198,7 @@ |
15832 |
|
15684 |
|
15833 |
#define NLUT 8 |
15685 |
#define NLUT 8 |
Lines 15837-15844
Link Here
|
15837 |
#define INDEXES { 3, 2, 1, 0, 7, 6, 5, 4 } |
15689 |
#define INDEXES { 3, 2, 1, 0, 7, 6, 5, 4 } |
15838 |
#else |
15690 |
#else |
15839 |
#define INDEXES { 0, 1, 2, 3, 4, 5, 6, 7 } |
15691 |
#define INDEXES { 0, 1, 2, 3, 4, 5, 6, 7 } |
15840 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sat Oct 06 10:26:40 2018 +0100 |
15692 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sat Jun 23 21:02:10 2018 -0700 |
15841 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sat Dec 01 12:24:15 2018 -0800 |
15693 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sun Sep 02 07:33:40 2018 -0700 |
15842 |
@@ -86,7 +86,7 @@ |
15694 |
@@ -86,7 +86,7 @@ |
15843 |
#endif /* MLIB_USE_FTOI_CLAMPING */ |
15695 |
#endif /* MLIB_USE_FTOI_CLAMPING */ |
15844 |
|
15696 |
|
Lines 15878-15885
Link Here
|
15878 |
|
15730 |
|
15879 |
#endif /* _NO_LONGLONG */ |
15731 |
#endif /* _NO_LONGLONG */ |
15880 |
|
15732 |
|
15881 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sat Oct 06 10:26:40 2018 +0100 |
15733 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sat Jun 23 21:02:10 2018 -0700 |
15882 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sat Dec 01 12:24:15 2018 -0800 |
15734 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sun Sep 02 07:33:40 2018 -0700 |
15883 |
@@ -126,7 +126,7 @@ |
15735 |
@@ -126,7 +126,7 @@ |
15884 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
15736 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
15885 |
|
15737 |
|
Lines 15919-15926
Link Here
|
15919 |
#endif /* _NO_LONGLONG */ |
15771 |
#endif /* _NO_LONGLONG */ |
15920 |
|
15772 |
|
15921 |
/***************************************************************/ |
15773 |
/***************************************************************/ |
15922 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sat Oct 06 10:26:40 2018 +0100 |
15774 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sat Jun 23 21:02:10 2018 -0700 |
15923 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sat Dec 01 12:24:15 2018 -0800 |
15775 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sun Sep 02 07:33:40 2018 -0700 |
15924 |
@@ -94,7 +94,7 @@ |
15776 |
@@ -94,7 +94,7 @@ |
15925 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
15777 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
15926 |
|
15778 |
|
Lines 15960-15967
Link Here
|
15960 |
#endif /* _NO_LONGLONG */ |
15812 |
#endif /* _NO_LONGLONG */ |
15961 |
|
15813 |
|
15962 |
/***************************************************************/ |
15814 |
/***************************************************************/ |
15963 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sat Oct 06 10:26:40 2018 +0100 |
15815 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sat Jun 23 21:02:10 2018 -0700 |
15964 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sat Dec 01 12:24:15 2018 -0800 |
15816 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sun Sep 02 07:33:40 2018 -0700 |
15965 |
@@ -126,7 +126,7 @@ |
15817 |
@@ -126,7 +126,7 @@ |
15966 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
15818 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
15967 |
|
15819 |
|
Lines 16001-16008
Link Here
|
16001 |
#endif /* _NO_LONGLONG */ |
15853 |
#endif /* _NO_LONGLONG */ |
16002 |
|
15854 |
|
16003 |
/***************************************************************/ |
15855 |
/***************************************************************/ |
16004 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sat Oct 06 10:26:40 2018 +0100 |
15856 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sat Jun 23 21:02:10 2018 -0700 |
16005 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sat Dec 01 12:24:15 2018 -0800 |
15857 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sun Sep 02 07:33:40 2018 -0700 |
16006 |
@@ -95,7 +95,7 @@ |
15858 |
@@ -95,7 +95,7 @@ |
16007 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
15859 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
16008 |
|
15860 |
|
Lines 16042-16049
Link Here
|
16042 |
#endif /* _NO_LONGLONG */ |
15894 |
#endif /* _NO_LONGLONG */ |
16043 |
|
15895 |
|
16044 |
/***************************************************************/ |
15896 |
/***************************************************************/ |
16045 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sat Oct 06 10:26:40 2018 +0100 |
15897 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sat Jun 23 21:02:10 2018 -0700 |
16046 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sat Dec 01 12:24:15 2018 -0800 |
15898 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sun Sep 02 07:33:40 2018 -0700 |
16047 |
@@ -126,7 +126,7 @@ |
15899 |
@@ -126,7 +126,7 @@ |
16048 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
15900 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
16049 |
|
15901 |
|
Lines 16083-16090
Link Here
|
16083 |
#endif /* _NO_LONGLONG */ |
15935 |
#endif /* _NO_LONGLONG */ |
16084 |
|
15936 |
|
16085 |
/***************************************************************/ |
15937 |
/***************************************************************/ |
16086 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sat Oct 06 10:26:40 2018 +0100 |
15938 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sat Jun 23 21:02:10 2018 -0700 |
16087 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sat Dec 01 12:24:15 2018 -0800 |
15939 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sun Sep 02 07:33:40 2018 -0700 |
16088 |
@@ -94,7 +94,7 @@ |
15940 |
@@ -94,7 +94,7 @@ |
16089 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
15941 |
#define D2I(x) CLAMP_S32((x) SAT_OFF) |
16090 |
|
15942 |
|
Lines 16124-16131
Link Here
|
16124 |
#endif /* _NO_LONGLONG */ |
15976 |
#endif /* _NO_LONGLONG */ |
16125 |
|
15977 |
|
16126 |
/***************************************************************/ |
15978 |
/***************************************************************/ |
16127 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sat Oct 06 10:26:40 2018 +0100 |
15979 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sat Jun 23 21:02:10 2018 -0700 |
16128 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sat Dec 01 12:24:15 2018 -0800 |
15980 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sun Sep 02 07:33:40 2018 -0700 |
16129 |
@@ -95,7 +95,7 @@ |
15981 |
@@ -95,7 +95,7 @@ |
16130 |
dst = dp[0]; |
15982 |
dst = dp[0]; |
16131 |
if (ld_offset + size < 32) { |
15983 |
if (ld_offset + size < 32) { |
Lines 16345-16352
Link Here
|
16345 |
} |
16197 |
} |
16346 |
|
16198 |
|
16347 |
#else /* _LONGLONG */ |
16199 |
#else /* _LONGLONG */ |
16348 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sat Oct 06 10:26:40 2018 +0100 |
16200 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sat Jun 23 21:02:10 2018 -0700 |
16349 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sat Dec 01 12:24:15 2018 -0800 |
16201 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sun Sep 02 07:33:40 2018 -0700 |
16350 |
@@ -168,7 +168,7 @@ |
16202 |
@@ -168,7 +168,7 @@ |
16351 |
} |
16203 |
} |
16352 |
|
16204 |
|
Lines 16627-16634
Link Here
|
16627 |
dp[12] = t0; |
16479 |
dp[12] = t0; |
16628 |
dp[13] = t1; |
16480 |
dp[13] = t1; |
16629 |
dp[14] = t2; |
16481 |
dp[14] = t2; |
16630 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sat Oct 06 10:26:40 2018 +0100 |
16482 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sat Jun 23 21:02:10 2018 -0700 |
16631 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sat Dec 01 12:24:15 2018 -0800 |
16483 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sun Sep 02 07:33:40 2018 -0700 |
16632 |
@@ -88,7 +88,7 @@ |
16484 |
@@ -88,7 +88,7 @@ |
16633 |
} d64_2_f32; |
16485 |
} d64_2_f32; |
16634 |
|
16486 |
|
Lines 16780-16787
Link Here
|
16780 |
|
16632 |
|
16781 |
((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l; |
16633 |
((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l; |
16782 |
((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h; |
16634 |
((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h; |
16783 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sat Oct 06 10:26:40 2018 +0100 |
16635 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sat Jun 23 21:02:10 2018 -0700 |
16784 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sat Dec 01 12:24:15 2018 -0800 |
16636 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sun Sep 02 07:33:40 2018 -0700 |
16785 |
@@ -30,7 +30,7 @@ |
16637 |
@@ -30,7 +30,7 @@ |
16786 |
typedef union { |
16638 |
typedef union { |
16787 |
mlib_d64 db; |
16639 |
mlib_d64 db; |
Lines 16791-16798
Link Here
|
16791 |
mlib_s32 int1, int0; |
16643 |
mlib_s32 int1, int0; |
16792 |
#else |
16644 |
#else |
16793 |
mlib_s32 int0, int1; |
16645 |
mlib_s32 int0, int1; |
16794 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sat Oct 06 10:26:40 2018 +0100 |
16646 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sat Jun 23 21:02:10 2018 -0700 |
16795 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sat Dec 01 12:24:15 2018 -0800 |
16647 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sun Sep 02 07:33:40 2018 -0700 |
16796 |
@@ -275,11 +275,11 @@ |
16648 |
@@ -275,11 +275,11 @@ |
16797 |
for (i = 0; j <= (b_size - 4); j += 4, i++) { |
16649 |
for (i = 0; j <= (b_size - 4); j += 4, i++) { |
16798 |
src0 = src1; |
16650 |
src0 = src1; |
Lines 16891-16898
Link Here
|
16891 |
s0 = s1; |
16743 |
s0 = s1; |
16892 |
dp += SIZE; |
16744 |
dp += SIZE; |
16893 |
sp += SIZE; |
16745 |
sp += SIZE; |
16894 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sat Oct 06 10:26:40 2018 +0100 |
16746 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sat Jun 23 21:02:10 2018 -0700 |
16895 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sat Dec 01 12:24:15 2018 -0800 |
16747 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sun Sep 02 07:33:40 2018 -0700 |
16896 |
@@ -120,7 +120,7 @@ |
16748 |
@@ -120,7 +120,7 @@ |
16897 |
} \ |
16749 |
} \ |
16898 |
} |
16750 |
} |
Lines 18125-18132
Link Here
|
18125 |
dp[12] = t0; |
17977 |
dp[12] = t0; |
18126 |
dp[13] = t1; |
17978 |
dp[13] = t1; |
18127 |
dp[14] = t2; |
17979 |
dp[14] = t2; |
18128 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sat Oct 06 10:26:40 2018 +0100 |
17980 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sat Jun 23 21:02:10 2018 -0700 |
18129 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sat Dec 01 12:24:15 2018 -0800 |
17981 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sun Sep 02 07:33:40 2018 -0700 |
18130 |
@@ -27,9 +27,6 @@ |
17982 |
@@ -27,9 +27,6 @@ |
18131 |
#ifndef MLIB_IMAGE_H |
17983 |
#ifndef MLIB_IMAGE_H |
18132 |
#define MLIB_IMAGE_H |
17984 |
#define MLIB_IMAGE_H |
Lines 18137-18144
Link Here
|
18137 |
#include <mlib_types.h> |
17989 |
#include <mlib_types.h> |
18138 |
#include <mlib_status.h> |
17990 |
#include <mlib_status.h> |
18139 |
#include <mlib_sys.h> |
17991 |
#include <mlib_sys.h> |
18140 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sat Oct 06 10:26:40 2018 +0100 |
17992 |
--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sat Jun 23 21:02:10 2018 -0700 |
18141 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sat Dec 01 12:24:15 2018 -0800 |
17993 |
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sun Sep 02 07:33:40 2018 -0700 |
18142 |
@@ -29,7 +29,7 @@ |
17994 |
@@ -29,7 +29,7 @@ |
18143 |
#ifdef MACOSX |
17995 |
#ifdef MACOSX |
18144 |
#include <unistd.h> |
17996 |
#include <unistd.h> |
Lines 18158-18165
Link Here
|
18158 |
#else |
18010 |
#else |
18159 |
return (void *) memalign(8, size); |
18011 |
return (void *) memalign(8, size); |
18160 |
#endif /* _MSC_VER */ |
18012 |
#endif /* _MSC_VER */ |
18161 |
--- ./jdk/src/share/native/sun/font/layout/LEStandalone.h Sat Oct 06 10:26:40 2018 +0100 |
18013 |
--- ./jdk/src/share/native/sun/font/layout/LEStandalone.h Sat Jun 23 21:02:10 2018 -0700 |
18162 |
+++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h Sat Dec 01 12:24:15 2018 -0800 |
18014 |
+++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h Sun Sep 02 07:33:40 2018 -0700 |
18163 |
@@ -136,7 +136,7 @@ |
18015 |
@@ -136,7 +136,7 @@ |
18164 |
#define U_CAPI extern "C" |
18016 |
#define U_CAPI extern "C" |
18165 |
|
18017 |
|
Lines 18169-18176
Link Here
|
18169 |
#define U_IS_BIG_ENDIAN 0 |
18021 |
#define U_IS_BIG_ENDIAN 0 |
18170 |
#endif |
18022 |
#endif |
18171 |
#endif |
18023 |
#endif |
18172 |
--- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Sat Oct 06 10:26:40 2018 +0100 |
18024 |
--- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Sat Jun 23 21:02:10 2018 -0700 |
18173 |
+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Sat Dec 01 12:24:15 2018 -0800 |
18025 |
+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Sun Sep 02 07:33:40 2018 -0700 |
18174 |
@@ -182,7 +182,7 @@ |
18026 |
@@ -182,7 +182,7 @@ |
18175 |
return 0L; |
18027 |
return 0L; |
18176 |
} |
18028 |
} |
Lines 18180-18187
Link Here
|
18180 |
/* Reversing data packed into int for LE archs */ |
18032 |
/* Reversing data packed into int for LE archs */ |
18181 |
if (isInIntPacked) { |
18033 |
if (isInIntPacked) { |
18182 |
inFormatter ^= DOSWAP_SH(1); |
18034 |
inFormatter ^= DOSWAP_SH(1); |
18183 |
--- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Sat Oct 06 10:26:40 2018 +0100 |
18035 |
--- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Sat Jun 23 21:02:10 2018 -0700 |
18184 |
+++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Sat Dec 01 12:24:15 2018 -0800 |
18036 |
+++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Sun Sep 02 07:33:40 2018 -0700 |
18185 |
@@ -27,6 +27,7 @@ |
18037 |
@@ -27,6 +27,7 @@ |
18186 |
#include <jni.h> |
18038 |
#include <jni.h> |
18187 |
#include "management.h" |
18039 |
#include "management.h" |
Lines 18190-18197
Link Here
|
18190 |
|
18042 |
|
18191 |
JNIEXPORT void JNICALL Java_sun_management_DiagnosticCommandImpl_setNotificationEnabled |
18043 |
JNIEXPORT void JNICALL Java_sun_management_DiagnosticCommandImpl_setNotificationEnabled |
18192 |
(JNIEnv *env, jobject dummy, jboolean enabled) { |
18044 |
(JNIEnv *env, jobject dummy, jboolean enabled) { |
18193 |
--- ./jdk/src/solaris/back/util_md.h Sat Oct 06 10:26:40 2018 +0100 |
18045 |
--- ./jdk/src/solaris/back/util_md.h Sat Jun 23 21:02:10 2018 -0700 |
18194 |
+++ ./jdk/src/solaris/back/util_md.h Sat Dec 01 12:24:15 2018 -0800 |
18046 |
+++ ./jdk/src/solaris/back/util_md.h Sun Sep 02 07:33:40 2018 -0700 |
18195 |
@@ -51,7 +51,7 @@ |
18047 |
@@ -51,7 +51,7 @@ |
18196 |
|
18048 |
|
18197 |
/* On little endian machines, convert java big endian numbers. */ |
18049 |
/* On little endian machines, convert java big endian numbers. */ |
Lines 18201-18208
Link Here
|
18201 |
|
18053 |
|
18202 |
#define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) |
18054 |
#define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) |
18203 |
#define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) |
18055 |
#define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) |
18204 |
--- ./jdk/src/solaris/bin/ergo_i586.c Sat Oct 06 10:26:40 2018 +0100 |
18056 |
--- ./jdk/src/solaris/bin/ergo_i586.c Sat Jun 23 21:02:10 2018 -0700 |
18205 |
+++ ./jdk/src/solaris/bin/ergo_i586.c Sat Dec 01 12:24:15 2018 -0800 |
18057 |
+++ ./jdk/src/solaris/bin/ergo_i586.c Sun Sep 02 07:33:40 2018 -0700 |
18206 |
@@ -106,7 +106,7 @@ |
18058 |
@@ -106,7 +106,7 @@ |
18207 |
|
18059 |
|
18208 |
#endif /* __solaris__ */ |
18060 |
#endif /* __solaris__ */ |
Lines 18221-18228
Link Here
|
18221 |
|
18073 |
|
18222 |
/* |
18074 |
/* |
18223 |
* Routines shared by solaris-i586 and linux-i586. |
18075 |
* Routines shared by solaris-i586 and linux-i586. |
18224 |
--- ./jdk/src/solaris/bin/java_md_solinux.c Sat Oct 06 10:26:40 2018 +0100 |
18076 |
--- ./jdk/src/solaris/bin/java_md_solinux.c Sat Jun 23 21:02:10 2018 -0700 |
18225 |
+++ ./jdk/src/solaris/bin/java_md_solinux.c Sat Dec 01 12:24:15 2018 -0800 |
18077 |
+++ ./jdk/src/solaris/bin/java_md_solinux.c Sun Sep 02 07:33:40 2018 -0700 |
18226 |
@@ -35,6 +35,9 @@ |
18078 |
@@ -35,6 +35,9 @@ |
18227 |
#include <sys/stat.h> |
18079 |
#include <sys/stat.h> |
18228 |
#include <unistd.h> |
18080 |
#include <unistd.h> |
Lines 18314-18321
Link Here
|
18314 |
} |
18166 |
} |
18315 |
|
18167 |
|
18316 |
int |
18168 |
int |
18317 |
--- ./jdk/src/solaris/bin/java_md_solinux.h Sat Oct 06 10:26:40 2018 +0100 |
18169 |
--- ./jdk/src/solaris/bin/java_md_solinux.h Sat Jun 23 21:02:10 2018 -0700 |
18318 |
+++ ./jdk/src/solaris/bin/java_md_solinux.h Sat Dec 01 12:24:15 2018 -0800 |
18170 |
+++ ./jdk/src/solaris/bin/java_md_solinux.h Sun Sep 02 07:33:40 2018 -0700 |
18319 |
@@ -26,17 +26,26 @@ |
18171 |
@@ -26,17 +26,26 @@ |
18320 |
#ifndef JAVA_MD_SOLINUX_H |
18172 |
#ifndef JAVA_MD_SOLINUX_H |
18321 |
#define JAVA_MD_SOLINUX_H |
18173 |
#define JAVA_MD_SOLINUX_H |
Lines 18356-18363
Link Here
|
18356 |
#else /* !__solaris__, i.e. Linux, AIX,.. */ |
18208 |
#else /* !__solaris__, i.e. Linux, AIX,.. */ |
18357 |
static const char *system_dir = "/usr/java"; |
18209 |
static const char *system_dir = "/usr/java"; |
18358 |
static const char *user_dir = "/java"; |
18210 |
static const char *user_dir = "/java"; |
18359 |
--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Sat Oct 06 10:26:40 2018 +0100 |
18211 |
--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Sat Jun 23 21:02:10 2018 -0700 |
18360 |
+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Sat Dec 01 12:24:15 2018 -0800 |
18212 |
+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Sun Sep 02 07:33:40 2018 -0700 |
18361 |
@@ -82,6 +82,8 @@ |
18213 |
@@ -82,6 +82,8 @@ |
18362 |
|
18214 |
|
18363 |
LINUX(LaunchMechanism.VFORK, LaunchMechanism.FORK), |
18215 |
LINUX(LaunchMechanism.VFORK, LaunchMechanism.FORK), |
Lines 18405-18412
Link Here
|
18405 |
case BSD: |
18257 |
case BSD: |
18406 |
case AIX: |
18258 |
case AIX: |
18407 |
// There is a risk that pid will be recycled, causing us to |
18259 |
// There is a risk that pid will be recycled, causing us to |
18408 |
--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sat Oct 06 10:26:40 2018 +0100 |
18260 |
--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sat Jun 23 21:02:10 2018 -0700 |
18409 |
+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sat Dec 01 12:24:15 2018 -0800 |
18261 |
+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sun Sep 02 07:33:40 2018 -0700 |
18410 |
@@ -234,7 +234,7 @@ |
18262 |
@@ -234,7 +234,7 @@ |
18411 |
if (fontID != null) { |
18263 |
if (fontID != null) { |
18412 |
fileName = (String)fontNameMap.get(fontID); |
18264 |
fileName = (String)fontNameMap.get(fontID); |
Lines 18434-18441
Link Here
|
18434 |
(!mFontConfig.foundOsSpecificFile() || |
18286 |
(!mFontConfig.foundOsSpecificFile() || |
18435 |
!mFontConfig.fontFilesArePresent()) || |
18287 |
!mFontConfig.fontFilesArePresent()) || |
18436 |
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) { |
18288 |
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) { |
18437 |
--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Sat Oct 06 10:26:40 2018 +0100 |
18289 |
--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Sat Jun 23 21:02:10 2018 -0700 |
18438 |
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Sat Dec 01 12:24:15 2018 -0800 |
18290 |
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Sun Sep 02 07:33:40 2018 -0700 |
18439 |
@@ -26,134 +26,134 @@ |
18291 |
@@ -26,134 +26,134 @@ |
18440 |
|
18292 |
|
18441 |
# Version |
18293 |
# Version |
Lines 18698-18705
Link Here
|
18698 |
+filename.NanumGothic_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumGothicBold.ttf |
18550 |
+filename.NanumGothic_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumGothicBold.ttf |
18699 |
+filename.NanumMyeongjo=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjo.ttf |
18551 |
+filename.NanumMyeongjo=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjo.ttf |
18700 |
+filename.NanumMyeongjo_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjoBold.ttf |
18552 |
+filename.NanumMyeongjo_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjoBold.ttf |
18701 |
--- ./jdk/src/solaris/classes/sun/net/PortConfig.java Sat Oct 06 10:26:40 2018 +0100 |
18553 |
--- ./jdk/src/solaris/classes/sun/net/PortConfig.java Sat Jun 23 21:02:10 2018 -0700 |
18702 |
+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Sat Dec 01 12:24:15 2018 -0800 |
18554 |
+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Sun Sep 02 07:33:40 2018 -0700 |
18703 |
@@ -52,7 +52,7 @@ |
18555 |
@@ -52,7 +52,7 @@ |
18704 |
} else if (os.startsWith("SunOS")) { |
18556 |
} else if (os.startsWith("SunOS")) { |
18705 |
defaultLower = 32768; |
18557 |
defaultLower = 32768; |
Lines 18709-18716
Link Here
|
18709 |
defaultLower = 49152; |
18561 |
defaultLower = 49152; |
18710 |
defaultUpper = 65535; |
18562 |
defaultUpper = 65535; |
18711 |
} else if (os.startsWith("AIX")) { |
18563 |
} else if (os.startsWith("AIX")) { |
18712 |
--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sat Oct 06 10:26:40 2018 +0100 |
18564 |
--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sat Jun 23 21:02:10 2018 -0700 |
18713 |
+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sat Dec 01 12:24:15 2018 -0800 |
18565 |
+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sun Sep 02 07:33:40 2018 -0700 |
18714 |
@@ -66,7 +66,7 @@ |
18566 |
@@ -66,7 +66,7 @@ |
18715 |
return createProvider("sun.nio.ch.SolarisAsynchronousChannelProvider"); |
18567 |
return createProvider("sun.nio.ch.SolarisAsynchronousChannelProvider"); |
18716 |
if (osname.equals("Linux")) |
18568 |
if (osname.equals("Linux")) |
Lines 18720-18727
Link Here
|
18720 |
return createProvider("sun.nio.ch.BsdAsynchronousChannelProvider"); |
18572 |
return createProvider("sun.nio.ch.BsdAsynchronousChannelProvider"); |
18721 |
if (osname.equals("AIX")) |
18573 |
if (osname.equals("AIX")) |
18722 |
return createProvider("sun.nio.ch.AixAsynchronousChannelProvider"); |
18574 |
return createProvider("sun.nio.ch.AixAsynchronousChannelProvider"); |
18723 |
--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Sat Oct 06 10:26:40 2018 +0100 |
18575 |
--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Sat Jun 23 21:02:10 2018 -0700 |
18724 |
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Sat Dec 01 12:24:15 2018 -0800 |
18576 |
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Sun Sep 02 07:33:40 2018 -0700 |
18725 |
@@ -25,10 +25,14 @@ |
18577 |
@@ -25,10 +25,14 @@ |
18726 |
|
18578 |
|
18727 |
package sun.nio.fs; |
18579 |
package sun.nio.fs; |
Lines 18755-18762
Link Here
|
18755 |
+ new MagicFileTypeDetector()); |
18607 |
+ new MagicFileTypeDetector()); |
18756 |
+ } |
18608 |
+ } |
18757 |
} |
18609 |
} |
18758 |
--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sat Oct 06 10:26:40 2018 +0100 |
18610 |
--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sat Jun 23 21:02:10 2018 -0700 |
18759 |
+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sat Dec 01 12:24:15 2018 -0800 |
18611 |
+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sun Sep 02 07:33:40 2018 -0700 |
18760 |
@@ -61,6 +61,8 @@ |
18612 |
@@ -61,6 +61,8 @@ |
18761 |
return createProvider("sun.nio.fs.SolarisFileSystemProvider"); |
18613 |
return createProvider("sun.nio.fs.SolarisFileSystemProvider"); |
18762 |
if (osname.equals("Linux")) |
18614 |
if (osname.equals("Linux")) |
Lines 18766-18773
Link Here
|
18766 |
if (osname.contains("OS X")) |
18618 |
if (osname.contains("OS X")) |
18767 |
return createProvider("sun.nio.fs.MacOSXFileSystemProvider"); |
18619 |
return createProvider("sun.nio.fs.MacOSXFileSystemProvider"); |
18768 |
if (osname.equals("AIX")) |
18620 |
if (osname.equals("AIX")) |
18769 |
--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sat Oct 06 10:26:40 2018 +0100 |
18621 |
--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sat Jun 23 21:02:10 2018 -0700 |
18770 |
+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sat Dec 01 12:24:15 2018 -0800 |
18622 |
+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sun Sep 02 07:33:40 2018 -0700 |
18771 |
@@ -161,6 +161,7 @@ |
18623 |
@@ -161,6 +161,7 @@ |
18772 |
|
18624 |
|
18773 |
static boolean isBSD() { |
18625 |
static boolean isBSD() { |
Lines 18791-18798
Link Here
|
18791 |
"/usr/sbin/lpc status all | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}' | sort" |
18643 |
"/usr/sbin/lpc status all | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}' | sort" |
18792 |
}; |
18644 |
}; |
18793 |
|
18645 |
|
18794 |
--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Sat Oct 06 10:26:40 2018 +0100 |
18646 |
--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Sat Jun 23 21:02:10 2018 -0700 |
18795 |
+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Sat Dec 01 12:24:15 2018 -0800 |
18647 |
+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Sun Sep 02 07:33:40 2018 -0700 |
18796 |
@@ -273,7 +273,7 @@ |
18648 |
@@ -273,7 +273,7 @@ |
18797 |
try { |
18649 |
try { |
18798 |
b = s.getBytes("UTF-8"); |
18650 |
b = s.getBytes("UTF-8"); |
Lines 18802-18809
Link Here
|
18802 |
} |
18654 |
} |
18803 |
BsdVirtualMachine.write(fd, b, 0, b.length); |
18655 |
BsdVirtualMachine.write(fd, b, 0, b.length); |
18804 |
} |
18656 |
} |
18805 |
--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sat Oct 06 10:26:40 2018 +0100 |
18657 |
--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sat Jun 23 21:02:10 2018 -0700 |
18806 |
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sat Dec 01 12:24:15 2018 -0800 |
18658 |
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sun Sep 02 07:33:40 2018 -0700 |
18807 |
@@ -675,6 +675,7 @@ |
18659 |
@@ -675,6 +675,7 @@ |
18808 |
return -1; |
18660 |
return -1; |
18809 |
} |
18661 |
} |
Lines 18820-18827
Link Here
|
18820 |
} else if (err == -EAGAIN) { |
18672 |
} else if (err == -EAGAIN) { |
18821 |
TRACE0("xrun_recovery: EAGAIN try again flag.\n"); |
18673 |
TRACE0("xrun_recovery: EAGAIN try again flag.\n"); |
18822 |
return 0; |
18674 |
return 0; |
18823 |
--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Sat Oct 06 10:26:40 2018 +0100 |
18675 |
--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Sat Jun 23 21:02:10 2018 -0700 |
18824 |
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Sat Dec 01 12:24:15 2018 -0800 |
18676 |
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Sun Sep 02 07:33:40 2018 -0700 |
18825 |
@@ -140,7 +140,7 @@ |
18677 |
@@ -140,7 +140,7 @@ |
18826 |
(float) ((int) sr->samp_rates[s]), |
18678 |
(float) ((int) sr->samp_rates[s]), |
18827 |
DAUDIO_PCM, /* encoding - let's only do PCM */ |
18679 |
DAUDIO_PCM, /* encoding - let's only do PCM */ |
Lines 18831-18838
Link Here
|
18831 |
FALSE /* little endian */ |
18683 |
FALSE /* little endian */ |
18832 |
#else |
18684 |
#else |
18833 |
(bits[b] > 8)?TRUE:FALSE /* big endian */ |
18685 |
(bits[b] > 8)?TRUE:FALSE /* big endian */ |
18834 |
--- ./jdk/src/solaris/native/common/jni_util_md.c Sat Oct 06 10:26:40 2018 +0100 |
18686 |
--- ./jdk/src/solaris/native/common/jni_util_md.c Sat Jun 23 21:02:10 2018 -0700 |
18835 |
+++ ./jdk/src/solaris/native/common/jni_util_md.c Sat Dec 01 12:24:15 2018 -0800 |
18687 |
+++ ./jdk/src/solaris/native/common/jni_util_md.c Sun Sep 02 07:33:40 2018 -0700 |
18836 |
@@ -28,6 +28,7 @@ |
18688 |
@@ -28,6 +28,7 @@ |
18837 |
#include "jni.h" |
18689 |
#include "jni.h" |
18838 |
#include "jni_util.h" |
18690 |
#include "jni_util.h" |
Lines 18841-18848
Link Here
|
18841 |
|
18693 |
|
18842 |
jstring nativeNewStringPlatform(JNIEnv *env, const char *str) { |
18694 |
jstring nativeNewStringPlatform(JNIEnv *env, const char *str) { |
18843 |
return NULL; |
18695 |
return NULL; |
18844 |
--- ./jdk/src/solaris/native/java/lang/java_props_md.c Sat Oct 06 10:26:40 2018 +0100 |
18696 |
--- ./jdk/src/solaris/native/java/lang/java_props_md.c Sat Jun 23 21:02:10 2018 -0700 |
18845 |
+++ ./jdk/src/solaris/native/java/lang/java_props_md.c Sat Dec 01 12:24:15 2018 -0800 |
18697 |
+++ ./jdk/src/solaris/native/java/lang/java_props_md.c Sun Sep 02 07:33:40 2018 -0700 |
18846 |
@@ -111,7 +111,7 @@ |
18698 |
@@ -111,7 +111,7 @@ |
18847 |
lc = setlocale(cat, NULL); |
18699 |
lc = setlocale(cat, NULL); |
18848 |
#endif |
18700 |
#endif |
Lines 18877-18884
Link Here
|
18877 |
|
18729 |
|
18878 |
/* user properties */ |
18730 |
/* user properties */ |
18879 |
{ |
18731 |
{ |
18880 |
--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Sat Oct 06 10:26:40 2018 +0100 |
18732 |
--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Sat Jun 23 21:02:10 2018 -0700 |
18881 |
+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Sat Dec 01 12:24:15 2018 -0800 |
18733 |
+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Sun Sep 02 07:33:40 2018 -0700 |
18882 |
@@ -36,20 +36,13 @@ |
18734 |
@@ -36,20 +36,13 @@ |
18883 |
#include <stdlib.h> |
18735 |
#include <stdlib.h> |
18884 |
#include <ctype.h> |
18736 |
#include <ctype.h> |
Lines 18901-18907
Link Here
|
18901 |
|
18753 |
|
18902 |
|
18754 |
|
18903 |
#if defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R) |
18755 |
#if defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R) |
18904 |
@@ -415,6 +408,17 @@ |
18756 |
@@ -417,6 +410,17 @@ |
18905 |
} |
18757 |
} |
18906 |
#endif |
18758 |
#endif |
18907 |
|
18759 |
|
Lines 18919-18926
Link Here
|
18919 |
error = getaddrinfo(hostname, NULL, &hints, &res); |
18771 |
error = getaddrinfo(hostname, NULL, &hints, &res); |
18920 |
|
18772 |
|
18921 |
if (error) { |
18773 |
if (error) { |
18922 |
--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Sat Oct 06 10:26:40 2018 +0100 |
18774 |
--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Sat Jun 23 21:02:10 2018 -0700 |
18923 |
+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Sat Dec 01 12:24:15 2018 -0800 |
18775 |
+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Sun Sep 02 07:33:40 2018 -0700 |
18924 |
@@ -33,7 +33,7 @@ |
18776 |
@@ -33,7 +33,7 @@ |
18925 |
#include <strings.h> |
18777 |
#include <strings.h> |
18926 |
#include <stdlib.h> |
18778 |
#include <stdlib.h> |
Lines 18930-18936
Link Here
|
18930 |
#include <ifaddrs.h> |
18782 |
#include <ifaddrs.h> |
18931 |
#include <net/if.h> |
18783 |
#include <net/if.h> |
18932 |
#include <unistd.h> /* gethostname */ |
18784 |
#include <unistd.h> /* gethostname */ |
18933 |
@@ -99,9 +99,9 @@ |
18785 |
@@ -112,9 +112,9 @@ |
18934 |
return (*env)->NewStringUTF(env, hostname); |
18786 |
return (*env)->NewStringUTF(env, hostname); |
18935 |
} |
18787 |
} |
18936 |
|
18788 |
|
Lines 18942-18948
Link Here
|
18942 |
lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6) |
18794 |
lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6) |
18943 |
{ |
18795 |
{ |
18944 |
jobjectArray result = NULL; |
18796 |
jobjectArray result = NULL; |
18945 |
@@ -256,6 +256,19 @@ |
18797 |
@@ -269,6 +269,19 @@ |
18946 |
hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE); |
18798 |
hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE); |
18947 |
CHECK_NULL_RETURN(hostname, NULL); |
18799 |
CHECK_NULL_RETURN(hostname, NULL); |
18948 |
|
18800 |
|
Lines 18962-18969
Link Here
|
18962 |
#ifdef AF_INET6 |
18814 |
#ifdef AF_INET6 |
18963 |
/* Try once, with our static buffer. */ |
18815 |
/* Try once, with our static buffer. */ |
18964 |
memset(&hints, 0, sizeof(hints)); |
18816 |
memset(&hints, 0, sizeof(hints)); |
18965 |
--- ./jdk/src/solaris/native/java/net/NetworkInterface.c Sat Oct 06 10:26:40 2018 +0100 |
18817 |
--- ./jdk/src/solaris/native/java/net/NetworkInterface.c Sat Jun 23 21:02:10 2018 -0700 |
18966 |
+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Sat Dec 01 12:24:15 2018 -0800 |
18818 |
+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Sun Sep 02 07:33:40 2018 -0700 |
18967 |
@@ -58,14 +58,19 @@ |
18819 |
@@ -58,14 +58,19 @@ |
18968 |
#include <sys/param.h> |
18820 |
#include <sys/param.h> |
18969 |
#include <sys/ioctl.h> |
18821 |
#include <sys/ioctl.h> |
Lines 18986-18993
Link Here
|
18986 |
|
18838 |
|
18987 |
#include "jvm.h" |
18839 |
#include "jvm.h" |
18988 |
#include "jni_util.h" |
18840 |
#include "jni_util.h" |
18989 |
--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sat Oct 06 10:26:40 2018 +0100 |
18841 |
--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sat Jun 23 21:02:10 2018 -0700 |
18990 |
+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sat Dec 01 12:24:15 2018 -0800 |
18842 |
+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sun Sep 02 07:33:40 2018 -0700 |
18991 |
@@ -2243,7 +2243,7 @@ |
18843 |
@@ -2243,7 +2243,7 @@ |
18992 |
} |
18844 |
} |
18993 |
} |
18845 |
} |
Lines 18997-19004
Link Here
|
18997 |
if (family == AF_INET6 && index == 0) { |
18849 |
if (family == AF_INET6 && index == 0) { |
18998 |
index = getDefaultScopeID(env); |
18850 |
index = getDefaultScopeID(env); |
18999 |
} |
18851 |
} |
19000 |
--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Sat Oct 06 10:26:40 2018 +0100 |
18852 |
--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Sat Jun 23 21:02:10 2018 -0700 |
19001 |
+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Sat Dec 01 12:24:15 2018 -0800 |
18853 |
+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Sun Sep 02 07:33:40 2018 -0700 |
19002 |
@@ -215,6 +215,7 @@ |
18854 |
@@ -215,6 +215,7 @@ |
19003 |
} |
18855 |
} |
19004 |
|
18856 |
|
Lines 19015-19022
Link Here
|
19015 |
#endif /* AF_INET6 */ |
18867 |
#endif /* AF_INET6 */ |
19016 |
|
18868 |
|
19017 |
/* |
18869 |
/* |
19018 |
--- ./jdk/src/solaris/native/java/net/bsd_close.c Sat Oct 06 10:26:40 2018 +0100 |
18870 |
--- ./jdk/src/solaris/native/java/net/bsd_close.c Sat Jun 23 21:02:10 2018 -0700 |
19019 |
+++ ./jdk/src/solaris/native/java/net/bsd_close.c Sat Dec 01 12:24:15 2018 -0800 |
18871 |
+++ ./jdk/src/solaris/native/java/net/bsd_close.c Sun Sep 02 07:33:40 2018 -0700 |
19020 |
@@ -320,11 +320,8 @@ |
18872 |
@@ -320,11 +320,8 @@ |
19021 |
} |
18873 |
} |
19022 |
|
18874 |
|
Lines 19106-19113
Link Here
|
19106 |
} |
18958 |
} |
19107 |
+#endif |
18959 |
+#endif |
19108 |
} |
18960 |
} |
19109 |
--- ./jdk/src/solaris/native/java/net/net_util_md.c Sat Oct 06 10:26:40 2018 +0100 |
18961 |
--- ./jdk/src/solaris/native/java/net/net_util_md.c Sat Jun 23 21:02:10 2018 -0700 |
19110 |
+++ ./jdk/src/solaris/native/java/net/net_util_md.c Sat Dec 01 12:24:15 2018 -0800 |
18962 |
+++ ./jdk/src/solaris/native/java/net/net_util_md.c Sun Sep 02 07:33:40 2018 -0700 |
19111 |
@@ -46,6 +46,10 @@ |
18963 |
@@ -46,6 +46,10 @@ |
19112 |
#endif |
18964 |
#endif |
19113 |
#endif |
18965 |
#endif |
Lines 19128-19135
Link Here
|
19128 |
static jclass ni_class = NULL; |
18980 |
static jclass ni_class = NULL; |
19129 |
static jfieldID ni_defaultIndexID; |
18981 |
static jfieldID ni_defaultIndexID; |
19130 |
if (ni_class == NULL) { |
18982 |
if (ni_class == NULL) { |
19131 |
--- ./jdk/src/solaris/native/java/util/TimeZone_md.c Sat Oct 06 10:26:40 2018 +0100 |
18983 |
--- ./jdk/src/solaris/native/java/util/TimeZone_md.c Sat Jun 23 21:02:10 2018 -0700 |
19132 |
+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Sat Dec 01 12:24:15 2018 -0800 |
18984 |
+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Sun Sep 02 07:33:40 2018 -0700 |
19133 |
@@ -56,7 +56,11 @@ |
18985 |
@@ -56,7 +56,11 @@ |
19134 |
#endif |
18986 |
#endif |
19135 |
|
18987 |
|
Lines 19193-19200
Link Here
|
19193 |
} |
19045 |
} |
19194 |
-#endif /* MACOSX */ |
19046 |
-#endif /* MACOSX */ |
19195 |
+#endif /* _ALLBSD_SOURCE */ |
19047 |
+#endif /* _ALLBSD_SOURCE */ |
19196 |
--- ./jdk/src/solaris/native/sun/awt/awt_Font.c Sat Oct 06 10:26:40 2018 +0100 |
19048 |
--- ./jdk/src/solaris/native/sun/awt/awt_Font.c Sat Jun 23 21:02:10 2018 -0700 |
19197 |
+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Sat Dec 01 12:24:15 2018 -0800 |
19049 |
+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Sun Sep 02 07:33:40 2018 -0700 |
19198 |
@@ -255,7 +255,7 @@ |
19050 |
@@ -255,7 +255,7 @@ |
19199 |
if (strcmp(style, "regular") == 0) { |
19051 |
if (strcmp(style, "regular") == 0) { |
19200 |
altstyle = "roman"; |
19052 |
altstyle = "roman"; |
Lines 19204-19211
Link Here
|
19204 |
if (!strcmp(family, "lucidasans")) { |
19056 |
if (!strcmp(family, "lucidasans")) { |
19205 |
family = "lucida"; |
19057 |
family = "lucida"; |
19206 |
} |
19058 |
} |
19207 |
--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sat Oct 06 10:26:40 2018 +0100 |
19059 |
--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sat Jun 23 21:02:10 2018 -0700 |
19208 |
+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sat Dec 01 12:24:15 2018 -0800 |
19060 |
+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sun Sep 02 07:33:40 2018 -0700 |
19209 |
@@ -121,7 +121,7 @@ |
19061 |
@@ -121,7 +121,7 @@ |
19210 |
*/ |
19062 |
*/ |
19211 |
|
19063 |
|
Lines 19290-19297
Link Here
|
19290 |
#endif /* HEADLESS */ |
19142 |
#endif /* HEADLESS */ |
19291 |
return point; |
19143 |
return point; |
19292 |
} |
19144 |
} |
19293 |
--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sat Oct 06 10:26:40 2018 +0100 |
19145 |
--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sat Jun 23 21:02:10 2018 -0700 |
19294 |
+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sat Dec 01 12:24:15 2018 -0800 |
19146 |
+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sun Sep 02 07:33:40 2018 -0700 |
19295 |
@@ -52,7 +52,7 @@ |
19147 |
@@ -52,7 +52,7 @@ |
19296 |
XIMPreeditDrawCallbackStruct *); |
19148 |
XIMPreeditDrawCallbackStruct *); |
19297 |
static void PreeditCaretCallback(XIC, XPointer, |
19149 |
static void PreeditCaretCallback(XIC, XPointer, |
Lines 19511-19519
Link Here
|
19511 |
AWT_LOCK(); |
19363 |
AWT_LOCK(); |
19512 |
adjustStatusWindow(window); |
19364 |
adjustStatusWindow(window); |
19513 |
AWT_UNLOCK(); |
19365 |
AWT_UNLOCK(); |
19514 |
--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sat Oct 06 10:26:40 2018 +0100 |
19366 |
--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sat Jun 23 21:02:10 2018 -0700 |
19515 |
+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sat Dec 01 12:24:15 2018 -0800 |
19367 |
+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sun Sep 02 07:33:40 2018 -0700 |
19516 |
@@ -48,7 +48,7 @@ |
19368 |
@@ -45,7 +45,7 @@ |
19517 |
#include "wsutils.h" |
19369 |
#include "wsutils.h" |
19518 |
#include "list.h" |
19370 |
#include "list.h" |
19519 |
#include "multiVis.h" |
19371 |
#include "multiVis.h" |
Lines 19522-19529
Link Here
|
19522 |
#include <sys/socket.h> |
19374 |
#include <sys/socket.h> |
19523 |
#endif |
19375 |
#endif |
19524 |
|
19376 |
|
19525 |
--- ./jdk/src/solaris/native/sun/awt/extutil.h Sat Oct 06 10:26:40 2018 +0100 |
19377 |
--- ./jdk/src/solaris/native/sun/awt/extutil.h Sat Jun 23 21:02:10 2018 -0700 |
19526 |
+++ ./jdk/src/solaris/native/sun/awt/extutil.h Sat Dec 01 12:24:15 2018 -0800 |
19378 |
+++ ./jdk/src/solaris/native/sun/awt/extutil.h Sun Sep 02 07:33:40 2018 -0700 |
19527 |
@@ -58,7 +58,7 @@ |
19379 |
@@ -58,7 +58,7 @@ |
19528 |
*/ |
19380 |
*/ |
19529 |
/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */ |
19381 |
/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */ |
Lines 19539-19546
Link Here
|
19539 |
|
19391 |
|
19540 |
-#endif /* __linux__ || MACOSX */ |
19392 |
-#endif /* __linux__ || MACOSX */ |
19541 |
+#endif /* __linux__ || _ALLBSD_SOURCE */ |
19393 |
+#endif /* __linux__ || _ALLBSD_SOURCE */ |
19542 |
--- ./jdk/src/solaris/native/sun/awt/fontpath.c Sat Oct 06 10:26:40 2018 +0100 |
19394 |
--- ./jdk/src/solaris/native/sun/awt/fontpath.c Sat Jun 23 21:02:10 2018 -0700 |
19543 |
+++ ./jdk/src/solaris/native/sun/awt/fontpath.c Sat Dec 01 12:24:15 2018 -0800 |
19395 |
+++ ./jdk/src/solaris/native/sun/awt/fontpath.c Sun Sep 02 07:33:40 2018 -0700 |
19544 |
@@ -23,9 +23,9 @@ |
19396 |
@@ -23,9 +23,9 @@ |
19545 |
* questions. |
19397 |
* questions. |
19546 |
*/ |
19398 |
*/ |
Lines 19620-19636
Link Here
|
19620 |
} |
19472 |
} |
19621 |
#endif |
19473 |
#endif |
19622 |
} |
19474 |
} |
19623 |
@@ -1247,7 +1262,7 @@ |
19475 |
@@ -1237,7 +1252,7 @@ |
19624 |
*/ |
19476 |
*/ |
19625 |
if (fontformat != NULL |
19477 |
if (fontformat != NULL |
19626 |
&& (strcmp((char*)fontformat, "TrueType") != 0) |
19478 |
&& (strcmp((char*)fontformat, "TrueType") != 0) |
19627 |
-#if defined(__linux__) || defined(_AIX) |
19479 |
-#if defined(__linux__) || defined(_AIX) |
19628 |
+#if defined(__linux__) || defined(_AIX) || defined(_ALLBSD_SOURCE) |
19480 |
+#if defined(__linux__) || defined(_AIX) || defined(_ALLBSD_SOURCE) |
19629 |
&& (strcmp((char*)fontformat, "Type 1") != 0) |
19481 |
&& (strcmp((char*)fontformat, "Type 1") != 0) |
19630 |
&& !(isOpenJDK && (strcmp((char*)fontformat, "CFF") == 0)) |
|
|
19631 |
#endif |
19482 |
#endif |
19632 |
--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sat Oct 06 10:26:40 2018 +0100 |
19483 |
) { |
19633 |
+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sat Dec 01 12:24:15 2018 -0800 |
19484 |
--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sat Jun 23 21:02:10 2018 -0700 |
|
|
19485 |
+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sun Sep 02 07:33:40 2018 -0700 |
19634 |
@@ -28,11 +28,11 @@ |
19486 |
@@ -28,11 +28,11 @@ |
19635 |
#include <sys/types.h> |
19487 |
#include <sys/types.h> |
19636 |
|
19488 |
|
Lines 19646-19653
Link Here
|
19646 |
|
19498 |
|
19647 |
typedef unsigned char jubyte; |
19499 |
typedef unsigned char jubyte; |
19648 |
typedef unsigned short jushort; |
19500 |
typedef unsigned short jushort; |
19649 |
--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Sat Oct 06 10:26:40 2018 +0100 |
19501 |
--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Sat Jun 23 21:02:10 2018 -0700 |
19650 |
+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Sat Dec 01 12:24:15 2018 -0800 |
19502 |
+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Sun Sep 02 07:33:40 2018 -0700 |
19651 |
@@ -63,9 +63,6 @@ |
19503 |
@@ -63,9 +63,6 @@ |
19652 |
* MLIB_EDGE_SRC_PADDED |
19504 |
* MLIB_EDGE_SRC_PADDED |
19653 |
*/ |
19505 |
*/ |
Lines 19752-19759
Link Here
|
19752 |
LOGIC(da[0], dtmp, dtmp1, |); |
19604 |
LOGIC(da[0], dtmp, dtmp1, |); |
19753 |
} |
19605 |
} |
19754 |
else { /* aligned */ |
19606 |
else { /* aligned */ |
19755 |
--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sat Oct 06 10:26:40 2018 +0100 |
19607 |
--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sat Jun 23 21:02:10 2018 -0700 |
19756 |
+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sat Dec 01 12:24:15 2018 -0800 |
19608 |
+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sun Sep 02 07:33:40 2018 -0700 |
19757 |
@@ -804,7 +804,7 @@ |
19609 |
@@ -804,7 +804,7 @@ |
19758 |
static int initialized; |
19610 |
static int initialized; |
19759 |
static int usevis = JNI_TRUE; |
19611 |
static int usevis = JNI_TRUE; |
Lines 19764-19770
Link Here
|
19764 |
#else |
19616 |
#else |
19765 |
# define ULTRA_CHIP "sun4u" |
19617 |
# define ULTRA_CHIP "sun4u" |
19766 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
19618 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
19767 |
+++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c Sat Dec 01 12:24:15 2018 -0800 |
19619 |
+++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c Sun Sep 02 07:33:40 2018 -0700 |
19768 |
@@ -0,0 +1,42 @@ |
19620 |
@@ -0,0 +1,42 @@ |
19769 |
+/* |
19621 |
+/* |
19770 |
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
19622 |
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
Lines 19808-19815
Link Here
|
19808 |
+{ |
19660 |
+{ |
19809 |
+ return (jdouble) -1; |
19661 |
+ return (jdouble) -1; |
19810 |
+} |
19662 |
+} |
19811 |
--- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Sat Oct 06 10:26:40 2018 +0100 |
19663 |
--- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Sat Jun 23 21:02:10 2018 -0700 |
19812 |
+++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Sat Dec 01 12:24:15 2018 -0800 |
19664 |
+++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Sun Sep 02 07:33:40 2018 -0700 |
19813 |
@@ -56,6 +56,9 @@ |
19665 |
@@ -56,6 +56,9 @@ |
19814 |
#include <limits.h> |
19666 |
#include <limits.h> |
19815 |
#include <stdlib.h> |
19667 |
#include <stdlib.h> |
Lines 19974-19981
Link Here
|
19974 |
return -1; |
19826 |
return -1; |
19975 |
} |
19827 |
} |
19976 |
|
19828 |
|
19977 |
--- ./jdk/src/solaris/native/sun/net/portconfig.c Sat Oct 06 10:26:40 2018 +0100 |
19829 |
--- ./jdk/src/solaris/native/sun/net/portconfig.c Sat Jun 23 21:02:10 2018 -0700 |
19978 |
+++ ./jdk/src/solaris/native/sun/net/portconfig.c Sat Dec 01 12:24:15 2018 -0800 |
19830 |
+++ ./jdk/src/solaris/native/sun/net/portconfig.c Sun Sep 02 07:33:40 2018 -0700 |
19979 |
@@ -67,6 +67,24 @@ |
19831 |
@@ -67,6 +67,24 @@ |
19980 |
range->lower = net_getParam("/dev/tcp", "tcp_smallest_anon_port"); |
19832 |
range->lower = net_getParam("/dev/tcp", "tcp_smallest_anon_port"); |
19981 |
return 0; |
19833 |
return 0; |
Lines 20001-20008
Link Here
|
20001 |
#elif defined(_ALLBSD_SOURCE) |
19853 |
#elif defined(_ALLBSD_SOURCE) |
20002 |
{ |
19854 |
{ |
20003 |
int ret; |
19855 |
int ret; |
20004 |
--- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sat Oct 06 10:26:40 2018 +0100 |
19856 |
--- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sat Jun 23 21:02:10 2018 -0700 |
20005 |
+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sat Dec 01 12:24:15 2018 -0800 |
19857 |
+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sun Sep 02 07:33:40 2018 -0700 |
20006 |
@@ -67,7 +67,7 @@ |
19858 |
@@ -67,7 +67,7 @@ |
20007 |
|
19859 |
|
20008 |
|
19860 |
|
Lines 20051-20058
Link Here
|
20051 |
jboolean loadSocketExtensionFuncs(JNIEnv* env); |
19903 |
jboolean loadSocketExtensionFuncs(JNIEnv* env); |
20052 |
|
19904 |
|
20053 |
#endif /* !SUN_NIO_CH_SCTP_H */ |
19905 |
#endif /* !SUN_NIO_CH_SCTP_H */ |
20054 |
--- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sat Oct 06 10:26:40 2018 +0100 |
19906 |
--- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sat Jun 23 21:02:10 2018 -0700 |
20055 |
+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sat Dec 01 12:24:15 2018 -0800 |
19907 |
+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sun Sep 02 07:33:40 2018 -0700 |
20056 |
@@ -58,6 +58,7 @@ |
19908 |
@@ -58,6 +58,7 @@ |
20057 |
*/ |
19909 |
*/ |
20058 |
jboolean loadSocketExtensionFuncs |
19910 |
jboolean loadSocketExtensionFuncs |
Lines 20069-20076
Link Here
|
20069 |
|
19921 |
|
20070 |
funcsLoaded = JNI_TRUE; |
19922 |
funcsLoaded = JNI_TRUE; |
20071 |
return JNI_TRUE; |
19923 |
return JNI_TRUE; |
20072 |
--- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Sat Oct 06 10:26:40 2018 +0100 |
19924 |
--- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Sat Jun 23 21:02:10 2018 -0700 |
20073 |
+++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Sat Dec 01 12:24:15 2018 -0800 |
19925 |
+++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Sun Sep 02 07:33:40 2018 -0700 |
20074 |
@@ -31,6 +31,12 @@ |
19926 |
@@ -31,6 +31,12 @@ |
20075 |
#include <dlfcn.h> |
19927 |
#include <dlfcn.h> |
20076 |
#include <string.h> |
19928 |
#include <string.h> |
Lines 20093-20100
Link Here
|
20093 |
if (magic_handle == NULL) { |
19945 |
if (magic_handle == NULL) { |
20094 |
return JNI_FALSE; |
19946 |
return JNI_FALSE; |
20095 |
} |
19947 |
} |
20096 |
--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sat Oct 06 10:26:40 2018 +0100 |
19948 |
--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sat Jun 23 21:02:10 2018 -0700 |
20097 |
+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sat Dec 01 12:24:15 2018 -0800 |
19949 |
+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sun Sep 02 07:33:40 2018 -0700 |
20098 |
@@ -54,7 +54,7 @@ |
19950 |
@@ -54,7 +54,7 @@ |
20099 |
} |
19951 |
} |
20100 |
|
19952 |
|
Lines 20104-20111
Link Here
|
20104 |
void *hModule = dlopen(libName, RTLD_LAZY); |
19956 |
void *hModule = dlopen(libName, RTLD_LAZY); |
20105 |
#else |
19957 |
#else |
20106 |
void *hModule = dlopen(libName, RTLD_NOLOAD); |
19958 |
void *hModule = dlopen(libName, RTLD_NOLOAD); |
20107 |
--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Sat Oct 06 10:26:40 2018 +0100 |
19959 |
--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Sat Jun 23 21:02:10 2018 -0700 |
20108 |
+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Sat Dec 01 12:24:15 2018 -0800 |
19960 |
+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Sun Sep 02 07:33:40 2018 -0700 |
20109 |
@@ -38,7 +38,9 @@ |
19961 |
@@ -38,7 +38,9 @@ |
20110 |
#include <sys/types.h> |
19962 |
#include <sys/types.h> |
20111 |
#include <sys/socket.h> |
19963 |
#include <sys/socket.h> |
Lines 20116-20123
Link Here
|
20116 |
#include <sys/un.h> |
19968 |
#include <sys/un.h> |
20117 |
#include <fcntl.h> |
19969 |
#include <fcntl.h> |
20118 |
|
19970 |
|
20119 |
--- ./jdk/src/solaris/native/sun/xawt/XWindow.c Sat Oct 06 10:26:40 2018 +0100 |
19971 |
--- ./jdk/src/solaris/native/sun/xawt/XWindow.c Sat Jun 23 21:02:10 2018 -0700 |
20120 |
+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Sat Dec 01 12:24:15 2018 -0800 |
19972 |
+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Sun Sep 02 07:33:40 2018 -0700 |
20121 |
@@ -886,7 +886,7 @@ |
19973 |
@@ -886,7 +886,7 @@ |
20122 |
{ |
19974 |
{ |
20123 |
KeySym originalKeysym = *keysym; |
19975 |
KeySym originalKeysym = *keysym; |
Lines 20127-20134
Link Here
|
20127 |
/* The following code on Linux will cause the keypad keys |
19979 |
/* The following code on Linux will cause the keypad keys |
20128 |
* not to echo on JTextField when the NumLock is on. The |
19980 |
* not to echo on JTextField when the NumLock is on. The |
20129 |
* keysyms will be 0, because the last parameter 2 is not defined. |
19981 |
* keysyms will be 0, because the last parameter 2 is not defined. |
20130 |
--- ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Sat Oct 06 10:26:40 2018 +0100 |
19982 |
--- ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Sat Jun 23 21:02:10 2018 -0700 |
20131 |
+++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Sat Dec 01 12:24:15 2018 -0800 |
19983 |
+++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Sun Sep 02 07:33:40 2018 -0700 |
20132 |
@@ -308,7 +308,7 @@ |
19984 |
@@ -308,7 +308,7 @@ |
20133 |
DAUDIO_PCM, |
19985 |
DAUDIO_PCM, |
20134 |
(bitsArray[bitIndex]==8)?FALSE:TRUE, /* signed */ |
19986 |
(bitsArray[bitIndex]==8)?FALSE:TRUE, /* signed */ |
Lines 20147-20160
Link Here
|
20147 |
isBigEndian |
19999 |
isBigEndian |
20148 |
#else |
20000 |
#else |
20149 |
!isBigEndian |
20001 |
!isBigEndian |
20150 |
--- ./nashorn/test/script/jfx.js Sat Oct 06 10:28:09 2018 +0100 |
|
|
20151 |
+++ ./nashorn/test/script/jfx.js Wed Nov 21 19:36:40 2018 -0800 |
20152 |
@@ -93,6 +93,8 @@ |
20153 |
f2 = new File(sb.append(fsep + "linux.png").toString()); |
20154 |
} else if (OSInfo.getOSType() == OSType.MACOSX) { |
20155 |
f2 = new File(sb.append(fsep + "macosx.png").toString()); |
20156 |
+ } else if (OSInfo.getOSType() == OSType.BSD) { |
20157 |
+ f2 = new File(sb.append(fsep + "bsd.png").toString()); |
20158 |
} |
20159 |
if (f1.exists() && f2.exists()) { |
20160 |
var image1 = new AWTImage(PNGDecoder.decode(f1.getAbsolutePath())); |