Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Dec 2018 10:46:56 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r488531 - in branches/2018Q4/java/openjdk8: . files
Message-ID:  <201812271046.wBRAkuvt011579@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ale
Date: Thu Dec 27 10:46:56 2018
New Revision: 488531
URL: https://svnweb.freebsd.org/changeset/ports/488531

Log:
  MFH: r485094 r486973 r486983 r487219 r488521
  
  - Fix reversed ccache version detection logic.  Enable ccache support.
  - Use '-pthread' for Clang.  Clang supports '-pthread' on all BSDs except
  for Darwin. [1]
  
  Reported by:	Achilleas Mantzios <achill@matrix.gatewaynet.com> [1]
  Tested by:	Achilleas Mantzios <achill@matrix.gatewaynet.com> [1]
  
  . Update to 8u192.
  
  PR:		230364
  
  . Fix SCTP support.
  
  PR:		230321
  Submitted by:	Timo Voelker <timo.voelker@fh-muenster.de>
  
  . Fix build on gcc based architectures (e.g. powerpc64)
  
  PR:		233883
  Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>
  
  Add support for millisecond resolution to get/setLastModifiedTime
  in both Java IO and NIO.
  
  Approved by:	portmgr (bapt)

Added:
  branches/2018Q4/java/openjdk8/files/patch-common_autoconf_build-performance.m4
     - copied unchanged from r485094, head/java/openjdk8/files/patch-common_autoconf_build-performance.m4
  branches/2018Q4/java/openjdk8/files/patch-common_autoconf_generated-configure.sh
     - copied unchanged from r485094, head/java/openjdk8/files/patch-common_autoconf_generated-configure.sh
  branches/2018Q4/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_gcc.make
     - copied unchanged from r485094, head/java/openjdk8/files/patch-hotspot_make_bsd_makefiles_gcc.make
  branches/2018Q4/java/openjdk8/files/patch-jdk-src-solaris-native-java-io-UnixFileSystem_md.c
     - copied unchanged from r488521, head/java/openjdk8/files/patch-jdk-src-solaris-native-java-io-UnixFileSystem_md.c
  branches/2018Q4/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c
     - copied unchanged from r486983, head/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-ch-sctp-SctpChannelImpl.c
  branches/2018Q4/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-fs-UnixNativeDispatcher.c
     - copied unchanged from r488521, head/java/openjdk8/files/patch-jdk-src-solaris-native-sun-nio-fs-UnixNativeDispatcher.c
Modified:
  branches/2018Q4/java/openjdk8/Makefile
  branches/2018Q4/java/openjdk8/distinfo
  branches/2018Q4/java/openjdk8/files/patch-bsd
  branches/2018Q4/java/openjdk8/files/patch-bsd-test
  branches/2018Q4/java/openjdk8/files/patch-configure
  branches/2018Q4/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/java/openjdk8/Makefile
==============================================================================
--- branches/2018Q4/java/openjdk8/Makefile	Thu Dec 27 10:44:06 2018	(r488530)
+++ branches/2018Q4/java/openjdk8/Makefile	Thu Dec 27 10:46:56 2018	(r488531)
@@ -2,6 +2,7 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
+PORTREVISION=	2
 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 \
@@ -33,7 +34,8 @@ PATCHFILES=	patch-8u05-b13.xz \
 		patch-8u152-b16.xz \
 		patch-8u162-b12.xz \
 		patch-8u172-b11.xz \
-		patch-8u181-b13.xz
+		patch-8u181-b13.xz \
+		patch-8u192-b26.xz
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT?=	Java Development Kit ${JDK_MAJOR_VERSION}
@@ -202,12 +204,11 @@ JDK_JVMDIR=	lib/${ARCH:C/armv.*/arm/:S/powerpc64/ppc64
 JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc64/ppc64/}
 INSTALLDIR=	${PREFIX}/${PKGBASE}
 
-NO_CCACHE=		yes
 NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	8
-JDK_UPDATE_VERSION=	181
-JDK_BUILD_NUMBER=	13
+JDK_UPDATE_VERSION=	192
+JDK_BUILD_NUMBER=	26
 DIST_BUILD_NUMBER=	132
 JTREG_VERSION=		4.1
 JTREG_BUILD_NUMBER=	b08
