Date: Tue, 12 Feb 2019 11:48:56 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492778 - in head/java/openjdk8: . files Message-ID: <201902121148.x1CBmuRv079929@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Tue Feb 12 11:48:56 2019 New Revision: 492778 URL: https://svnweb.freebsd.org/changeset/ports/492778 Log: . Update to 8u202. Deleted: head/java/openjdk8/files/patch-endian Modified: head/java/openjdk8/Makefile head/java/openjdk8/distinfo head/java/openjdk8/files/patch-bsd head/java/openjdk8/files/patch-bsd-test Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Tue Feb 12 11:46:33 2019 (r492777) +++ head/java/openjdk8/Makefile Tue Feb 12 11:48:56 2019 (r492778) @@ -2,7 +2,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 5 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ @@ -35,7 +34,8 @@ PATCHFILES= patch-8u05-b13.xz \ patch-8u162-b12.xz \ patch-8u172-b11.xz \ patch-8u181-b13.xz \ - patch-8u192-b26.xz + patch-8u192-b26.xz \ + patch-8u202-b08.xz MAINTAINER= java@FreeBSD.org COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} @@ -208,8 +208,8 @@ INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 192 -JDK_BUILD_NUMBER= 26 +JDK_UPDATE_VERSION= 202 +JDK_BUILD_NUMBER= 08 DIST_BUILD_NUMBER= 132 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 Modified: head/java/openjdk8/distinfo ============================================================================== --- head/java/openjdk8/distinfo Tue Feb 12 11:46:33 2019 (r492777) +++ head/java/openjdk8/distinfo Tue Feb 12 11:48:56 2019 (r492778) @@ -1,4 +1,4 @@ -TIMESTAMP = 1536423017 +TIMESTAMP = 1549756797 SHA256 (openjdk-8-src-b132-03_mar_2014.zip) = ba651f9aa68fdc823b2ef55510710a013ab9f78fff291d5dc1c4d166f3e1e589 SIZE (openjdk-8-src-b132-03_mar_2014.zip) = 124099402 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c @@ -51,3 +51,5 @@ SHA256 (patch-8u181-b13.xz) = 4cd0f5a04b72ad6c4ef73807 SIZE (patch-8u181-b13.xz) = 69096 SHA256 (patch-8u192-b26.xz) = 5bfa782ec2af8ddc6aed3e8de81cc37c7f375ebad650341d1ce74956c82a411e SIZE (patch-8u192-b26.xz) = 284164 +SHA256 (patch-8u202-b08.xz) = 16195793d00b1fbe18e4d3a4cab2db1e5a28722e43d3466d03283ab01d9524d0 +SIZE (patch-8u202-b08.xz) = 202660 Modified: head/java/openjdk8/files/patch-bsd ============================================================================== --- head/java/openjdk8/files/patch-bsd Tue Feb 12 11:46:33 2019 (r492777) +++ head/java/openjdk8/files/patch-bsd Tue Feb 12 11:48:56 2019 (r492778) @@ -1,5 +1,5 @@ ---- ./common/autoconf/build-performance.m4 Sat Oct 06 10:24:47 2018 +0100 -+++ ./common/autoconf/build-performance.m4 Sat Dec 01 12:25:45 2018 -0800 +--- ./common/autoconf/build-performance.m4 Sat Dec 08 11:48:10 2018 +0000 ++++ ./common/autoconf/build-performance.m4 Sat Feb 09 10:03:01 2019 -0800 @@ -41,6 +41,10 @@ # Looks like a MacOSX system NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` @@ -38,8 +38,8 @@ AC_MSG_RESULT([no, disabling ccache]) CCACHE= CCACHE_STATUS="disabled" ---- ./common/autoconf/flags.m4 Sat Oct 06 10:24:47 2018 +0100 -+++ ./common/autoconf/flags.m4 Sat Dec 01 12:25:45 2018 -0800 +--- ./common/autoconf/flags.m4 Sat Dec 08 11:48:10 2018 +0000 ++++ ./common/autoconf/flags.m4 Sat Feb 09 10:03:01 2019 -0800 @@ -154,7 +154,7 @@ # How to compile shared libraries. # @@ -58,16 +58,16 @@ C_FLAG_DEPS="-MMD -MF" elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then C_FLAG_DEPS="-xMMD -xMF" -@@ -278,7 +278,7 @@ - AC_SUBST(CXX_FLAG_DEPS) - - # Debug symbols +@@ -283,7 +283,7 @@ + # info flags for toolchains unless we know they work. + # See JDK-8207057. + ASFLAGS_DEBUG_SYMBOLS="" - if test "x$TOOLCHAIN_TYPE" = xgcc; then + if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then CFLAGS_DEBUG_SYMBOLS="-g1" CXXFLAGS_DEBUG_SYMBOLS="-g1" -@@ -327,7 +327,7 @@ +@@ -334,7 +334,7 @@ else # The remaining toolchains share opt flags between CC and CXX; # setup for C and duplicate afterwards. @@ -76,7 +76,7 @@ if test "x$OPENJDK_TARGET_OS" = xmacosx; then # On MacOSX we optimize for size, something # we should do for all platforms? -@@ -431,7 +431,7 @@ +@@ -452,7 +452,7 @@ # Setup compiler/platform specific flags to CFLAGS_JDK, # CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?) @@ -85,8 +85,28 @@ # these options are used for both C and C++ compiles CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \ -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" -@@ -633,7 +633,7 @@ +@@ -548,6 +548,9 @@ + else + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN" fi ++ if test "x$OPENJDK_TARGET_OS" = xbsd; then ++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN" ++ fi + else + # Same goes for _BIG_ENDIAN. Do we really need to set *ENDIAN on Solaris if they + # are defined in the system? +@@ -556,6 +559,9 @@ + else + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" + fi ++ if test "x$OPENJDK_TARGET_OS" = xbsd; then ++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_BIG_ENDIAN" ++ fi + fi + if test "x$OPENJDK_TARGET_CPU" = xppc64le; then + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2" +@@ -661,7 +667,7 @@ + fi LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE" else - if test "x$TOOLCHAIN_TYPE" = xgcc; then @@ -94,9 +114,9 @@ # If this is a --hash-style=gnu system, use --hash-style=both, why? # We have previously set HAS_GNU_HASH if this is the case if test -n "$HAS_GNU_HASH"; then ---- ./common/autoconf/generated-configure.sh Sat Oct 06 10:24:47 2018 +0100 -+++ ./common/autoconf/generated-configure.sh Sat Dec 01 12:25:45 2018 -0800 -@@ -654,6 +654,8 @@ +--- ./common/autoconf/generated-configure.sh Sat Dec 08 11:48:10 2018 +0000 ++++ ./common/autoconf/generated-configure.sh Sat Feb 09 10:03:01 2019 -0800 +@@ -655,6 +655,8 @@ LIBM LIBZIP_CAN_USE_MMAP USE_EXTERNAL_LIBZ @@ -105,7 +125,7 @@ USE_EXTERNAL_LIBGIF USE_EXTERNAL_LIBJPEG ALSA_LIBS -@@ -837,6 +839,7 @@ +@@ -839,6 +841,7 @@ JDK_MAJOR_VERSION USER_RELEASE_SUFFIX COMPRESS_JARS @@ -113,7 +133,7 @@ UNLIMITED_CRYPTO CACERTS_FILE TEST_IN_BUILD -@@ -914,6 +917,7 @@ +@@ -916,6 +919,7 @@ OPENJDK_TARGET_CPU OPENJDK_TARGET_OS_ENV OPENJDK_TARGET_OS_API @@ -121,7 +141,7 @@ OPENJDK_TARGET_OS OPENJDK_BUILD_CPU_ENDIAN OPENJDK_BUILD_CPU_BITS -@@ -1050,6 +1054,7 @@ +@@ -1052,6 +1056,7 @@ enable_hotspot_test_in_build with_cacerts_file enable_unlimited_crypto @@ -129,7 +149,7 @@ with_milestone with_update_version with_user_release_suffix -@@ -1070,6 +1075,7 @@ +@@ -1072,6 +1077,7 @@ with_import_hotspot with_toolchain_type with_toolchain_version @@ -137,7 +157,7 @@ with_jtreg with_extra_cflags with_extra_cxxflags -@@ -1827,6 +1833,7 @@ +@@ -1830,6 +1836,7 @@ run the Queens test after Hotspot build [disabled] --enable-unlimited-crypto Enable unlimited crypto policy [disabled] @@ -145,7 +165,7 @@ --disable-debug-symbols disable generation of debug symbols [enabled] --disable-zip-debug-info disable zipping of debug-info files [enabled] -@@ -1919,6 +1926,8 @@ +@@ -1922,6 +1929,8 @@ the version of the toolchain to look for, use '--help' to show possible values [platform dependent] @@ -154,7 +174,113 @@ --with-jtreg Regression Test Harness [probed] --with-extra-cflags extra flags to be used when compiling jdk c-files --with-extra-cxxflags extra flags to be used when compiling jdk c++-files -@@ -4121,6 +4130,7 @@ +@@ -2342,6 +2351,52 @@ + + } # ac_fn_objc_try_compile + ++# ac_fn_cxx_try_link LINENO ++# ------------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ test -x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_cxx_try_link ++ + # ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES + # --------------------------------------------------------- + # Tests whether HEADER exists, giving a warning if it cannot be compiled using +@@ -2689,52 +2744,6 @@ + + } # ac_fn_cxx_compute_int + +-# ac_fn_cxx_try_link LINENO +-# ------------------------- +-# Try to link conftest.$ac_ext, and return whether this succeeded. +-ac_fn_cxx_try_link () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- rm -f conftest.$ac_objext conftest$ac_exeext +- if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- test -x conftest$ac_exeext +- }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 +-fi +- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information +- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would +- # interfere with the next link command; also delete a directory that is +- # left behind by Apple's compiler. We do this before executing the actions. +- rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_cxx_try_link +- + # ac_fn_cxx_check_func LINENO FUNC VAR + # ------------------------------------ + # Tests whether FUNC exists, setting the cache variable VAR accordingly +@@ -4126,6 +4135,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft" # These toolchains are valid on different platforms @@ -162,16 +288,16 @@ VALID_TOOLCHAINS_linux="gcc clang" VALID_TOOLCHAINS_solaris="solstudio" VALID_TOOLCHAINS_macosx="gcc clang" -@@ -4336,7 +4346,7 @@ +@@ -4342,7 +4352,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: --DATE_WHEN_GENERATED=1536764960 -+DATE_WHEN_GENERATED=1543299193 +-DATE_WHEN_GENERATED=1544009140 ++DATE_WHEN_GENERATED=1549694164 ############################################################################### # -@@ -13570,11 +13580,27 @@ +@@ -13576,11 +13586,27 @@ as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5 ;; esac @@ -200,7 +326,7 @@ VAR_CPU=x86_64 VAR_CPU_ARCH=x86 VAR_CPU_BITS=64 -@@ -13708,11 +13734,27 @@ +@@ -13714,11 +13740,27 @@ as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5 ;; esac @@ -229,7 +355,7 @@ VAR_CPU=x86_64 VAR_CPU_ARCH=x86 VAR_CPU_BITS=64 -@@ -13785,6 +13827,7 @@ +@@ -13791,6 +13833,7 @@ # ... and setup our own variables. (Do this explicitely to facilitate searching) OPENJDK_TARGET_OS="$VAR_OS" @@ -237,7 +363,7 @@ OPENJDK_TARGET_OS_API="$VAR_OS_API" OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV" OPENJDK_TARGET_CPU="$VAR_CPU" -@@ -13799,6 +13842,7 @@ +@@ -13805,6 +13848,7 @@ @@ -245,7 +371,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5 $as_echo_n "checking openjdk-target os-cpu... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5 -@@ -13927,8 +13971,8 @@ +@@ -13933,8 +13977,8 @@ # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU" @@ -256,16 +382,16 @@ OPENJDK_TARGET_CPU_OSARCH="i386" elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then # On all platforms except macosx, we replace x86_64 with amd64. -@@ -14570,7 +14614,7 @@ +@@ -14576,7 +14620,7 @@ INCLUDE_SA=false fi - if test "x$VAR_CPU" = xppc64 ; then + if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then - INCLUDE_SA=false + INCLUDE_SA=true fi if test "x$OPENJDK_TARGET_CPU" = xaarch64; then INCLUDE_SA=false -@@ -19744,6 +19788,24 @@ +@@ -19756,6 +19800,24 @@ ############################################################################### # @@ -290,7 +416,7 @@ # Enable or disable the elliptic curve crypto implementation # -@@ -37332,7 +37394,7 @@ +@@ -37349,7 +37411,7 @@ # objcopy is used for moving debug symbols to separate files when # full debug symbols are enabled. @@ -299,12 +425,15 @@ # Publish this variable in the help. -@@ -40009,8 +40071,31 @@ +@@ -40025,10 +40087,66 @@ + ++ # The package path is used only on macosx? - # FIXME: clean this up, and/or move it elsewhere. - PACKAGE_PATH=/opt/local +- + +# Check whether --with-package-path was given. +if test "${with_package_path+set}" = set; then : @@ -330,10 +459,51 @@ + fi + fi + ++ ++ ++ # On OpenBSD check to see if ld requires -z wxneeded ++ if test "`uname -s`" = "OpenBSD"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld requires -z wxneeded" >&5 ++$as_echo_n "checking if ld requires -z wxneeded... " >&6; } ++ PUSHED_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -Wl,-z,wxneeded" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++int main() { } ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : ++ ++ if $READELF -l conftest$ac_exeext | $GREP OPENBSD_WXNEED > /dev/null; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ LDFLAGS_JDK="${LDFLAGS_JDK} -Wl,-z,wxneeded" ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ fi ++ ++else ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$PUSHED_LDFLAGS" ++ fi - # Check for extra potential brokenness. -@@ -41117,7 +41202,7 @@ + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then +@@ -40564,7 +40682,6 @@ + + # Now we can test some aspects on the target using configure macros. + +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } + if ${ac_cv_header_stdc+:} false; then : +@@ -41134,7 +41251,7 @@ # How to compile shared libraries. # @@ -342,7 +512,7 @@ PICFLAG="-fPIC" C_FLAG_REORDER='' CXX_FLAG_REORDER='' -@@ -41196,7 +41281,7 @@ +@@ -41213,7 +41330,7 @@ # fi # Generate make dependency files @@ -351,16 +521,16 @@ C_FLAG_DEPS="-MMD -MF" elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then C_FLAG_DEPS="-xMMD -xMF" -@@ -41208,7 +41293,7 @@ - - - # Debug symbols +@@ -41230,7 +41347,7 @@ + # info flags for toolchains unless we know they work. + # See JDK-8207057. + ASFLAGS_DEBUG_SYMBOLS="" - if test "x$TOOLCHAIN_TYPE" = xgcc; then + if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then CFLAGS_DEBUG_SYMBOLS="-g1" CXXFLAGS_DEBUG_SYMBOLS="-g1" -@@ -41257,7 +41342,7 @@ +@@ -41281,7 +41398,7 @@ else # The remaining toolchains share opt flags between CC and CXX; # setup for C and duplicate afterwards. @@ -369,7 +539,7 @@ if test "x$OPENJDK_TARGET_OS" = xmacosx; then # On MacOSX we optimize for size, something # we should do for all platforms? -@@ -41411,7 +41496,7 @@ +@@ -41449,7 +41566,7 @@ # Setup compiler/platform specific flags to CFLAGS_JDK, # CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?) @@ -378,8 +548,28 @@ # these options are used for both C and C++ compiles CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \ -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" -@@ -41830,7 +41915,7 @@ +@@ -41762,6 +41879,9 @@ + else + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN" fi ++ if test "x$OPENJDK_TARGET_OS" = xbsd; then ++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN" ++ fi + else + # Same goes for _BIG_ENDIAN. Do we really need to set *ENDIAN on Solaris if they + # are defined in the system? +@@ -41770,6 +41890,9 @@ + else + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" + fi ++ if test "x$OPENJDK_TARGET_OS" = xbsd; then ++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_BIG_ENDIAN" ++ fi + fi + if test "x$OPENJDK_TARGET_CPU" = xppc64le; then + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2" +@@ -41875,7 +41998,7 @@ + fi LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE" else - if test "x$TOOLCHAIN_TYPE" = xgcc; then @@ -387,7 +577,7 @@ # If this is a --hash-style=gnu system, use --hash-style=both, why? # We have previously set HAS_GNU_HASH if this is the case if test -n "$HAS_GNU_HASH"; then -@@ -42366,11 +42451,18 @@ +@@ -42411,11 +42534,18 @@ fi if test "x$OPENJDK_TARGET_OS" = xbsd; then @@ -411,7 +601,7 @@ fi if test "x$OPENJDK" = "xfalse"; then -@@ -42405,21 +42497,25 @@ +@@ -42450,21 +42580,25 @@ # Make a simple check for the libraries at the sysroot, and setup --x-includes and # --x-libraries for the sysroot, if that seems to be correct. if test "x$OPENJDK_TARGET_OS" = "xlinux"; then @@ -448,7 +638,7 @@ fi fi fi -@@ -43466,6 +43562,10 @@ +@@ -43511,6 +43645,10 @@ # A CSW package seems to be installed! CUPS_FOUND=yes CUPS_CFLAGS="-I$SYSROOT/opt/csw/include" @@ -459,7 +649,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5 $as_echo "$CUPS_FOUND" >&6; } -@@ -47351,7 +47451,7 @@ +@@ -47396,7 +47534,7 @@ ############################################################################### # @@ -468,7 +658,7 @@ # # Check whether --with-alsa was given. -@@ -47762,15 +47862,66 @@ +@@ -47807,15 +47945,66 @@ if test "x${with_giflib}" = "xbundled"; then USE_EXTERNAL_LIBGIF=false @@ -540,7 +730,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5 $as_echo_n "checking for DGifGetCode in -lgif... " >&6; } if ${ac_cv_lib_gif_DGifGetCode+:} false; then : -@@ -47808,16 +47959,96 @@ +@@ -47853,16 +48042,96 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5 $as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; } if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then : @@ -647,7 +837,7 @@ USE_EXTERNAL_LIBGIF=true else -@@ -47825,6 +48056,8 @@ +@@ -47870,6 +48139,8 @@ fi @@ -656,7 +846,7 @@ ############################################################################### # # Check for the zlib library -@@ -48392,6 +48625,11 @@ +@@ -48437,6 +48708,11 @@ LIBCXX="-lstdc++" fi @@ -668,7 +858,7 @@ -@@ -51078,6 +51316,10 @@ +@@ -51636,6 +51912,10 @@ # Looks like a MacOSX system NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'` FOUND_CORES=yes @@ -679,7 +869,7 @@ elif test "x$OPENJDK_BUILD_OS" = xaix ; then NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'` FOUND_CORES=yes -@@ -51133,6 +51375,15 @@ +@@ -51691,6 +51971,15 @@ MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print $2}'` MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` FOUND_MEM=yes @@ -695,7 +885,7 @@ elif test "x$OPENJDK_BUILD_OS" = xwindows; then # Windows, but without cygwin MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` -@@ -51706,8 +51957,8 @@ +@@ -52264,8 +52553,8 @@ # precompiled headers. { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5 $as_echo_n "checking if ccache supports precompiled headers... " >&6; } @@ -706,12 +896,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5 $as_echo "no, disabling ccache" >&6; } CCACHE= ---- ./common/autoconf/jdk-options.m4 Sat Oct 06 10:24:47 2018 +0100 -+++ ./common/autoconf/jdk-options.m4 Sat Dec 01 12:25:45 2018 -0800 +--- ./common/autoconf/jdk-options.m4 Sat Dec 08 11:48:10 2018 +0000 ++++ ./common/autoconf/jdk-options.m4 Sat Feb 09 10:03:01 2019 -0800 @@ -159,7 +159,7 @@ INCLUDE_SA=false fi - if test "x$VAR_CPU" = xppc64 ; then + if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then - INCLUDE_SA=false + INCLUDE_SA=true fi @@ -738,8 +928,8 @@ # Enable or disable the elliptic curve crypto implementation # AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], ---- ./common/autoconf/libraries.m4 Sat Oct 06 10:24:47 2018 +0100 -+++ ./common/autoconf/libraries.m4 Sat Dec 01 12:25:45 2018 -0800 +--- ./common/autoconf/libraries.m4 Sat Dec 08 11:48:10 2018 +0000 ++++ ./common/autoconf/libraries.m4 Sat Feb 09 10:03:01 2019 -0800 @@ -69,9 +69,15 @@ fi @@ -894,8 +1084,8 @@ AC_SUBST(LIBCXX) ]) ---- ./common/autoconf/platform.m4 Sat Oct 06 10:24:47 2018 +0100 -+++ ./common/autoconf/platform.m4 Sat Dec 01 12:25:45 2018 -0800 +--- ./common/autoconf/platform.m4 Sat Dec 08 11:48:10 2018 +0000 ++++ ./common/autoconf/platform.m4 Sat Feb 09 10:03:01 2019 -0800 @@ -30,7 +30,7 @@ [ # First argument is the cpu name from the trip/quad @@ -955,8 +1145,8 @@ OPENJDK_TARGET_CPU_OSARCH="i386" elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then # On all platforms except macosx, we replace x86_64 with amd64. ---- ./common/autoconf/spec.gmk.in Sat Oct 06 10:24:47 2018 +0100 -+++ ./common/autoconf/spec.gmk.in Sat Dec 01 12:25:45 2018 -0800 +--- ./common/autoconf/spec.gmk.in Sat Dec 08 11:48:10 2018 +0000 ++++ ./common/autoconf/spec.gmk.in Sat Feb 09 10:03:01 2019 -0800 @@ -79,6 +79,7 @@ OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@ OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@ @@ -984,7 +1174,7 @@ # Necessary additional compiler flags to compile X11 X_CFLAGS:=@X_CFLAGS@ X_LIBS:=@X_LIBS@ -@@ -571,6 +575,8 @@ +@@ -572,6 +576,8 @@ ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ @@ -993,8 +1183,8 @@ USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ MSVCR_DLL:=@MSVCR_DLL@ ---- ./common/autoconf/toolchain.m4 Sat Oct 06 10:24:47 2018 +0100 -+++ ./common/autoconf/toolchain.m4 Sat Dec 01 12:25:45 2018 -0800 +--- ./common/autoconf/toolchain.m4 Sat Dec 08 11:48:10 2018 +0000 ++++ ./common/autoconf/toolchain.m4 Sat Feb 09 10:03:01 2019 -0800 @@ -37,6 +37,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft" @@ -1012,7 +1202,7 @@ BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy]) # Only call fixup if objcopy was found. if test -n "$OBJCOPY"; then -@@ -801,8 +802,27 @@ +@@ -801,10 +802,53 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS], [ # The package path is used only on macosx? @@ -1041,17 +1231,43 @@ + AC_SUBST(PACKAGE_PATH) ++ # On OpenBSD check to see if ld requires -z wxneeded ++ if test "`uname -s`" = "OpenBSD"; then ++ AC_MSG_CHECKING([if ld requires -z wxneeded]) ++ PUSHED_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -Wl,-z,wxneeded" ++ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { }]])], ++ [ ++ if $READELF -l conftest$ac_exeext | $GREP OPENBSD_WXNEED > /dev/null; then ++ AC_MSG_RESULT([yes]) ++ LDFLAGS_JDK="${LDFLAGS_JDK} -Wl,-z,wxneeded" ++ else ++ AC_MSG_RESULT([yes]) ++ fi ++ ], ++ [ ++ AC_MSG_RESULT([no]) ++ ], ++ [ ++ AC_MSG_RESULT([no]) ++ ] ++ ) ++ LDFLAGS="$PUSHED_LDFLAGS" ++ fi ++ # Check for extra potential brokenness. ---- ./configure Sat Oct 06 10:24:47 2018 +0100 -+++ ./configure Sat Dec 01 12:25:45 2018 -0800 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then + # On Windows, double-check that we got the right compiler. +--- ./configure Sat Dec 08 11:48:10 2018 +0000 ++++ ./configure Sat Feb 09 10:03:01 2019 -0800 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ---- ./make/Javadoc.gmk Sat Oct 06 10:24:47 2018 +0100 -+++ ./make/Javadoc.gmk Sat Dec 01 12:25:45 2018 -0800 +--- ./make/Javadoc.gmk Sat Dec 08 11:48:10 2018 +0000 ++++ ./make/Javadoc.gmk Sat Feb 09 10:03:01 2019 -0800 @@ -46,8 +46,18 @@ BUILD_NUMBER=$(JDK_BUILD_NUMBER) @@ -1072,8 +1288,8 @@ -Djava.awt.headless=true \ $(NEW_JAVADOC) \ -bootclasspath $(JDK_OUTPUTDIR)/classes ---- ./make/Main.gmk Sat Oct 06 10:24:47 2018 +0100 -+++ ./make/Main.gmk Sat Dec 01 12:25:45 2018 -0800 +--- ./make/Main.gmk Sat Dec 08 11:48:10 2018 +0000 ++++ ./make/Main.gmk Sat Feb 09 10:03:01 2019 -0800 @@ -58,7 +58,11 @@ # Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line, @@ -1086,8 +1302,8 @@ ### Main targets ---- ./make/common/MakeBase.gmk Sat Oct 06 10:24:47 2018 +0100 -+++ ./make/common/MakeBase.gmk Sat Dec 01 12:25:45 2018 -0800 +--- ./make/common/MakeBase.gmk Sat Dec 08 11:48:10 2018 +0000 ++++ ./make/common/MakeBase.gmk Sat Feb 09 10:03:01 2019 -0800 @@ -338,7 +338,7 @@ # (and causing a crash on Cygwin). # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris. @@ -1108,8 +1324,8 @@ endef # Make directory without forking mkdir if not needed ---- ./make/common/NativeCompilation.gmk Sat Oct 06 10:24:47 2018 +0100 -+++ ./make/common/NativeCompilation.gmk Sat Dec 01 12:25:45 2018 -0800 +--- ./make/common/NativeCompilation.gmk Sat Dec 08 11:48:10 2018 +0000 ++++ ./make/common/NativeCompilation.gmk Sat Feb 09 10:03:01 2019 -0800 @@ -158,9 +158,9 @@ # CC the compiler to use, default is $(CC) # LDEXE the linker to use for linking executables, default is $(LDEXE) @@ -1123,8 +1339,8 @@ ifneq (,$$($1_BIN)) $$(error BIN has been replaced with OBJECT_DIR) ---- ./hotspot/agent/make/Makefile Sat Oct 06 10:25:04 2018 +0100 -+++ ./hotspot/agent/make/Makefile Sat Dec 01 12:42:05 2018 -0800 +--- ./hotspot/agent/make/Makefile Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/make/Makefile Sun Feb 10 09:26:05 2019 -0800 @@ -50,6 +50,7 @@ sun.jvm.hotspot.debugger.amd64 \ sun.jvm.hotspot.debugger.bsd \ @@ -1203,8 +1419,8 @@ sun/jvm/hotspot/runtime/solaris_amd64/*.java \ sun/jvm/hotspot/runtime/solaris_sparc/*.java \ sun/jvm/hotspot/runtime/solaris_x86/*.java \ ---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat Oct 06 10:25:04 2018 +0100 -+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat Dec 01 12:42:05 2018 -0800 +--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sun Feb 10 09:26:05 2019 -0800 @@ -42,6 +42,10 @@ #include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h" #endif @@ -1273,8 +1489,8 @@ (*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT); return array; ---- ./hotspot/agent/src/os/bsd/Makefile Sat Oct 06 10:25:04 2018 +0100 -+++ ./hotspot/agent/src/os/bsd/Makefile Sat Dec 01 12:42:05 2018 -0800 +--- ./hotspot/agent/src/os/bsd/Makefile Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/src/os/bsd/Makefile Sun Feb 10 09:26:05 2019 -0800 @@ -85,6 +85,9 @@ LFLAGS_LIBSA = -Xlinker --version-script=mapfile endif @@ -1285,8 +1501,8 @@ $(LIBSA): $(OBJSPLUS) mapfile if [ ! -d $(ARCH) ] ; then mkdir $(ARCH) ; fi $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(FOUNDATIONFLAGS) $(OBJSPLUS) $(LIBS) $(SALIBS) ---- ./hotspot/agent/src/os/bsd/elfmacros.h Sat Oct 06 10:25:04 2018 +0100 -+++ ./hotspot/agent/src/os/bsd/elfmacros.h Sat Dec 01 12:42:05 2018 -0800 +--- ./hotspot/agent/src/os/bsd/elfmacros.h Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/src/os/bsd/elfmacros.h Sun Feb 10 09:26:05 2019 -0800 @@ -34,6 +34,7 @@ #define ELF_SYM Elf64_Sym #define ELF_DYN Elf64_Dyn @@ -1303,8 +1519,8 @@ #ifndef ELF_ST_TYPE #define ELF_ST_TYPE ELF32_ST_TYPE ---- ./hotspot/agent/src/os/bsd/ps_core.c Sat Oct 06 10:25:04 2018 +0100 -+++ ./hotspot/agent/src/os/bsd/ps_core.c Sat Dec 01 12:42:05 2018 -0800 +--- ./hotspot/agent/src/os/bsd/ps_core.c Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/src/os/bsd/ps_core.c Sun Feb 10 09:26:05 2019 -0800 @@ -1091,6 +1091,18 @@ if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true) { return false; @@ -1351,8 +1567,8 @@ goto err; } ---- ./hotspot/agent/src/os/bsd/symtab.c Sat Oct 06 10:25:04 2018 +0100 -+++ ./hotspot/agent/src/os/bsd/symtab.c Sat Dec 01 12:42:05 2018 -0800 +--- ./hotspot/agent/src/os/bsd/symtab.c Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/src/os/bsd/symtab.c Sun Feb 10 09:26:05 2019 -0800 @@ -211,6 +211,10 @@ // Reading of elf header @@ -1393,8 +1609,8 @@ key.data = sym_name; key.size = strlen(sym_name) + 1; ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Oct 06 10:25:04 2018 +0100 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Dec 01 12:42:05 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sun Feb 10 09:26:05 2019 -0800 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.JVMDebugger; import sun.jvm.hotspot.debugger.MachineDescription; @@ -1413,7 +1629,7 @@ if (LinuxDebuggerLocal.getAddressSize()==8) { machDesc = new MachineDescriptionSPARC64Bit(); --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Sat Dec 01 12:42:05 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Sun Feb 10 09:26:05 2019 -0800 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1458,8 +1674,8 @@ + return false; + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat Oct 06 10:25:04 2018 +0100 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat Dec 01 12:42:05 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sun Feb 10 09:26:05 2019 -0800 @@ -30,8 +30,10 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.x86.*; @@ -1485,8 +1701,8 @@ } else { throw new DebuggerException(cpu + " is not yet supported"); } ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat Oct 06 10:25:04 2018 +0100 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat Dec 01 12:42:05 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sun Feb 10 09:26:05 2019 -0800 @@ -27,6 +27,7 @@ import sun.jvm.hotspot.debugger.*; import sun.jvm.hotspot.debugger.bsd.amd64.*; @@ -1505,7 +1721,7 @@ throw new RuntimeException("cpu " + cpu + " is not yet supported"); } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Sat Dec 01 12:42:05 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Sun Feb 10 09:26:05 2019 -0800 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1587,7 +1803,7 @@ + private BsdDebugger dbg; +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Sat Dec 01 12:42:05 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Sun Feb 10 09:26:05 2019 -0800 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1635,8 +1851,27 @@ + return debugger.newAddress(getRegister(index)); + } +} +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java Sun Feb 10 09:26:05 2019 -0800 +@@ -55,7 +55,15 @@ + + public CFrame sender(ThreadProxy thread) { + X86ThreadContext context = (X86ThreadContext) thread.getContext(); +- Address esp = context.getRegisterAsAddress(X86ThreadContext.ESP); ++ /* ++ * Native code fills in the stack pointer register value using index ++ * X86ThreadContext.SP. ++ * See file BsdDebuggerLocal.c macro REG_INDEX(reg). ++ * ++ * Be sure to use SP, or UESP which is aliased to SP in Java code, ++ * for the frame pointer validity check. ++ */ ++ Address esp = context.getRegisterAsAddress(X86ThreadContext.SP); + + if ( (ebp == null) || ebp.lessThan(esp) ) { + return null; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Sat Dec 01 12:42:05 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Sun Feb 10 09:26:05 2019 -0800 @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1761,8 +1996,8 @@ + public abstract Address getRegisterAsAddress(int index); + +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat Oct 06 10:25:04 2018 +0100 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat Dec 01 12:42:05 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sun Feb 10 09:26:05 2019 -0800 @@ -32,7 +32,9 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.proc.amd64.*; @@ -1785,7 +2020,7 @@ try { Class tfc = Class.forName("sun.jvm.hotspot.debugger.proc." + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Sat Dec 01 12:42:05 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Sun Feb 10 09:26:05 2019 -0800 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1874,7 +2109,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Sat Dec 01 12:42:05 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Sun Feb 10 09:26:05 2019 -0800 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1923,7 +2158,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Sat Dec 01 12:42:05 2018 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Sun Feb 10 09:26:05 2019 -0800 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1969,8 +2204,8 @@ + return new ProcPPC64Thread(debugger, id); + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat Oct 06 10:25:04 2018 +0100 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat Dec 01 12:42:05 2018 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat Dec 08 11:48:29 2018 +0000 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sun Feb 10 09:26:05 2019 -0800 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.remote.sparc.*; import sun.jvm.hotspot.debugger.remote.x86.*; @@ -1992,7 +2227,7 @@ try { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902121148.x1CBmuRv079929>