openjdk8: update to 1.8.292

Updated BSD port of JDK 8
Additional features include:
  Native HotSpot support for aarch64 (not enabled yet in pkgsrc)

5 files changed, 57 insertions, 92 deletions

diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index 69db8fb1cc8..56d182626c3 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.106 2021/04/21 13:24:54 adam Exp $
+# $NetBSD: Makefile,v 1.107 2021/06/27 14:54:40 tnn Exp $
 
 DISTNAME=	openjdk-jdk8u-${GITHUB_TAG}
 PKGNAME=	openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
-PKGREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=battleblow/}
 MASTER_SITES+=	${MASTER_SITE_LOCAL:=openjdk7/}	# for bootstrap kits
 GITHUB_PROJECT=	openjdk-jdk8u
-GITHUB_TAG=	jdk8u252-b09.1
+GITHUB_TAG=	jdk8u292-b10.2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://openjdk.java.net/
@@ -70,7 +69,7 @@ CONFIGURE_ARGS+=	--with-update-version=${PKGVERSION_NOREV:S/1.8.//}
 CONFIGURE_ARGS+=	--with-extra-ldflags=${LDFLAGS:Q}
 
 CHECK_PORTABILITY_SKIP+=	hotspot/test/runtime/*/*.sh
-CHECK_PORTABILITY_SKIP+=	hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh
+CHECK_PORTABILITY_SKIP+=	hotspot/test/compiler/*/*/*.sh
 
 # Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
 MAKE_ENV+=	JAVA_HOME=
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index 4589a4d8efb..4b0b61e9b67 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.81 2021/04/28 17:32:12 tnn Exp $
+$NetBSD: distinfo,v 1.82 2021/06/27 14:54:40 tnn Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -32,10 +32,10 @@ SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29b
 RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
 SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f
 Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
-SHA1 (openjdk7/openjdk-jdk8u-jdk8u252-b09.1.tar.gz) = 1548a9c271f87d3557e893ab89799f49adbd0bcd
-RMD160 (openjdk7/openjdk-jdk8u-jdk8u252-b09.1.tar.gz) = 91f9483b6dba53fd5a0aa3faf1a21e3275f512d3
-SHA512 (openjdk7/openjdk-jdk8u-jdk8u252-b09.1.tar.gz) = c7240fb8b0ecca3f5fb16a4db7838ebfa2f2d479c9750f7c872dd3ec5999004735207c02ed48eddb3a9376cd3de9868e01244daf773ffca5d817eb4b09fd3470
-Size (openjdk7/openjdk-jdk8u-jdk8u252-b09.1.tar.gz) = 86258574 bytes
+SHA1 (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = c32fb5d098f2df2df46a2e636ed8888f19ad3d4e
+RMD160 (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = fddcf65c5334f9ca36eed4110c4d706de1122bc3
+SHA512 (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = 3614ef9ee4327242c62cdf80bee746c648a91e515e5611dcc8a2576fc6aaf073351132d910fcb16366302d59e615142ce9948be38eccbf236f250e9b15e6d752
+Size (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = 88568471 bytes
 SHA1 (patch-aa) = 60c0ba1b3362c7d521e9919236c3aaede67d1ef1
 SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
 SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
@@ -47,7 +47,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
 SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
 SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462
-SHA1 (patch-common_autoconf_generated-configure.sh) = f9c391681451b3c3714d498a8c9110bd9f1f26d2
+SHA1 (patch-common_autoconf_generated-configure.sh) = 6fb73788e7b1e98966f7005a10b7957745700ec9
 SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
 SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = 6e4c41b080577ed7cd418ee3b84f7f5a73dd11e6
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
@@ -57,7 +57,7 @@ SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f
 SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d
 SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 84e3d6b6603887aaac13747b5c972dd3eec4c7f1
 SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 632f96a322f1568df6f49bf31716bafe1d324976
-SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 4763215f5ce2c3d9fcadb69e52afad7c9de97417
+SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = b846f0ef8e9ba2fb41e4d32b4cc07ea25170e022
 SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = b2db4dbfd7cf3e862bf4604d722f5cf4e898c1bc
 SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 58965fe7c142b67be35cab8b30f84dcee2096e39
 SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 2dfd843c450971ee0857cbd81b946a4d7c86ee3b
@@ -95,7 +95,6 @@ SHA1 (patch-jdk_make_CompileLaunchers.gmk) = d496999f10fc56b1d68283ab4636787058f
 SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
 SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
-SHA1 (patch-jdk_make_gensrc_GensrcMisc.gmk) = 184d89fdfeedbd9c7fcb4ddfbe3ec0314796e7da
 SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 1e29aaa4a4ce5bb104bdd8d8ba1b87f8ff09b8be
 SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 21a46be1c8247d528a2e0666ca9a40520327771a
 SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
diff --git a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
index 696e8e1a9f8..f2e13e27d08 100644
--- a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
+++ b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
@@ -1,12 +1,12 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.20 2021/04/28 17:32:12 tnn Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.21 2021/06/27 14:54:41 tnn Exp $
 
 BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and
 pkg/53223.
 Fix detection of GCC>=10.
 
---- common/autoconf/generated-configure.sh.orig	2020-04-15 02:42:06.000000000 +0000
+--- common/autoconf/generated-configure.sh.orig	2021-05-14 21:52:06.000000000 +0000
 +++ common/autoconf/generated-configure.sh
-@@ -4188,7 +4188,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
+@@ -4191,7 +4191,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
  # These toolchains are valid on different platforms
  VALID_TOOLCHAINS_bsd="clang gcc"
  VALID_TOOLCHAINS_linux="gcc clang"
@@ -25,7 +25,7 @@ Fix detection of GCC>=10.
  
    MAKE_CANDIDATE=""$MAKE""
    DESCRIPTION="user supplied MAKE=$MAKE"
-@@ -20135,7 +20132,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -20173,7 +20170,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -34,7 +34,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -20467,7 +20464,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -20505,7 +20502,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -43,7 +43,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -20785,7 +20782,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -20823,7 +20820,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -52,7 +52,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -20973,7 +20970,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21011,7 +21008,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -61,7 +61,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -21251,7 +21248,7 @@ fi
+@@ -21289,7 +21286,7 @@ fi
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -70,7 +70,7 @@ Fix detection of GCC>=10.
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -21301,7 +21298,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21339,7 +21336,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -79,7 +79,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -21516,7 +21513,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21554,7 +21551,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -88,7 +88,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -21696,7 +21693,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21734,7 +21731,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -97,7 +97,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -21904,7 +21901,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21942,7 +21939,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -106,7 +106,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -22084,7 +22081,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22122,7 +22119,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -115,7 +115,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -22292,7 +22289,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22330,7 +22327,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -124,7 +124,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -22472,7 +22469,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22510,7 +22507,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -133,7 +133,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -22680,7 +22677,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22718,7 +22715,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -142,7 +142,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -22860,7 +22857,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22898,7 +22895,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -151,7 +151,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -23055,7 +23052,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23093,7 +23090,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -160,7 +160,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -23233,7 +23230,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23271,7 +23268,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -169,7 +169,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -23429,7 +23426,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23467,7 +23464,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -178,7 +178,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -23607,7 +23604,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23645,7 +23642,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -187,7 +187,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -23802,7 +23799,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23840,7 +23837,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -196,7 +196,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -23980,7 +23977,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24018,7 +24015,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -205,7 +205,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -24176,7 +24173,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24214,7 +24211,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -214,7 +214,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -24354,7 +24351,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24392,7 +24389,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -223,7 +223,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -24531,7 +24528,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24569,7 +24566,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@@ -232,7 +232,7 @@ Fix detection of GCC>=10.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -24937,16 +24934,15 @@ $as_echo_n "checking flags for boot jdk 
+@@ -24975,16 +24972,15 @@ $as_echo_n "checking flags for boot jdk 
    # Maximum amount of heap memory.
    # Maximum stack size.
    if test "x$BOOT_JDK_BITS" = x32; then
@@ -250,7 +250,7 @@ Fix detection of GCC>=10.
  
    $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
    $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
-@@ -27480,7 +27476,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -27518,7 +27514,7 @@ $as_echo_n "checking resolved symbolic l
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -259,7 +259,7 @@ Fix detection of GCC>=10.
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -27935,7 +27931,7 @@ $as_echo_n "checking for resolved symbol
+@@ -27973,7 +27969,7 @@ $as_echo_n "checking for resolved symbol
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -268,16 +268,7 @@ Fix detection of GCC>=10.
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -28046,7 +28042,7 @@ $as_echo "$as_me: The result from runnin
-     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
-         $SED -e 's/ *Copyright .*//'`
-     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
--        $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
-+        $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
-   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
-     # clang --version output typically looks like
-     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
-@@ -29221,7 +29217,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -29259,7 +29255,7 @@ $as_echo_n "checking resolved symbolic l
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -286,7 +277,7 @@ Fix detection of GCC>=10.
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -29676,7 +29672,7 @@ $as_echo_n "checking for resolved symbol
+@@ -29714,7 +29710,7 @@ $as_echo_n "checking for resolved symbol
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -295,16 +286,7 @@ Fix detection of GCC>=10.
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -29787,7 +29783,7 @@ $as_echo "$as_me: The result from runnin
-     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
-         $SED -e 's/ *Copyright .*//'`
-     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
--        $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
-+        $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
-   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
-     # clang --version output typically looks like
-     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
-@@ -41393,6 +41389,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -41431,6 +41427,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
        SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
        SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
        SET_SHARED_LIBRARY_MAPFILE=''
@@ -317,7 +299,7 @@ Fix detection of GCC>=10.
      else
        # Default works for linux, might work on other platforms as well.
        SHARED_LIBRARY_FLAGS='-shared'
-@@ -41444,7 +41446,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -41482,7 +41484,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
      CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
      CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
@@ -327,7 +309,7 @@ Fix detection of GCC>=10.
    fi
    # The (cross) compiler is now configured, we can now test capabilities
    # of the target platform.
-@@ -41585,7 +41589,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -41623,7 +41627,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
    elif test "x$TOOLCHAIN_TYPE" = xgcc; then
      LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
      LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
@@ -336,7 +318,7 @@ Fix detection of GCC>=10.
        LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
        LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
      fi
-@@ -42332,7 +42336,9 @@ $as_echo "$supports" >&6; }
+@@ -42370,7 +42374,9 @@ $as_echo "$supports" >&6; }
        # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
        # java heap.
        if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
@@ -346,7 +328,7 @@ Fix detection of GCC>=10.
        fi
      fi
    fi
-@@ -42825,7 +42831,8 @@ $as_echo "alsa pulse x11" >&6; }
+@@ -42863,7 +42869,8 @@ $as_echo "alsa pulse x11" >&6; }
    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; }
@@ -356,7 +338,7 @@ Fix detection of GCC>=10.
        ALSA_NOT_NEEDED=yes
        PULSE_NOT_NEEDED=yes
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-@@ -44055,7 +44062,7 @@ $as_echo "$as_me: WARNING: Can't find pr
+@@ -44093,7 +44100,7 @@ $as_echo "$as_me: WARNING: Can't find pr
      BUILD_FREETYPE=no
    fi
    # Now check if configure found a version of 'msbuild.exe'
@@ -365,7 +347,7 @@ Fix detection of GCC>=10.
      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&5
  $as_echo "$as_me: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&2;}
      BUILD_FREETYPE=no
-@@ -44471,7 +44478,11 @@ $as_echo "$as_me: WARNING: --with-freety
+@@ -44509,7 +44516,11 @@ $as_echo "$as_me: WARNING: --with-freety
  
        # Allow --with-freetype-lib and --with-freetype-include to override
        if test "x$with_freetype_include" != x; then
@@ -378,7 +360,7 @@ Fix detection of GCC>=10.
        fi
        if test "x$with_freetype_lib" != x; then
          POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-@@ -47581,7 +47592,7 @@ $as_echo "$as_me: The path of FREETYPE_I
+@@ -47619,7 +47630,7 @@ $as_echo "$as_me: The path of FREETYPE_I
      FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
    fi
  
@@ -387,7 +369,7 @@ Fix detection of GCC>=10.
          FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
        else
          FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-@@ -47714,7 +47725,7 @@ $as_echo "$as_me: The path of FREETYPE_L
+@@ -47752,7 +47763,7 @@ $as_echo "$as_me: The path of FREETYPE_L
        if test "x$OPENJDK_TARGET_OS" = xwindows; then
          FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
        else
@@ -396,7 +378,7 @@ Fix detection of GCC>=10.
        fi
      fi
  
-@@ -49051,9 +49062,6 @@ fi
+@@ -49089,9 +49100,6 @@ fi
  
  
  
@@ -406,7 +388,7 @@ Fix detection of GCC>=10.
  
      llvm_components="jit mcjit engine nativecodegen native"
      unset LLVM_CFLAGS
-@@ -49096,7 +49104,7 @@ fi
+@@ -49134,7 +49142,7 @@ fi
    fi
  
    # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
diff --git a/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make b/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make
index c0611d7400f..458ea1a3d50 100644
--- a/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make
+++ b/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make
@@ -1,8 +1,8 @@
-$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.2 2015/07/18 07:07:42 fhajny Exp $
+$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.3 2021/06/27 14:54:41 tnn Exp $
 
 GCC support.
 
---- hotspot/make/solaris/makefiles/gcc.make.orig	2015-06-10 10:31:44.000000000 +0000
+--- hotspot/make/solaris/makefiles/gcc.make.orig	2021-05-14 21:52:06.000000000 +0000
 +++ hotspot/make/solaris/makefiles/gcc.make
 @@ -70,11 +70,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG)
  VM_PICFLAG/AOUT   =
@@ -67,7 +67,7 @@ GCC support.
  # Compiler warnings are treated as errors 
  WARNINGS_ARE_ERRORS = -Werror 
 -# Enable these warnings. See 'info gcc' about details on these options
--WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef
+-WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef -Wformat=2
 -CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS)
 +
 +# Except for a few acceptable ones
@@ -77,14 +77,14 @@ GCC support.
 +ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
 +  ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare
 +else
-+  ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef
++  ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef -Wformat=2
 +endif
 +
 +CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
  # Special cases 
  CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))  
  
-@@ -177,7 +203,7 @@ MAPFLAG = -Xlinker -M -Xlinker FILENAME
+@@ -177,7 +203,7 @@ MAPFLAG = -Xlinker -M -Xlinker FILENAME 
  endif 
  
  # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj
diff --git a/lang/openjdk8/patches/patch-jdk_make_gensrc_GensrcMisc.gmk b/lang/openjdk8/patches/patch-jdk_make_gensrc_GensrcMisc.gmk
deleted file mode 100644
index a49446ec2de..00000000000
--- a/lang/openjdk8/patches/patch-jdk_make_gensrc_GensrcMisc.gmk
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-jdk_make_gensrc_GensrcMisc.gmk,v 1.1 2019/07/25 12:00:08 tnn Exp $
-
-Use compiler to link executable, otherwise libc and crt will be absent.
-
---- jdk/make/gensrc/GensrcMisc.gmk.orig	2019-07-18 21:55:16.000000000 +0000
-+++ jdk/make/gensrc/GensrcMisc.gmk
-@@ -76,7 +76,7 @@ $(eval $(call SetupNativeCompilation,BUI
-     INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
-     LANG := C, \
-     CC := $(BUILD_CC), \
--    LDEXE := $(BUILD_LD), \
-+    LDEXE := $(BUILD_CC), \
-     OBJECT_DIR := $(GENSRC_SOR_BIN), \
-     OUTPUT_DIR := $(GENSRC_SOR_BIN), \
-     PROGRAM := genSocketOptionRegistry))