@@ -219,8 +220,10 @@ CONFIGURE_ARGS+=	--with-build-number="b${JDK_BUILD_NUM
 .if ${JDK_UPDATE_VERSION} > 0
 CONFIGURE_ARGS+=	--with-update-version=${JDK_UPDATE_VERSION}
 .endif
-CONFIGURE_ARGS+=	--disable-ccache \
-			--disable-freetype-bundling \
+.if defined(NO_CCACHE)
+CONFIGURE_ARGS+=	--disable-ccache
+.endif
+CONFIGURE_ARGS+=	--disable-freetype-bundling \
 			--disable-zip-debug-info \
 			--with-cacerts-file=${FILESDIR}/cacerts \
 			--with-cups=${LOCALBASE} \
@@ -359,6 +362,7 @@ CONFIGURE_ENV+=	LIBCXX="-lc++"
 
 # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
 .if ${COMPILER_TYPE} == gcc
+CONFIGURE_ARGS+=	--with-toolchain-type=gcc
 .if ${ARCH} == "powerpc64"
 MAKE_ARGS+=	USE_PRECOMPILED_HEADER=1
 .else

Modified: branches/2018Q4/java/openjdk8/distinfo
==============================================================================
--- branches/2018Q4/java/openjdk8/distinfo	Thu Dec 27 10:44:06 2018	(r488530)
+++ branches/2018Q4/java/openjdk8/distinfo	Thu Dec 27 10:46:56 2018	(r488531)
@@ -49,3 +49,5 @@ SHA256 (patch-8u172-b11.xz) = e338a1dc63cc08f9227d685e
 SIZE (patch-8u172-b11.xz) = 146716
 SHA256 (patch-8u181-b13.xz) = 4cd0f5a04b72ad6c4ef73807d6a42e141394f5c38cee8ce11c0159a080073839
 SIZE (patch-8u181-b13.xz) = 69096
+SHA256 (patch-8u192-b26.xz) = 5bfa782ec2af8ddc6aed3e8de81cc37c7f375ebad650341d1ce74956c82a411e
+SIZE (patch-8u192-b26.xz) = 284164

Modified: branches/2018Q4/java/openjdk8/files/patch-bsd
==============================================================================
--- branches/2018Q4/java/openjdk8/files/patch-bsd	Thu Dec 27 10:44:06 2018	(r488530)
+++ branches/2018Q4/java/openjdk8/files/patch-bsd	Thu Dec 27 10:46:56 2018	(r488531)
@@ -1,5 +1,5 @@
---- ./common/autoconf/build-performance.m4	Sat Jun 23 21:01:22 2018 -0700
-+++ ./common/autoconf/build-performance.m4	Mon Sep 03 11:10:31 2018 -0700
+--- ./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
 @@ -41,6 +41,10 @@
      # Looks like a MacOSX system
      NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk  '{print [$]5}'`
@@ -27,7 +27,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-`
-@@ -199,8 +212,8 @@
+@@ -209,8 +222,8 @@
      # Only use ccache if it is 3.1.4 or later, which supports
      # precompiled headers.
      AC_MSG_CHECKING([if ccache supports precompiled headers])
@@ -37,10 +37,66 @@
 +    if test "x$HAS_GOOD_CCACHE" = xyes; then
        AC_MSG_RESULT([no, disabling ccache])
        CCACHE=
-     else
---- ./common/autoconf/generated-configure.sh	Sat Jun 23 21:01:22 2018 -0700
-+++ ./common/autoconf/generated-configure.sh	Mon Sep 03 11:10:31 2018 -0700
-@@ -646,6 +646,8 @@
+       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
+@@ -154,7 +154,7 @@
+   # How to compile shared libraries.
+   #
+ 
+-  if test "x$TOOLCHAIN_TYPE" = xgcc; then
++  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+     PICFLAG="-fPIC"
+     C_FLAG_REORDER=''
+     CXX_FLAG_REORDER=''
+@@ -266,7 +266,7 @@
+   # fi
+ 
+   # Generate make dependency files
+-  if test "x$TOOLCHAIN_TYPE" = xgcc; then
++  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+     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
+-  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 @@
+   else
+     # The remaining toolchains share opt flags between CC and CXX;
+     # setup for C and duplicate afterwards.
+-    if test "x$TOOLCHAIN_TYPE" = xgcc; then
++    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+       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 @@
+ 
+   # Setup compiler/platform specific flags to CFLAGS_JDK,
+   # CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?)
+-  if test "x$TOOLCHAIN_TYPE" = xgcc; then
++  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+     # 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 @@
+     fi
+     LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
+   else
+-    if test "x$TOOLCHAIN_TYPE" = xgcc; then
++    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+       # 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 @@
  LIBM
  LIBZIP_CAN_USE_MMAP
  USE_EXTERNAL_LIBZ
