Date: Sun, 31 Jan 2016 19:37:15 +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: r407661 - in head/java/openjdk8: . files Message-ID: <201601311937.u0VJbF8P072061@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun Jan 31 19:37:15 2016 New Revision: 407661 URL: https://svnweb.freebsd.org/changeset/ports/407661 Log: . Update to 8u72. Deleted: head/java/openjdk8/files/patch-common-autoconf-build-performance.m4 head/java/openjdk8/files/patch-common-autoconf-generated-configure.sh head/java/openjdk8/files/patch-common_autoconf_boot-jdk.m4 head/java/openjdk8/files/patch-jdk-src-solaris-native-sun-management-BsdOperatingSystem.c 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 Sun Jan 31 18:03:14 2016 (r407660) +++ head/java/openjdk8/Makefile Sun Jan 31 19:37:15 2016 (r407661) @@ -2,7 +2,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 3 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 \ @@ -21,7 +20,8 @@ PATCHFILES= patch-8u05-b13.xz \ patch-8u45-b14.xz \ patch-8u51-b16.xz \ patch-8u60-b23.xz \ - patch-8u66-b17.xz + patch-8u66-b17-1.xz \ + patch-8u72-b15.xz MAINTAINER= java@FreeBSD.org COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} @@ -199,8 +199,8 @@ NO_CCACHE= yes NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 66 -JDK_BUILD_NUMBER= 17 +JDK_UPDATE_VERSION= 72 +JDK_BUILD_NUMBER= 15 DIST_BUILD_NUMBER= 132 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 Modified: head/java/openjdk8/distinfo ============================================================================== --- head/java/openjdk8/distinfo Sun Jan 31 18:03:14 2016 (r407660) +++ head/java/openjdk8/distinfo Sun Jan 31 19:37:15 2016 (r407661) @@ -20,5 +20,7 @@ SHA256 (patch-8u51-b16.xz) = 146e8ffa759 SIZE (patch-8u51-b16.xz) = 71144 SHA256 (patch-8u60-b23.xz) = 8ebe80e8add9e61dcb43e9be756ccc6d566a39748e7726f265df73af2d082798 SIZE (patch-8u60-b23.xz) = 1043720 -SHA256 (patch-8u66-b17.xz) = a9ab2649c4f107c0399b8ce953d5d8cb683bee959446ef5df9a3c9d5c682bf9b -SIZE (patch-8u66-b17.xz) = 185576 +SHA256 (patch-8u66-b17-1.xz) = 8d11cf62d9b70857d1008dea0cdcf9d5b4ba30320696cb2568a8bc13f202bb2e +SIZE (patch-8u66-b17-1.xz) = 351328 +SHA256 (patch-8u72-b15.xz) = 42f774b72f3dbdbfadc63d0b8fb7d94c51c3062d80aedec86f59d295823136d1 +SIZE (patch-8u72-b15.xz) = 282984 Modified: head/java/openjdk8/files/patch-bsd ============================================================================== --- head/java/openjdk8/files/patch-bsd Sun Jan 31 18:03:14 2016 (r407660) +++ head/java/openjdk8/files/patch-bsd Sun Jan 31 19:37:15 2016 (r407661) @@ -1,12 +1,5 @@ ---- ./.hgtags 2015-12-12 10:53:30.938451000 -0800 -+++ ./.hgtags 2015-10-24 06:20:54.000000000 -0700 -@@ -487,4 +487,3 @@ - b5c54b2e12c3fbc54c7d7e0f22187fa601feb749 jdk8u66-b14 - d45e1dc28a6ee6fd03348ee170d9895957888124 jdk8u66-b15 - 5f29f2da7993f09564f6a5cb34e2799981ea96bb jdk8u66-b16 --5b37e6757d7c95c9c58b07fb3c9eba234567385a jdk8u40-b24 ---- ./common/autoconf/build-performance.m4 2015-12-12 10:53:20.526424000 -0800 -+++ ./common/autoconf/build-performance.m4 2015-10-24 06:20:55.000000000 -0700 +--- ./common/autoconf/build-performance.m4 Fri Dec 18 11:33:41 2015 -0800 ++++ ./common/autoconf/build-performance.m4 Sat Jan 30 22:11:02 2016 -0800 @@ -41,6 +41,10 @@ # Looks like a MacOSX system NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` @@ -40,13 +33,13 @@ AC_MSG_CHECKING([if ccache supports precompiled headers]) - HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null` - if test "x$HAS_GOOD_CCACHE" = x; then -+ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split($3, a, "."); if (a@<:@1@:>@ >= 3 && (a@<:@2@:>@ > 1 || (a@<:@2@:>@ == 1 && a@<:@3@:>@ >= 4))) print "yes"; else print "no"; }') 2> /dev/null` ++ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split(@S|@3, a, "."); if (a@<:@1@:>@ >= 3 && (a@<:@2@:>@ > 1 || (a@<:@2@:>@ == 1 && a@<:@3@:>@ >= 4))) print "yes"; else print "no"; }') 2> /dev/null` + if test "x$HAS_GOOD_CCACHE" = xyes; then AC_MSG_RESULT([no, disabling ccache]) CCACHE= else ---- ./common/autoconf/generated-configure.sh 2015-12-12 10:53:30.948059000 -0800 -+++ ./common/autoconf/generated-configure.sh 2015-10-24 06:20:55.000000000 -0700 +--- ./common/autoconf/generated-configure.sh Fri Dec 18 11:33:41 2015 -0800 ++++ ./common/autoconf/generated-configure.sh Sat Jan 30 22:11:02 2016 -0800 @@ -646,6 +646,8 @@ LIBM LIBZIP_CAN_USE_MMAP @@ -56,7 +49,7 @@ USE_EXTERNAL_LIBGIF USE_EXTERNAL_LIBJPEG ALSA_LIBS -@@ -818,6 +820,7 @@ +@@ -819,6 +821,7 @@ JDK_MAJOR_VERSION USER_RELEASE_SUFFIX COMPRESS_JARS @@ -64,7 +57,7 @@ UNLIMITED_CRYPTO CACERTS_FILE TEST_IN_BUILD -@@ -894,6 +897,7 @@ +@@ -895,6 +898,7 @@ OPENJDK_TARGET_CPU_ARCH OPENJDK_TARGET_CPU OPENJDK_TARGET_OS_API @@ -72,7 +65,7 @@ OPENJDK_TARGET_OS OPENJDK_BUILD_CPU_ENDIAN OPENJDK_BUILD_CPU_BITS -@@ -1026,6 +1030,7 @@ +@@ -1027,6 +1031,7 @@ enable_hotspot_test_in_build with_cacerts_file enable_unlimited_crypto @@ -80,7 +73,7 @@ with_milestone with_update_version with_user_release_suffix -@@ -1052,6 +1057,7 @@ +@@ -1053,6 +1058,7 @@ with_extra_cflags with_extra_cxxflags with_extra_ldflags @@ -88,7 +81,7 @@ enable_debug_symbols enable_zip_debug_info enable_macosx_runtime_support -@@ -1728,6 +1734,7 @@ +@@ -1729,6 +1735,7 @@ run the Queens test after Hotspot build [disabled] --enable-unlimited-crypto Enable unlimited crypto policy [disabled] @@ -96,7 +89,7 @@ --disable-debug-symbols disable generation of debug symbols [enabled] --disable-zip-debug-info disable zipping of debug-info files [enabled] -@@ -1824,6 +1831,8 @@ +@@ -1825,6 +1832,8 @@ --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 --with-extra-ldflags extra flags to be used when linking jdk @@ -105,7 +98,16 @@ --with-x use the X Window System --with-cups specify prefix directory for the cups package (expecting the headers under PATH/include) -@@ -6807,11 +6816,27 @@ +@@ -3880,7 +3889,7 @@ + #CUSTOM_AUTOCONF_INCLUDE + + # Do not change or remove the following line, it is needed for consistency checks: +-DATE_WHEN_GENERATED=1445418840 ++DATE_WHEN_GENERATED=1454212428 + + ############################################################################### + # +@@ -6808,11 +6817,27 @@ as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5 ;; esac @@ -134,7 +136,7 @@ VAR_CPU=x86_64 VAR_CPU_ARCH=x86 VAR_CPU_BITS=64 -@@ -6944,11 +6969,27 @@ +@@ -6945,11 +6970,27 @@ as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5 ;; esac @@ -163,7 +165,7 @@ VAR_CPU=x86_64 VAR_CPU_ARCH=x86 VAR_CPU_BITS=64 -@@ -7021,6 +7062,7 @@ +@@ -7022,6 +7063,7 @@ # ... and setup our own variables. (Do this explicitely to facilitate searching) OPENJDK_TARGET_OS="$VAR_OS" @@ -171,7 +173,7 @@ OPENJDK_TARGET_OS_API="$VAR_OS_API" OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV" OPENJDK_TARGET_CPU="$VAR_CPU" -@@ -7034,6 +7076,7 @@ +@@ -7035,6 +7077,7 @@ @@ -179,7 +181,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 -@@ -7162,8 +7205,8 @@ +@@ -7163,8 +7206,8 @@ # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU" @@ -190,7 +192,7 @@ 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. -@@ -11173,6 +11216,24 @@ +@@ -11174,6 +11217,24 @@ ############################################################################### # @@ -215,7 +217,16 @@ # Enable or disable the elliptic curve crypto implementation # -@@ -20344,7 +20405,7 @@ +@@ -19397,6 +19458,8 @@ + elif test "x$OPENJDK_TARGET_OS" = "xaix"; then + # Do not probe for cc on AIX. + COMPILER_CHECK_LIST="xlc_r" ++ elif test "`uname -s`" = "FreeBSD"; then ++ COMPILER_CHECK_LIST="cc gcc" + else + COMPILER_CHECK_LIST="gcc cc" + fi +@@ -20357,7 +20420,7 @@ else COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` # Check that this is likely to be GCC. @@ -224,7 +235,7 @@ if test $? -ne 0; then { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5 $as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;} -@@ -21945,7 +22006,7 @@ +@@ -21958,7 +22021,7 @@ else COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` # Check that this is likely to be GCC. @@ -233,7 +244,7 @@ if test $? -ne 0; then { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5 $as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;} -@@ -27952,7 +28013,7 @@ +@@ -27965,7 +28028,7 @@ # objcopy is used for moving debug symbols to separate files when # full debug symbols are enabled. @@ -242,23 +253,23 @@ if test -n "$ac_tool_prefix"; then for ac_prog in gobjcopy objcopy do -@@ -29309,9 +29370,11 @@ +@@ -29322,8 +29385,10 @@ SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' SET_SHARED_LIBRARY_MAPFILE='' SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.' -- SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN" - POST_STRIP_CMD="$STRIP -S" - fi -+ if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then -+ SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN" ++ POST_STRIP_CMD="$STRIP -S" + fi ++ if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then + SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN" +- POST_STRIP_CMD="$STRIP -S" + fi else if test "x$OPENJDK_TARGET_OS" = xsolaris; then - # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler -@@ -29736,22 +29799,37 @@ +@@ -29749,22 +29814,37 @@ CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64" # The package path is used only on macosx? +- PACKAGE_PATH=/opt/local + +# Check whether --with-package-path was given. +if test "${with_package_path+set}" = set; then : @@ -268,14 +279,25 @@ + PACKAGE_PATH="$with_package_path" + if test "x$PACKAGE_PATH" = x; then + if test "`uname -s`" = "Darwin"; then - PACKAGE_PATH=/opt/local ++ PACKAGE_PATH=/opt/local + fi - ++ + if test "`uname -s`" = "FreeBSD"; then + PACKAGE_PATH=/usr/local + fi ++ ++ if test "`uname -s`" = "NetBSD"; then ++ PACKAGE_PATH=/usr/pkg ++ fi ++ ++ if test "`uname -s`" = "OpenBSD"; then ++ PACKAGE_PATH=/usr/local ++ fi ++ fi ++ + -- if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then + if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then - # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the - # Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN - # (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h). @@ -285,37 +307,28 @@ - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN=" - else - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN" -+ if test "`uname -s`" = "NetBSD"; then -+ PACKAGE_PATH=/usr/pkg - fi -+ -+ if test "`uname -s`" = "OpenBSD"; then -+ PACKAGE_PATH=/usr/local -+ fi -+ fi -+ -+ -+ -+ if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then -+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN" - else +- fi +- else - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" ++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN" ++ else + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_BIG_ENDIAN" fi if test "x$OPENJDK_TARGET_OS" = xlinux; then CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX" -@@ -30248,11 +30326,18 @@ +@@ -30261,11 +30341,18 @@ fi if test "x$OPENJDK_TARGET_OS" = xbsd; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on bsd?" >&5 -$as_echo_n "checking what is not needed on bsd?... " >&6; } +- ALSA_NOT_NEEDED=yes +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa" >&5 +-$as_echo "alsa" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5 +$as_echo_n "checking what is not needed on BSD?... " >&6; } + if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then - ALSA_NOT_NEEDED=yes -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa" >&5 --$as_echo "alsa" >&6; } ++ ALSA_NOT_NEEDED=yes + PULSE_NOT_NEEDED=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 +$as_echo "alsa pulse" >&6; } @@ -327,7 +340,7 @@ fi if test "x$OPENJDK" = "xfalse"; then -@@ -30288,14 +30373,18 @@ +@@ -30301,14 +30388,18 @@ # --x-libraries for the sysroot, if that seems to be correct. if test "x$SYS_ROOT" != "x/"; then if test "x$x_includes" = xNONE; then @@ -348,7 +361,7 @@ x_libraries="$SYS_ROOT/usr/X11R6/lib" elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then x_libraries="$SYS_ROOT/usr/lib64" -@@ -31342,6 +31431,10 @@ +@@ -31355,6 +31446,10 @@ # A CSW package seems to be installed! CUPS_FOUND=yes CUPS_CFLAGS="-I/opt/csw/include" @@ -359,7 +372,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5 $as_echo "$CUPS_FOUND" >&6; } -@@ -34507,7 +34600,7 @@ +@@ -34520,7 +34615,7 @@ ############################################################################### # @@ -368,7 +381,7 @@ # # Check whether --with-alsa was given. -@@ -34915,15 +35008,66 @@ +@@ -34928,15 +35023,66 @@ if test "x${with_giflib}" = "xbundled"; then USE_EXTERNAL_LIBGIF=false @@ -381,13 +394,16 @@ -else - as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5 +-fi +- +- + GIFLIB_H_FOUND=yes + GIFLIB_CFLAGS= + + - fi - - ++fi ++ ++ + if test "x$GIFLIB_H_FOUND" = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for giflib headers" >&5 +$as_echo_n "checking for giflib headers... " >&6; } @@ -437,19 +453,25 @@ { $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 : -@@ -34961,16 +35105,96 @@ +@@ -34974,16 +35120,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 : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGIF 1 -_ACEOF - +- - LIBS="-lgif $LIBS" +- +-else +- as_fn_error $? "--with-giflib=system specified, but no giflib found!" "$LINENO" 5 +-fi +- ++ + GIFLIB_LIB_FOUND=yes + GIFLIB_LDFLAGS= + - ++ +fi + + if test "x$GIFLIB_LIB_FOUND" = xno; then @@ -459,8 +481,7 @@ +$as_echo_n "checking for DGifOpen in -lgif... " >&6; } +if ${ac_cv_lib_gif_DGifOpen+:} false; then : + $as_echo_n "(cached) " >&6 - else -- as_fn_error $? "--with-giflib=system specified, but no giflib found!" "$LINENO" 5 ++else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgif $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -485,7 +506,7 @@ + ac_cv_lib_gif_DGifOpen=yes +else + ac_cv_lib_gif_DGifOpen=no - fi ++fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -502,7 +523,7 @@ + + LDFLAGS="$save_LDFLAGS" + fi - ++ + if test "x$GIFLIB_LIB_FOUND" = xno; then + + # Print a helpful message on how to acquire the necessary build dependency. @@ -539,7 +560,7 @@ USE_EXTERNAL_LIBGIF=true else -@@ -34978,6 +35202,8 @@ +@@ -34991,6 +35217,8 @@ fi @@ -548,7 +569,7 @@ ############################################################################### # # Check for the zlib library -@@ -35545,6 +35771,11 @@ +@@ -35558,6 +35786,11 @@ LIBCXX="-lstdc++" fi @@ -560,7 +581,7 @@ -@@ -35618,6 +35849,10 @@ +@@ -35631,6 +35864,10 @@ # Looks like a MacOSX system NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'` FOUND_CORES=yes @@ -571,7 +592,7 @@ elif test "x$OPENJDK_BUILD_OS" = xaix ; then NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'` FOUND_CORES=yes -@@ -35673,6 +35908,15 @@ +@@ -35686,6 +35923,15 @@ MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print $2}'` MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` FOUND_MEM=yes @@ -587,19 +608,19 @@ elif test "x$OPENJDK_BUILD_OS" = xwindows; then # Windows, but without cygwin MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` -@@ -36080,8 +36324,8 @@ +@@ -36093,8 +36339,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; } - HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null` - if test "x$HAS_GOOD_CCACHE" = x; then -+ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split(, a, "."); if (a[1] >= 3 && (a[2] > 1 || (a[2] == 1 && a[3] >= 4))) print "yes"; else print "no"; }') 2> /dev/null` ++ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split($3, a, "."); if (a[1] >= 3 && (a[2] > 1 || (a[2] == 1 && a[3] >= 4))) print "yes"; else print "no"; }') 2> /dev/null` + if test "x$HAS_GOOD_CCACHE" = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5 $as_echo "no, disabling ccache" >&6; } CCACHE= ---- ./common/autoconf/jdk-options.m4 2015-12-12 10:53:29.272768000 -0800 -+++ ./common/autoconf/jdk-options.m4 2015-10-24 06:20:55.000000000 -0700 +--- ./common/autoconf/jdk-options.m4 Fri Dec 18 11:33:41 2015 -0800 ++++ ./common/autoconf/jdk-options.m4 Sat Jan 30 22:11:02 2016 -0800 @@ -410,6 +410,20 @@ ############################################################################### @@ -621,17 +642,18 @@ # Enable or disable the elliptic curve crypto implementation # AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], ---- ./common/autoconf/libraries.m4 2015-12-12 10:53:29.275607000 -0800 -+++ ./common/autoconf/libraries.m4 2015-10-24 06:20:55.000000000 -0700 +--- ./common/autoconf/libraries.m4 Fri Dec 18 11:33:41 2015 -0800 ++++ ./common/autoconf/libraries.m4 Sat Jan 30 22:11:02 2016 -0800 @@ -69,9 +69,15 @@ fi if test "x$OPENJDK_TARGET_OS" = xbsd; then - AC_MSG_CHECKING([what is not needed on bsd?]) +- ALSA_NOT_NEEDED=yes +- AC_MSG_RESULT([alsa]) + AC_MSG_CHECKING([what is not needed on BSD?]) + if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then - ALSA_NOT_NEEDED=yes -- AC_MSG_RESULT([alsa]) ++ ALSA_NOT_NEEDED=yes + PULSE_NOT_NEEDED=yes + AC_MSG_RESULT([alsa pulse]) + else @@ -759,8 +781,8 @@ + AC_SUBST(LIBCXX) ]) ---- ./common/autoconf/platform.m4 2015-12-12 10:53:29.275987000 -0800 -+++ ./common/autoconf/platform.m4 2015-10-24 06:20:55.000000000 -0700 +--- ./common/autoconf/platform.m4 Fri Dec 18 11:33:41 2015 -0800 ++++ ./common/autoconf/platform.m4 Sat Jan 30 22:11:02 2016 -0800 @@ -30,7 +30,7 @@ [ # First argument is the cpu name from the trip/quad @@ -820,8 +842,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 2015-12-12 10:53:29.276399000 -0800 -+++ ./common/autoconf/spec.gmk.in 2015-10-24 06:20:55.000000000 -0700 +--- ./common/autoconf/spec.gmk.in Fri Dec 18 11:33:41 2015 -0800 ++++ ./common/autoconf/spec.gmk.in Sat Jan 30 22:11:02 2016 -0800 @@ -76,6 +76,7 @@ OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@ OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@ @@ -858,8 +880,8 @@ USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ MSVCR_DLL:=@MSVCR_DLL@ ---- ./common/autoconf/toolchain.m4 2015-12-12 10:53:29.276999000 -0800 -+++ ./common/autoconf/toolchain.m4 2015-10-24 06:20:55.000000000 -0700 +--- ./common/autoconf/toolchain.m4 Fri Dec 18 11:33:41 2015 -0800 ++++ ./common/autoconf/toolchain.m4 Sat Jan 30 22:11:02 2016 -0800 @@ -72,7 +72,7 @@ else COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` @@ -869,7 +891,16 @@ if test $? -ne 0; then AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler.]) AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_TEST"]) -@@ -571,7 +571,7 @@ +@@ -350,6 +350,8 @@ + elif test "x$OPENJDK_TARGET_OS" = "xaix"; then + # Do not probe for cc on AIX. + COMPILER_CHECK_LIST="xlc_r" ++ elif test "`uname -s`" = "FreeBSD"; then ++ COMPILER_CHECK_LIST="cc gcc" + else + COMPILER_CHECK_LIST="gcc cc" + fi +@@ -571,7 +573,7 @@ # objcopy is used for moving debug symbols to separate files when # full debug symbols are enabled. @@ -878,29 +909,29 @@ AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy]) # Only call fixup if objcopy was found. if test -n "$OBJCOPY"; then -@@ -634,9 +634,11 @@ +@@ -634,8 +636,10 @@ SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1' SET_SHARED_LIBRARY_MAPFILE='' SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.' -- SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN" - POST_STRIP_CMD="$STRIP -S" - fi -+ if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then -+ SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN" ++ POST_STRIP_CMD="$STRIP -S" + fi ++ if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then + SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN" +- POST_STRIP_CMD="$STRIP -S" + fi else if test "x$OPENJDK_TARGET_OS" = xsolaris; then - # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler -@@ -1039,22 +1041,33 @@ +@@ -1039,22 +1043,33 @@ CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64" # The package path is used only on macosx? +- PACKAGE_PATH=/opt/local + AC_ARG_WITH(package-path, [AS_HELP_STRING([--with-package-path], + [package path to be used for location of third party packages])]) + PACKAGE_PATH="$with_package_path" + if test "x$PACKAGE_PATH" = x; then + if test "`uname -s`" = "Darwin"; then - PACKAGE_PATH=/opt/local ++ PACKAGE_PATH=/opt/local + fi + + if test "`uname -s`" = "FreeBSD"; then @@ -936,35 +967,96 @@ fi if test "x$OPENJDK_TARGET_OS" = xlinux; then CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX" ---- ./configure 2015-12-12 10:53:19.849663000 -0800 -+++ ./configure 2015-10-24 06:20:55.000000000 -0700 +--- ./configure Fri Dec 18 11:33:41 2015 -0800 ++++ ./configure Sat Jan 30 22:11:02 2016 -0800 @@ -1,4 +1,4 @@ --#!/usr/local/bin/bash +-#!/bin/bash +#!/bin/sh # # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ---- ./corba/.hgtags 2015-12-12 10:53:30.949741000 -0800 -+++ ./corba/.hgtags 2015-10-24 06:20:56.000000000 -0700 -@@ -489,4 +489,3 @@ - 0db478b43d7fcf26dc613241654737756ec982c5 jdk8u66-b14 - b88ba0b818831eb6f3a7954e218b371ed6f5d154 jdk8u66-b15 - 606448f919ad288412669c3e78482b99d8f5f416 jdk8u66-b16 --472aa5bae0e78614e873d56bcc31e7caba49963c jdk8u40-b24 ---- ./hotspot/.hgtags 2015-12-12 10:53:30.953266000 -0800 -+++ ./hotspot/.hgtags 2015-10-24 06:21:08.000000000 -0700 -@@ -755,4 +755,3 @@ - 9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14 - 5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15 - 4bbf0e9196f2786e0bc4f17664e2533808d944bf jdk8u66-b16 --fa4e797f61e6dda1a60e06944018213bff2a1b76 jdk8u40-b24 ---- ./hotspot/make/bsd/makefiles/build_vm_def.sh 2014-03-03 18:52:06.000000000 -0800 -+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh 2015-10-24 06:21:09.000000000 -0700 -@@ -2,11 +2,27 @@ +--- ./make/Javadoc.gmk Fri Dec 18 11:33:41 2015 -0800 ++++ ./make/Javadoc.gmk Sat Jan 30 22:11:02 2016 -0800 +@@ -46,8 +46,18 @@ + + BUILD_NUMBER=$(JDK_BUILD_NUMBER) + ++ifeq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) ++ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) ++ JAVADOC_CMD_MEM = "-Xmx768m" ++ else ++ JAVADOC_CMD_MEM = "-Xmx1024m" ++ endif ++else ++ JAVADOC_CMD_MEM = "-Xmx1024m" ++endif ++ + JAVADOC_CMD = $(JAVA) \ +- -Xmx1024m \ ++ $(JAVADOC_CMD_MEM) \ + -Djava.awt.headless=true \ + $(NEW_JAVADOC) \ + -bootclasspath $(JDK_OUTPUTDIR)/classes +--- ./make/Main.gmk Fri Dec 18 11:33:41 2015 -0800 ++++ ./make/Main.gmk Sat Jan 30 22:11:02 2016 -0800 +@@ -58,7 +58,11 @@ + + # Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line, + # hence this workaround. ++ifdef JOBS ++ifneq ($(JOBS),0) + MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS) ++endif ++endif + + ### Main targets + +--- ./make/common/MakeBase.gmk Fri Dec 18 11:33:41 2015 -0800 ++++ ./make/common/MakeBase.gmk Sat Jan 30 22:11:02 2016 -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. + # Only use time if it's GNU time which supports format and output file. +- WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash ++ WRAPPER_SHELL:=bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log bash + SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL) + endif + # Never remove warning messages; this is just for completeness +@@ -365,8 +365,8 @@ + + # This is to be called by all SetupFoo macros + define LogSetupMacroEntry +- $(if $(27),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk)) +- $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26,$(if $($i),$(NEWLINE) $(strip [$i] $($i)))))) ++ $(if $(30),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk)) ++ $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29,$(if $($i),$(NEWLINE) $(strip [$i] $($i)))))) + endef + + # Make directory without forking mkdir if not needed +--- ./make/common/NativeCompilation.gmk Fri Dec 18 11:33:41 2015 -0800 ++++ ./make/common/NativeCompilation.gmk Sat Jan 30 22:11:02 2016 -0800 +@@ -151,9 +151,9 @@ + # CC the compiler to use, default is $(CC) + # LDEXE the linker to use for linking executables, default is $(LDEXE) + # OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST +- $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) +- $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26)) +- $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk)) ++ $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) ++ $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26),$(27),$(28),$(29)) ++ $(if $(30),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk)) + + ifneq (,$$($1_BIN)) + $$(error BIN has been replaced with OBJECT_DIR) +--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Mon Jan 25 21:17:47 2016 -0800 +@@ -1,12 +1,28 @@ + #!/bin/sh # If we're cross compiling use that path for nm - if [ "$CROSS_COMPILE_ARCH" != "" ]; then +-if [ "$CROSS_COMPILE_ARCH" != "" ]; then -NM=$ALT_COMPILER_PATH/nm ++if [ "$CROSS_COMPILE_ARCH" != "" ]; then + NM=$ALT_COMPILER_PATH/nm else -NM=nm @@ -993,8 +1085,8 @@ + if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" + }' | sort -u ;; +esac ---- ./hotspot/make/bsd/makefiles/debug.make 2014-03-03 18:52:06.000000000 -0800 -+++ ./hotspot/make/bsd/makefiles/debug.make 2015-10-24 06:21:09.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/debug.make Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/make/bsd/makefiles/debug.make Mon Jan 25 21:17:47 2016 -0800 @@ -35,7 +35,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -1007,8 +1099,8 @@ VERSION = debug SYSDEFS += -DASSERT ---- ./hotspot/make/bsd/makefiles/fastdebug.make 2014-03-03 18:52:06.000000000 -0800 -+++ ./hotspot/make/bsd/makefiles/fastdebug.make 2015-10-24 06:21:09.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/fastdebug.make Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/make/bsd/makefiles/fastdebug.make Mon Jan 25 21:17:47 2016 -0800 @@ -56,7 +56,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -1021,8 +1113,8 @@ VERSION = fastdebug SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS ---- ./hotspot/make/bsd/makefiles/gcc.make 2015-12-12 10:53:29.301009000 -0800 -+++ ./hotspot/make/bsd/makefiles/gcc.make 2015-10-24 06:21:09.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/gcc.make Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/make/bsd/makefiles/gcc.make Mon Jan 25 21:17:47 2016 -0800 @@ -168,6 +168,9 @@ CFLAGS += -DDONT_USE_PRECOMPILED_HEADER endif @@ -1037,15 +1129,19 @@ endif ifeq ($(USE_CLANG), true) +- # Before Clang 3.1, we had to pass the stack alignment specification directly to llvm with the help of '-mllvm' +- # Starting with version 3.1, Clang understands the '-mstack-alignment' (and rejects '-mllvm -stack-alignment') +- ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 1 \) \))" "0" +- STACK_ALIGNMENT_OPT = -mno-omit-leaf-frame-pointer -mstack-alignment=16 +- else +- STACK_ALIGNMENT_OPT = -mno-omit-leaf-frame-pointer -mllvm -stack-alignment=16 + STACK_ALIGNMENT_OPT = -mno-omit-leaf-frame-pointer + ifeq ($(OS_VENDOR), Darwin) - # Before Clang 3.1, we had to pass the stack alignment specification directly to llvm with the help of '-mllvm' - # Starting with version 3.1, Clang understands the '-mstack-alignment' (and rejects '-mllvm -stack-alignment') - ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 1 \) \))" "0" -- STACK_ALIGNMENT_OPT = -mno-omit-leaf-frame-pointer -mstack-alignment=16 ++ # Before Clang 3.1, we had to pass the stack alignment specification directly to llvm with the help of '-mllvm' ++ # Starting with version 3.1, Clang understands the '-mstack-alignment' (and rejects '-mllvm -stack-alignment') ++ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 1 \) \))" "0" + STACK_ALIGNMENT_OPT += -mstack-alignment=16 - else -- STACK_ALIGNMENT_OPT = -mno-omit-leaf-frame-pointer -mllvm -stack-alignment=16 ++ else + STACK_ALIGNMENT_OPT += -mllvm -stack-alignment=16 + endif endif @@ -1069,13 +1165,14 @@ DEBUG_CFLAGS/ppc = -g DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) +- DEBUG_CFLAGS += -gstabs + ifeq ($(USE_CLANG), true) + # Clang doesn't understand -gstabs + DEBUG_CFLAGS += -g + else - DEBUG_CFLAGS += -gstabs ++ DEBUG_CFLAGS += -gstabs ++ endif endif -+ endif ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) FASTDEBUG_CFLAGS/ia64 = -g @@ -1091,8 +1188,8 @@ OPT_CFLAGS/arm = -g OPT_CFLAGS/ppc = -g OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH)) ---- ./hotspot/make/bsd/makefiles/launcher.make 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/make/bsd/makefiles/launcher.make 2015-10-24 06:21:09.000000000 -0700 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ ./hotspot/make/bsd/makefiles/launcher.make Mon Jan 25 21:17:47 2016 -0800 @@ -0,0 +1,117 @@ +# +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. @@ -1211,8 +1308,8 @@ + $(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@ + $(QUIETLY) chmod +x $@ + ---- ./hotspot/make/bsd/makefiles/mapfile-vers-debug 2015-12-12 10:53:26.626789000 -0800 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug 2015-10-24 06:21:09.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Jan 25 21:17:47 2016 -0800 @@ -21,246 +21,254 @@ # questions. # @@ -1227,7 +1324,10 @@ - _JNI_CreateJavaVM - _JNI_GetCreatedJavaVMs - _JNI_GetDefaultJavaVMInitArgs -- ++ JNI_CreateJavaVM; ++ JNI_GetCreatedJavaVMs; ++ JNI_GetDefaultJavaVMInitArgs; + - # _JVM - _JVM_Accept - _JVM_ActiveProcessorCount @@ -1445,15 +1545,6 @@ - _JVM_Write - _JVM_Yield - _JVM_handle_bsd_signal -- -- # debug _JVM -- _JVM_AccessVMBooleanFlag -- _JVM_AccessVMIntFlag -- _JVM_VMBreakPoint -+ JNI_CreateJavaVM; -+ JNI_GetCreatedJavaVMs; -+ JNI_GetDefaultJavaVMInitArgs; -+ + # JVM + JVM_Accept; + JVM_ActiveProcessorCount; @@ -1671,7 +1762,11 @@ + JVM_Write; + JVM_Yield; + JVM_handle_bsd_signal; -+ + +- # debug _JVM +- _JVM_AccessVMBooleanFlag +- _JVM_AccessVMIntFlag +- _JVM_VMBreakPoint + # debug JVM + JVM_AccessVMBooleanFlag; + JVM_AccessVMIntFlag; @@ -1701,8 +1796,8 @@ + local: + *; +}; ---- ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx 2015-10-24 06:21:09.000000000 -0700 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Mon Jan 25 21:17:47 2016 -0800 @@ -0,0 +1,266 @@ +# +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. @@ -1970,8 +2065,8 @@ + + # INSERT VTABLE SYMBOLS HERE + ---- ./hotspot/make/bsd/makefiles/mapfile-vers-product 2015-12-12 10:53:26.627041000 -0800 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product 2015-10-24 06:21:09.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Jan 25 21:17:47 2016 -0800 @@ -21,241 +21,249 @@ # questions. # @@ -1986,7 +2081,10 @@ - _JNI_CreateJavaVM - _JNI_GetCreatedJavaVMs - _JNI_GetDefaultJavaVMInitArgs -- ++ JNI_CreateJavaVM; ++ JNI_GetCreatedJavaVMs; ++ JNI_GetDefaultJavaVMInitArgs; + - # _JVM - _JVM_Accept - _JVM_ActiveProcessorCount @@ -2204,10 +2302,6 @@ - _JVM_Write - _JVM_Yield - _JVM_handle_bsd_signal -+ JNI_CreateJavaVM; -+ JNI_GetCreatedJavaVMs; -+ JNI_GetDefaultJavaVMInitArgs; -+ + # JVM + JVM_Accept; + JVM_ActiveProcessorCount; @@ -2450,8 +2544,8 @@ + local: + *; +}; ---- ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx 2015-10-24 06:21:09.000000000 -0700 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Mon Jan 25 21:17:47 2016 -0800 @@ -0,0 +1,261 @@ +# +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. @@ -2714,8 +2808,8 @@ + + # INSERT VTABLE SYMBOLS HERE + ---- ./hotspot/make/bsd/makefiles/optimized.make 2014-03-03 18:52:06.000000000 -0800 -+++ ./hotspot/make/bsd/makefiles/optimized.make 2015-10-24 06:21:09.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/optimized.make Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/make/bsd/makefiles/optimized.make Mon Jan 25 21:17:47 2016 -0800 @@ -38,6 +38,9 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -2727,8 +2821,8 @@ +MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug$(MAPSUFX) VERSION = optimized ---- ./hotspot/make/bsd/makefiles/product.make 2014-03-03 18:52:06.000000000 -0800 -+++ ./hotspot/make/bsd/makefiles/product.make 2015-10-24 06:21:09.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/product.make Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/make/bsd/makefiles/product.make Mon Jan 25 21:17:47 2016 -0800 @@ -38,7 +38,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -2741,8 +2835,8 @@ SYSDEFS += -DPRODUCT VERSION = optimized ---- ./hotspot/make/bsd/makefiles/rules.make 2014-03-03 18:52:06.000000000 -0800 -+++ ./hotspot/make/bsd/makefiles/rules.make 2015-10-24 06:21:09.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/rules.make Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/make/bsd/makefiles/rules.make Mon Jan 25 21:17:47 2016 -0800 @@ -34,7 +34,7 @@ CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) @@ -2752,8 +2846,8 @@ COMPILE.CC = $(CC_COMPILE) -c GENASM.CC = $(CC_COMPILE) -S ---- ./hotspot/make/bsd/makefiles/vm.make 2015-12-12 10:53:26.627607000 -0800 -+++ ./hotspot/make/bsd/makefiles/vm.make 2015-10-24 06:21:09.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/vm.make Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/make/bsd/makefiles/vm.make Mon Jan 25 21:17:47 2016 -0800 @@ -107,7 +107,7 @@ # File specific flags CXXFLAGS += $(CXXFLAGS/BYFILE) @@ -2763,8 +2857,8 @@ CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" endif ---- ./hotspot/src/cpu/x86/vm/jni_x86.h 2014-03-03 18:52:11.000000000 -0800 -+++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2015-10-24 06:21:09.000000000 -0700 +--- ./hotspot/src/cpu/x86/vm/jni_x86.h Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/src/cpu/x86/vm/jni_x86.h Mon Jan 25 21:17:47 2016 -0800 @@ -34,7 +34,7 @@ #ifndef __has_attribute #define __has_attribute(x) 0 @@ -2774,8 +2868,8 @@ #define JNIEXPORT __attribute__((visibility("default"))) #define JNIIMPORT __attribute__((visibility("default"))) #else ---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp 2015-12-12 10:53:20.996606000 -0800 -+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp 2015-10-24 06:21:09.000000000 -0700 +--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Fri Dec 18 11:38:02 2015 -0800 ++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Jan 25 21:17:47 2016 -0800 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601311937.u0VJbF8P072061>