@@ -49,7 +105,7 @@
  USE_EXTERNAL_LIBGIF
  USE_EXTERNAL_LIBJPEG
  ALSA_LIBS
-@@ -824,6 +826,7 @@
+@@ -837,6 +839,7 @@
  JDK_MAJOR_VERSION
  USER_RELEASE_SUFFIX
  COMPRESS_JARS
@@ -57,15 +113,15 @@
  UNLIMITED_CRYPTO
  CACERTS_FILE
  TEST_IN_BUILD
-@@ -900,6 +903,7 @@
- OPENJDK_TARGET_CPU_ARCH
+@@ -914,6 +917,7 @@
  OPENJDK_TARGET_CPU
+ OPENJDK_TARGET_OS_ENV
  OPENJDK_TARGET_OS_API
 +OPENJDK_TARGET_OS_VENDOR
  OPENJDK_TARGET_OS
  OPENJDK_BUILD_CPU_ENDIAN
  OPENJDK_BUILD_CPU_BITS
-@@ -1032,6 +1036,7 @@
+@@ -1050,6 +1054,7 @@
  enable_hotspot_test_in_build
  with_cacerts_file
  enable_unlimited_crypto
@@ -73,15 +129,15 @@
  with_milestone
  with_update_version
  with_user_release_suffix
-@@ -1058,6 +1063,7 @@
+@@ -1070,6 +1075,7 @@
+ with_import_hotspot
+ with_toolchain_type
+ with_toolchain_version
++with_package_path
+ with_jtreg
  with_extra_cflags
  with_extra_cxxflags
- with_extra_ldflags
-+with_package_path
- enable_debug_symbols
- enable_zip_debug_info
- enable_macosx_runtime_support
-@@ -1734,6 +1740,7 @@
+@@ -1827,6 +1833,7 @@
                            run the Queens test after Hotspot build [disabled]
    --enable-unlimited-crypto
                            Enable unlimited crypto policy [disabled]
@@ -89,25 +145,33 @@
    --disable-debug-symbols disable generation of debug symbols [enabled]
    --disable-zip-debug-info
                            disable zipping of debug-info files [enabled]
-@@ -1830,6 +1837,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
+@@ -1919,6 +1926,8 @@
+                           the version of the toolchain to look for, use
+                           '--help' to show possible values [platform
+                           dependent]
 +  --with-package-path     package path to be used for location of third party
 +                          packages
-   --with-x                use the X Window System
-   --with-cups             specify prefix directory for the cups package
-                           (expecting the headers under PATH/include)
-@@ -3744,7 +3753,7 @@
+   --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 @@
+ VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft"
  
+ # These toolchains are valid on different platforms
++VALID_TOOLCHAINS_bsd="clang gcc"
+ VALID_TOOLCHAINS_linux="gcc clang"
+ VALID_TOOLCHAINS_solaris="solstudio"
+ VALID_TOOLCHAINS_macosx="gcc clang"
+@@ -4336,7 +4346,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
+ 
+ ###############################################################################
  #
--# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -6840,11 +6849,27 @@
+@@ -13570,11 +13580,27 @@
        as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5
        ;;
    esac
@@ -136,7 +200,7 @@
        VAR_CPU=x86_64
        VAR_CPU_ARCH=x86
        VAR_CPU_BITS=64
-@@ -6977,11 +7002,27 @@
+@@ -13708,11 +13734,27 @@
        as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5
        ;;
    esac
@@ -165,7 +229,7 @@
        VAR_CPU=x86_64
        VAR_CPU_ARCH=x86
        VAR_CPU_BITS=64
-@@ -7054,6 +7095,7 @@
+@@ -13785,6 +13827,7 @@
  
    # ... and setup our own variables. (Do this explicitely to facilitate searching)
    OPENJDK_TARGET_OS="$VAR_OS"
@@ -173,7 +237,7 @@
    OPENJDK_TARGET_OS_API="$VAR_OS_API"
    OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
    OPENJDK_TARGET_CPU="$VAR_CPU"
-@@ -7067,6 +7109,7 @@
+@@ -13799,6 +13842,7 @@
  
  
  
@@ -181,7 +245,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
-@@ -7195,8 +7238,8 @@
+@@ -13927,8 +13971,8 @@
  
    # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
    OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
@@ -192,7 +256,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.
-@@ -8017,7 +8060,7 @@
+@@ -14570,7 +14614,7 @@
      INCLUDE_SA=false
    fi
    if test "x$VAR_CPU" = xppc64 ; then
@@ -201,7 +265,7 @@
    fi
    if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
      INCLUDE_SA=false
-@@ -11206,6 +11249,24 @@
+@@ -19744,6 +19788,24 @@
  
    ###############################################################################
    #
@@ -226,67 +290,20 @@
    # Enable or disable the elliptic curve crypto implementation
    #
  
-@@ -19429,6 +19490,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
-@@ -20389,7 +20452,7 @@
-   else
-     COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
-     # Check that this is likely to be GCC.
--    $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
-+    $COMPILER --version 2>&1 | $GREP -E "(Free Software Foundation|clang)" > /dev/null
-     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;}
-@@ -21991,7 +22054,7 @@
-   else
-     COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
-     # Check that this is likely to be GCC.
--    $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
-+    $COMPILER --version 2>&1 | $GREP -E "(Free Software Foundation|clang)" > /dev/null
-     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;}
-@@ -28026,7 +28089,7 @@
+@@ -37332,7 +37394,7 @@
  
    # objcopy is used for moving debug symbols to separate files when
    # full debug symbols are enabled.
 -  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
 +  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xbsd ; then
-     if test -n "$ac_tool_prefix"; then
-   for ac_prog in gobjcopy objcopy
-   do
-@@ -29383,8 +29446,10 @@
-       SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
-       SET_SHARED_LIBRARY_MAPFILE=''
-       SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
-+      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
-@@ -29731,7 +29796,7 @@
-   #
-   case $COMPILER_NAME in
-     gcc )
--      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
-+      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \
-       -pipe \
-       -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
-       CXXSTD_CXXFLAG="-std=gnu++98"
-@@ -30073,22 +30138,36 @@
-   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64"
  
+ 
+   # Publish this variable in the help.
+@@ -40009,8 +40071,31 @@
+ 
+ 
    # 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.
@@ -312,83 +329,65 @@
 +      PACKAGE_PATH=/usr/local
 +    fi
 +  fi
++
  
  
-   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).
--    #   Note: -Dmacro         is the same as    #define macro 1
--    #         -Dmacro=        is the same as    #define macro
--    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
--      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
--    else
--      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
--    fi
--  else
--    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
-+    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN"
-+  else
-+    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_BIG_ENDIAN"
-   fi
-   if test "x$OPENJDK_TARGET_OS" = xlinux; then
-     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
-@@ -30118,6 +30197,38 @@
-   fi
-   if test "x$OPENJDK_TARGET_OS" = xbsd; then
-     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
-+    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; }
-+        if test "$cross_compiling" = yes; then :
-+
-+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/mman.h>
-+int main() { return mmap(0, 4096, PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0) != MAP_FAILED; }
-+_ACEOF
-+if ac_fn_cxx_try_run "$LINENO"; 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: no" >&5
-+$as_echo "no" >&6; }
-+
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+    fi
-   fi
-   if test "x$DEBUG_LEVEL" = xrelease; then
-     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG"
-@@ -30187,6 +30298,15 @@
-           # Should this be supplied to the OSS linker as well?
-           LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
-         fi
-+      elif test "x$OPENJDK_TARGET_OS" = xbsd; then
-+        # And since we now know that the linker is gnu, then add:
-+        #   -z noexecstack, to mark stack regions as non-executable
-+        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker noexecstack"
-+        if test "x$DEBUG_LEVEL" = "xrelease"; then
-+          # When building release libraries, tell the linker optimize them.
-+          # Should this be supplied to the OSS linker as well?
-+          LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
-+        fi
-       fi
+   # Check for extra potential brokenness.
+@@ -41117,7 +41202,7 @@
+   # How to compile shared libraries.
+   #
+ 
+-  if test "x$TOOLCHAIN_TYPE" = xgcc; then
++  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+     PICFLAG="-fPIC"
+     C_FLAG_REORDER=''
+     CXX_FLAG_REORDER=''
+@@ -41196,7 +41281,7 @@
+   # fi
+ 
+   # Generate make dependency files
+-  if test "x$TOOLCHAIN_TYPE" = xgcc; then
++  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+     C_FLAG_DEPS="-MMD -MF"
+   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+     C_FLAG_DEPS="-xMMD -xMF"
+@@ -41208,7 +41293,7 @@
+ 
+ 
+   # 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 @@
+   else
+     # The remaining toolchains share opt flags between CC and CXX;
+     # setup for C and duplicate afterwards.
+-    if test "x$TOOLCHAIN_TYPE" = xgcc; then
++    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+       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 @@
+ 
+   # Setup compiler/platform specific flags to CFLAGS_JDK,
+   # CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?)
+-  if test "x$TOOLCHAIN_TYPE" = xgcc; then
++  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+     # 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 @@
      fi
-     LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
-@@ -30641,11 +30761,18 @@
+     LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
+   else
+-    if test "x$TOOLCHAIN_TYPE" = xgcc; then
++    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+       # 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 @@
    fi
  
    if test "x$OPENJDK_TARGET_OS" = xbsd; then
@@ -412,31 +411,47 @@
    fi
  
    if test "x$OPENJDK" = "xfalse"; then
-@@ -30681,14 +30808,18 @@
+@@ -42405,21 +42497,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$SYS_ROOT" != "x/"; then
-     if test "x$x_includes" = xNONE; then
--      if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
-+      if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then
-+        x_includes="$SYS_ROOT/usr/X11R7/include"
-+      elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
-         x_includes="$SYS_ROOT/usr/X11R6/include"
-       elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
-         x_includes="$SYS_ROOT/usr/include"
+   if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
+-    if test "x$SYSROOT" != "x"; then
++    if test "x$SYS_ROOT" != "x/"; then
+       if test "x$x_includes" = xNONE; then
+-        if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then
+-          x_includes="$SYSROOT/usr/X11R6/include"
+-        elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then
+-          x_includes="$SYSROOT/usr/include"
++        if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then
++          x_includes="$SYS_ROOT/usr/X11R7/include"
++        elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
++          x_includes="$SYS_ROOT/usr/X11R6/include"
++        elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
++          x_includes="$SYS_ROOT/usr/include"
+         fi
        fi
+       if test "x$x_libraries" = xNONE; then
+-        if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then
+-          x_libraries="$SYSROOT/usr/X11R6/lib"
+-        elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+-          x_libraries="$SYSROOT/usr/lib64"
+-        elif test -f "$SYSROOT/usr/lib/libX11.so"; then
+-          x_libraries="$SYSROOT/usr/lib"
++        if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then
++          x_libraries="$SYS_ROOT/usr/X11R7/lib"
++        elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
++          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"
++        elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then
++          x_libraries="$SYS_ROOT/usr/lib"
+         fi
+       fi
      fi
-     if test "x$x_libraries" = xNONE; then
--      if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
-+      if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then
-+        x_libraries="$SYS_ROOT/usr/X11R7/lib"
-+      elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
-         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"
-@@ -31735,6 +31866,10 @@
+@@ -43466,6 +43562,10 @@
          # A CSW package seems to be installed!
          CUPS_FOUND=yes
-         CUPS_CFLAGS="-I/opt/csw/include"
+         CUPS_CFLAGS="-I$SYSROOT/opt/csw/include"
 +      elif test -s ${PACKAGE_PATH}/include/cups/cups.h; then
 +        # Standard package location for BSD
 +        CUPS_FOUND=yes
@@ -444,7 +459,7 @@
        fi
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5
  $as_echo "$CUPS_FOUND" >&6; }
-@@ -34900,7 +35035,7 @@
+@@ -47351,7 +47451,7 @@
  
    ###############################################################################
    #
@@ -453,7 +468,7 @@
    #
  
  # Check whether --with-alsa was given.
-@@ -35308,15 +35443,66 @@
+@@ -47762,15 +47862,66 @@
  
    if test "x${with_giflib}" = "xbundled"; then
      USE_EXTERNAL_LIBGIF=false
@@ -525,7 +540,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 :
-@@ -35354,16 +35540,96 @@
+@@ -47808,16 +47959,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 :
@@ -632,7 +647,7 @@
  
      USE_EXTERNAL_LIBGIF=true
    else
-@@ -35371,6 +35637,8 @@
+@@ -47825,6 +48056,8 @@
    fi
  
  
@@ -641,7 +656,7 @@
    ###############################################################################
    #
    # Check for the zlib library
-@@ -35938,6 +36206,11 @@
+@@ -48392,6 +48625,11 @@
      LIBCXX="-lstdc++"
    fi
  
@@ -653,7 +668,7 @@
  
  
  
-@@ -36011,6 +36284,10 @@
+@@ -51078,6 +51316,10 @@
      # Looks like a MacOSX system
      NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk  '{print $5}'`
      FOUND_CORES=yes
@@ -664,7 +679,7 @@
    elif test "x$OPENJDK_BUILD_OS" = xaix ; then
      NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'`
      FOUND_CORES=yes
-@@ -36066,6 +36343,15 @@
+@@ -51133,6 +51375,15 @@
      MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk  '{print $2}'`
      MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024`
      FOUND_MEM=yes
@@ -680,7 +695,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-`
-@@ -36473,8 +36759,8 @@
+@@ -51706,8 +51957,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; }
@@ -691,8 +706,8 @@
        { $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 Jun 23 21:01:22 2018 -0700
-+++ ./common/autoconf/jdk-options.m4	Mon Sep 03 11:10:31 2018 -0700
+--- ./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
 @@ -159,7 +159,7 @@
      INCLUDE_SA=false
    fi
@@ -723,8 +738,8 @@
    # Enable or disable the elliptic curve crypto implementation
    #
    AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
---- ./common/autoconf/libraries.m4	Sat Jun 23 21:01:22 2018 -0700
-+++ ./common/autoconf/libraries.m4	Mon Sep 03 11:10:31 2018 -0700
+--- ./common/autoconf/libraries.m4	Sat Oct 06 10:24:47 2018 +0100
++++ ./common/autoconf/libraries.m4	Sat Dec 01 12:25:45 2018 -0800
 @@ -69,9 +69,15 @@
    fi
  
@@ -744,31 +759,47 @@
    fi
  
    if test "x$OPENJDK" = "xfalse"; then
-@@ -99,14 +105,18 @@
+@@ -98,21 +104,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$SYS_ROOT" != "x/"; then
-     if test "x$x_includes" = xNONE; then
--      if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
-+      if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then
-+        x_includes="$SYS_ROOT/usr/X11R7/include"
-+      elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
-         x_includes="$SYS_ROOT/usr/X11R6/include"
-       elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
-         x_includes="$SYS_ROOT/usr/include"
+   if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
+-    if test "x$SYSROOT" != "x"; then
++    if test "x$SYS_ROOT" != "x/"; then
+       if test "x$x_includes" = xNONE; then
+-        if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then
+-          x_includes="$SYSROOT/usr/X11R6/include"
+-        elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then
+-          x_includes="$SYSROOT/usr/include"
++        if test -f "$SYS_ROOT/usr/X11R7/include/X11/Xlib.h"; then
++          x_includes="$SYS_ROOT/usr/X11R7/include"
++        elif test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
++          x_includes="$SYS_ROOT/usr/X11R6/include"
++        elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
++          x_includes="$SYS_ROOT/usr/include"
+         fi
        fi
+       if test "x$x_libraries" = xNONE; then
+-        if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then
+-          x_libraries="$SYSROOT/usr/X11R6/lib"
+-        elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+-          x_libraries="$SYSROOT/usr/lib64"
+-        elif test -f "$SYSROOT/usr/lib/libX11.so"; then
+-          x_libraries="$SYSROOT/usr/lib"
++        if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then
++          x_libraries="$SYS_ROOT/usr/X11R7/lib"
++        elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
++          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"
++        elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then
++          x_libraries="$SYS_ROOT/usr/lib"
+         fi
+       fi
      fi
-     if test "x$x_libraries" = xNONE; then
--      if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
-+      if test -f "$SYS_ROOT/usr/X11R7/lib/libX11.so"; then
-+        x_libraries="$SYS_ROOT/usr/X11R7/lib"
-+      elif test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
-         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"
-@@ -232,6 +242,10 @@
+@@ -238,6 +248,10 @@
          # A CSW package seems to be installed!
          CUPS_FOUND=yes
-         CUPS_CFLAGS="-I/opt/csw/include"
+         CUPS_CFLAGS="-I$SYSROOT/opt/csw/include"
 +      elif test -s ${PACKAGE_PATH}/include/cups/cups.h; then
 +        # Standard package location for BSD
 +        CUPS_FOUND=yes
@@ -776,7 +807,7 @@
        fi
        AC_MSG_RESULT([$CUPS_FOUND])
      fi
-@@ -525,7 +539,7 @@
+@@ -638,7 +652,7 @@
  
    ###############################################################################
    #
@@ -785,7 +816,7 @@
    #
    AC_ARG_WITH(alsa, [AS_HELP_STRING([--with-alsa],
        [specify prefix directory for the alsa package
-@@ -627,17 +641,61 @@
+@@ -743,17 +757,61 @@
  
    if test "x${with_giflib}" = "xbundled"; then
      USE_EXTERNAL_LIBGIF=false
@@ -851,7 +882,7 @@
  
    ###############################################################################
    #
-@@ -872,5 +930,10 @@
+@@ -988,6 +1046,11 @@
      LIBCXX="-lstdc++"
    fi
  
@@ -862,8 +893,9 @@
 +
    AC_SUBST(LIBCXX)
  ])
---- ./common/autoconf/platform.m4	Sat Jun 23 21:01:22 2018 -0700
-+++ ./common/autoconf/platform.m4	Mon Sep 03 11:10:31 2018 -0700
+ 
+--- ./common/autoconf/platform.m4	Sat Oct 06 10:24:47 2018 +0100
++++ ./common/autoconf/platform.m4	Sat Dec 01 12:25:45 2018 -0800
 @@ -30,7 +30,7 @@
  [
    # First argument is the cpu name from the trip/quad
@@ -896,7 +928,7 @@
  ])
  
  # Expects $host_os $host_cpu $build_os and $build_cpu
-@@ -192,6 +208,7 @@
+@@ -193,6 +209,7 @@
    PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
    # ... and setup our own variables. (Do this explicitely to facilitate searching)
    OPENJDK_TARGET_OS="$VAR_OS"
@@ -904,15 +936,15 @@
    OPENJDK_TARGET_OS_API="$VAR_OS_API"
    OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
    OPENJDK_TARGET_CPU="$VAR_CPU"
-@@ -199,6 +216,7 @@
+@@ -200,6 +217,7 @@
    OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
    OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
    AC_SUBST(OPENJDK_TARGET_OS)
 +  AC_SUBST(OPENJDK_TARGET_OS_VENDOR)
    AC_SUBST(OPENJDK_TARGET_OS_API)
+   AC_SUBST(OPENJDK_TARGET_OS_ENV)
    AC_SUBST(OPENJDK_TARGET_CPU)
-   AC_SUBST(OPENJDK_TARGET_CPU_ARCH)
-@@ -308,8 +326,8 @@
+@@ -310,8 +328,8 @@
  
    # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
    OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
@@ -923,9 +955,9 @@
      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 Jun 23 21:01:22 2018 -0700
-+++ ./common/autoconf/spec.gmk.in	Mon Sep 03 11:10:31 2018 -0700
-@@ -76,6 +76,7 @@
+--- ./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
+@@ -79,6 +79,7 @@
  OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
  OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@
  OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@
@@ -933,7 +965,7 @@
  
  OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
  OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
-@@ -276,7 +277,7 @@
+@@ -281,7 +282,7 @@
  ALSA_LIBS:=@ALSA_LIBS@
  ALSA_CFLAGS:=@ALSA_CFLAGS@
  
@@ -942,7 +974,7 @@
  
  # Source file for cacerts
  CACERTS_FILE=@CACERTS_FILE@
-@@ -284,6 +285,9 @@
+@@ -289,6 +290,9 @@
  # Enable unlimited crypto policy
  UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
  
@@ -952,7 +984,7 @@
  # Necessary additional compiler flags to compile X11
  X_CFLAGS:=@X_CFLAGS@
  X_LIBS:=@X_LIBS@
-@@ -568,6 +572,8 @@
+@@ -571,6 +575,8 @@
  ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
  USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
  USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
@@ -961,60 +993,30 @@
  USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
  LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
  MSVCR_DLL:=@MSVCR_DLL@
---- ./common/autoconf/toolchain.m4	Sat Jun 23 21:01:22 2018 -0700
-+++ ./common/autoconf/toolchain.m4	Mon Sep 03 11:10:31 2018 -0700
-@@ -122,7 +122,7 @@
-   else
-     COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
-     # Check that this is likely to be GCC.
--    $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
-+    $COMPILER --version 2>&1 | $GREP -E "(Free Software Foundation|clang)" > /dev/null
-     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"])
-@@ -401,6 +401,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
-@@ -629,7 +631,7 @@
+--- ./common/autoconf/toolchain.m4	Sat Oct 06 10:24:47 2018 +0100
++++ ./common/autoconf/toolchain.m4	Sat Dec 01 12:25:45 2018 -0800
+@@ -37,6 +37,7 @@
+ VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft"
  
+ # These toolchains are valid on different platforms
++VALID_TOOLCHAINS_bsd="clang gcc"
+ VALID_TOOLCHAINS_linux="gcc clang"
+ VALID_TOOLCHAINS_solaris="solstudio"
+ VALID_TOOLCHAINS_macosx="gcc clang"
+@@ -713,7 +714,7 @@
+ 
    # objcopy is used for moving debug symbols to separate files when
    # full debug symbols are enabled.
 -  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
 +  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xbsd ; then
-     AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
+     BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
      # Only call fixup if objcopy was found.
      if test -n "$OBJCOPY"; then
-@@ -692,8 +694,10 @@
-       SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1'
-       SET_SHARED_LIBRARY_MAPFILE=''
-       SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
-+      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
-@@ -1018,7 +1022,7 @@
-   #
-   case $COMPILER_NAME in
-     gcc )
--      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
-+      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \
-       -pipe \
-       -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
-       CXXSTD_CXXFLAG="-std=gnu++98"
-@@ -1106,22 +1110,33 @@
-   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64"
- 
+@@ -801,8 +802,27 @@
+ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
+  [
    # The package path is used only on macosx?
+-  # FIXME: clean this up, and/or move it elsewhere.
 -  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])])
@@ -1039,73 +1041,17 @@
 +
    AC_SUBST(PACKAGE_PATH)
  
-   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).
--    #   Note: -Dmacro         is the same as    #define macro 1
--    #         -Dmacro=        is the same as    #define macro
--    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
--      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
--    else
--      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
--    fi
-+    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN"
-   else
--    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
-+    COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_BIG_ENDIAN"
-   fi
-   if test "x$OPENJDK_TARGET_OS" = xlinux; then
-     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
-@@ -1151,6 +1166,22 @@
-   fi
-   if test "x$OPENJDK_TARGET_OS" = xbsd; then
-     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
-+    if test "`uname -s`" = "OpenBSD"; then
-+        AC_MSG_CHECKING([if ld requires -z wxneeded])
-+        AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/mman.h>
-+int main() { return mmap(0, 4096, PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0) != MAP_FAILED; }]])],
-+            [
-+              AC_MSG_RESULT([yes])
-+              LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,wxneeded"
-+            ],
-+            [
-+              AC_MSG_RESULT([no])
-+            ],
-+            [
-+              AC_MSG_RESULT([no])
-+            ]
-+        )
-+    fi
-   fi
-   if test "x$DEBUG_LEVEL" = xrelease; then
-     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG"
-@@ -1220,6 +1251,15 @@
-           # Should this be supplied to the OSS linker as well?
-           LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
-         fi
-+      elif test "x$OPENJDK_TARGET_OS" = xbsd; then
-+        # And since we now know that the linker is gnu, then add:
-+        #   -z noexecstack, to mark stack regions as non-executable
-+        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker noexecstack"
-+        if test "x$DEBUG_LEVEL" = "xrelease"; then
-+          # When building release libraries, tell the linker optimize them.
-+          # Should this be supplied to the OSS linker as well?
-+          LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
-+        fi
-       fi
-     fi
-     LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
---- ./configure	Sat Jun 23 21:01:22 2018 -0700
-+++ ./configure	Mon Sep 03 11:10:31 2018 -0700
+   # Check for extra potential brokenness.

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812271046.wBRAkuvt011579>