openjdk8: switch upstream to the openjdk BSD community effort at github

This repo is a continuation of the bsd-port tree, still maintained by
the FreeBSD ports java people.
It is forked from (and merges regularly from) AdoptOpenJDK.
They accept patches for other BSDs, so we should see if we have anything
in our tree worth contributing.

As a side effect, this changes updates openjdk8 to u222.

8 files changed, 55 insertions, 138 deletions

diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index 9b271a84785..637c2db78ab 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.80 2019/07/21 22:25:14 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2019/07/25 12:00:08 tnn Exp $
 
-DISTNAME=	openjdk-1.8.202-20190219
-PKGNAME=	openjdk8-1.8.202
-PKGREVISION=	3
+DISTNAME=	openjdk8-1.8.222
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
-EXTRACT_SUFX=	.tar.xz
+MASTER_SITES=   ${MASTER_SITE_GITHUB:=battleblow/}
+GITHUB_PROJECT= openjdk-jdk8u
+GITHUB_TAG=     jdk8u222-b10.1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://openjdk.java.net/
@@ -26,6 +25,7 @@ JAVA_WRAPPERS=	jar java javac javadoc javah javap jcmd jhat jps jstack \
 BUILD_DEPENDS+=		mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
 
 GNU_CONFIGURE=		yes
+USE_GNU_CONFIGURE_HOST=	no
 CONFIGURE_SCRIPT=	configure
 CONFIG_SHELL=		bash
 CONFIG_SUB_OVERRIDE+=	common/autoconf/build-aux/config.sub
@@ -35,7 +35,6 @@ CONFIG_GUESS_OVERRIDE+=	common/autoconf/build-aux/autoconf-config.guess
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		bash gmake pax pkg-config unzip:run zip:run
 UNLIMIT_RESOURCES=	datasize stacksize
-WRKSRC=			${WRKDIR}/openjdk
 PLIST_SRC+=		${PLIST_SRC_DFLT}
 CHECK_SHLIBS_SKIP+=	java/openjdk8/jre/lib/${LIBDIR_ARCH}/libinstrument.so
 
@@ -46,8 +45,7 @@ BUILDLINK_TRANSFORM+=	rm:-Werror
 
 CONFIGURE_ARGS+=	--disable-option-checking # for --with-libiconv-prefix
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=	--build=${MACHINE_GNU_PLATFORM:Q}
-CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM:Q}
+CONFIGURE_ARGS+=	--openjdk-target=${MACHINE_GNU_PLATFORM:Q}
 CONFIGURE_ARGS+=	--with-boot-jdk=${ALT_BOOTDIR}
 CONFIGURE_ARGS+=	--with-zlib=system
 CONFIGURE_ARGS+=	--with-giflib=bundled
diff --git a/lang/openjdk8/PLIST b/lang/openjdk8/PLIST
index 140a5afd1ae..1a6ef1a2937 100644
--- a/lang/openjdk8/PLIST
+++ b/lang/openjdk8/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2018/09/19 18:18:30 abs Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/07/25 12:00:08 tnn Exp $
 bin/openjdk8-jar
 bin/openjdk8-java
 bin/openjdk8-javac
@@ -20,10 +20,14 @@ java/openjdk8/ASSEMBLY_EXCEPTION
 java/openjdk8/LICENSE
 java/openjdk8/THIRD_PARTY_README
 ${PLIST.x11}java/openjdk8/bin/appletviewer
+java/openjdk8/bin/clhsdb
 java/openjdk8/bin/extcheck
+java/openjdk8/bin/hsdb
 java/openjdk8/bin/idlj
 java/openjdk8/bin/jar
 java/openjdk8/bin/jarsigner
+java/openjdk8/bin/clhsdb
+java/openjdk8/bin/hsdb
 java/openjdk8/bin/java
 java/openjdk8/bin/java-rmi.cgi
 java/openjdk8/bin/javac
@@ -336,6 +340,8 @@ java/openjdk8/include/${LOWER_OPSYS}/jni_md.h
 java/openjdk8/jre/ASSEMBLY_EXCEPTION
 java/openjdk8/jre/LICENSE
 java/openjdk8/jre/THIRD_PARTY_README
+java/openjdk8/jre/bin/clhsdb
+java/openjdk8/jre/bin/hsdb
 java/openjdk8/jre/bin/java
 java/openjdk8/jre/bin/jjs
 java/openjdk8/jre/bin/keytool
@@ -399,8 +405,8 @@ java/openjdk8/jre/lib/content-types.properties
 java/openjdk8/jre/lib/currency.data
 java/openjdk8/jre/lib/ext/cldrdata.jar
 java/openjdk8/jre/lib/ext/dnsns.jar
-java/openjdk8/jre/lib/ext/localedata.jar
 java/openjdk8/jre/lib/ext/jaccess.jar
+java/openjdk8/jre/lib/ext/localedata.jar
 java/openjdk8/jre/lib/ext/meta-index
 java/openjdk8/jre/lib/ext/nashorn.jar
 java/openjdk8/jre/lib/ext/sunec.jar
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index dd5caae0dc2..432db31f6b0 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2019/07/24 10:03:34 tnn Exp $
+$NetBSD: distinfo,v 1.71 2019/07/25 12:00:08 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
@@ -48,11 +48,11 @@ 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-1.8.202-20190219.tar.xz) = 57d466f31faa95ba8ecaa31512cd2f4fe5a3994a
-RMD160 (openjdk7/openjdk-1.8.202-20190219.tar.xz) = 13e2d440494a70a9b282457ca22bfc050ceaa4fe
-SHA512 (openjdk7/openjdk-1.8.202-20190219.tar.xz) = 3a8944e69d74439765010bc58ea191a471af22be135835d0cc25e550acd506d08c7dcbbcfecd8280ce85e1624aec91da843b2d36abae0d11af272fcf6d672120
-Size (openjdk7/openjdk-1.8.202-20190219.tar.xz) = 55869224 bytes
-SHA1 (patch-aa) = 37b2d569fac98c2a66433f2c27a462c6d565000c
+SHA1 (openjdk7/openjdk8-1.8.222.tar.gz) = 01c72ea589f75c4e0c2d2f930c30053dd0414692
+RMD160 (openjdk7/openjdk8-1.8.222.tar.gz) = a0d4d87155a1c86293d89d66b6130990ed0b404a
+SHA512 (openjdk7/openjdk8-1.8.222.tar.gz) = e4c02422fe7652ad8b2987354626591efbaf94dde975d7eabfd852b6a5abada6d2ece463f9ebd21b73d67428456c7f7b9bbb66368f7ba486a8346f677a1a0ce2
+Size (openjdk7/openjdk8-1.8.222.tar.gz) = 85692163 bytes
+SHA1 (patch-aa) = df056ced73a06e9a2c5ae59d15218a6f38c2ab5e
 SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
 SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
 SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5
@@ -84,9 +84,7 @@ SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 0ca85ba72d154643b93481
 SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = 787e0c68cf976fc0df3e19fb2a22b1b7e3662c07
 SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088
 SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = 446b96a91a2e4fa76f43ac653d1608f037c64af9
-SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87224f8b67dc78fa411d30beff82ce5ccbb4cc5
-SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp) = 6311d68db9064afc470f1d9fd37e63011899659a
-SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = cea10db5bf4ee4b939543b66340bfd59474ca5e0
+SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = f46713855507654be42707b1f80a779796929069
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 6a6b719a52408e88b27d3f2a5a41789dc15ef39d
@@ -113,6 +111,7 @@ 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-aa b/lang/openjdk8/patches/patch-aa
index 5196ecf9193..8a297691378 100644
--- a/lang/openjdk8/patches/patch-aa
+++ b/lang/openjdk8/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.7 2019/02/19 17:00:17 ryoon Exp $
+$NetBSD: patch-aa,v 1.8 2019/07/25 12:00:08 tnn Exp $
 
-DragonFly support.
-Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
+-DragonFly support.
+-Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
 
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2018-05-26 23:58:31.000000000 +0000
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2019-07-18 21:55:16.000000000 +0000
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
 @@ -114,7 +114,7 @@
  # include <vm/vm_param.h>
@@ -14,7 +14,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  # include <elf.h>
  #endif
  
-@@ -292,6 +292,7 @@ void os::Bsd::initialize_system_info() {
+@@ -294,6 +294,7 @@ void os::Bsd::initialize_system_info() {
    size_t len;
    int cpu_val;
    julong mem_val;
@@ -22,7 +22,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  
    /* get processors count via hw.ncpus sysctl */
    mib[0] = CTL_HW;
-@@ -330,14 +331,11 @@ void os::Bsd::initialize_system_info() {
+@@ -332,14 +333,11 @@ void os::Bsd::initialize_system_info() {
         _physical_memory = 256*1024*1024;       // fallback (XXXBSD?)
    }
  
@@ -42,7 +42,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  #endif
  }
  
-@@ -389,7 +387,7 @@ void os::init_system_properties_values()
+@@ -391,7 +389,7 @@ void os::init_system_properties_values()
  //        ...
  //        7: The default directories, normally /lib and /usr/lib.
  #ifndef DEFAULT_LIBPATH
@@ -51,7 +51,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  #endif
  
  // Base path of extensions installed on the system.
-@@ -1587,8 +1585,15 @@ void * os::dll_load(const char *filename
+@@ -1603,8 +1601,15 @@ void * os::dll_load(const char *filename
      {EM_PPC,         EM_PPC,     ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
      {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
      {EM_ARM,         EM_ARM,     ELFCLASS32,   ELFDATA2LSB, (char*)"ARM"},
@@ -67,16 +67,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
      {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
      {EM_MIPS,        EM_MIPS,    ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
      {EM_PARISC,      EM_PARISC,  ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
-@@ -1611,6 +1616,8 @@ void * os::dll_load(const char *filename
-     static  Elf32_Half running_arch_code=EM_PPC;
-   #elif  (defined ARM)
-     static  Elf32_Half running_arch_code=EM_ARM;
-+  #elif  (defined AARCH64)
-+    static  Elf32_Half running_arch_code=EM_AARCH64;
-   #elif  (defined S390)
-     static  Elf32_Half running_arch_code=EM_S390;
-   #elif  (defined ALPHA)
-@@ -2116,6 +2123,33 @@ bool Semaphore::timedwait(unsigned int s
+@@ -2135,6 +2140,33 @@ bool Semaphore::timedwait(unsigned int s
  
  #else
  
@@ -110,7 +101,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  bool Semaphore::trywait() {
    return sem_trywait(&_semaphore) == 0;
  }
-@@ -2266,7 +2300,7 @@ static void warn_fail_commit_memory(char
+@@ -2285,7 +2317,7 @@ static void warn_fail_commit_memory(char
  //       problem.
  bool os::pd_commit_memory(char* addr, size_t size, bool exec) {
    int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
@@ -119,7 +110,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
    // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD
    if (::mprotect(addr, size, prot) == 0) {
      return true;
-@@ -2869,7 +2903,7 @@ OSReturn os::set_native_priority(Thread*
+@@ -2980,7 +3012,7 @@ OSReturn os::set_native_priority(Thread*
  #ifdef __OpenBSD__
    // OpenBSD pthread_setprio starves low priority threads
    return OS_OK;
@@ -128,7 +119,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
    int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
    return (ret == 0) ? OS_OK : OS_ERR;
  #elif defined(__APPLE__) || defined(__NetBSD__)
-@@ -2898,7 +2932,7 @@ OSReturn os::get_native_priority(const T
+@@ -3009,7 +3041,7 @@ OSReturn os::get_native_priority(const T
    }
  
    errno = 0;
@@ -137,7 +128,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
    *priority_ptr = pthread_getprio(thread->osthread()->pthread_id());
  #elif defined(__APPLE__) || defined(__NetBSD__)
    int policy;
-@@ -3585,7 +3619,11 @@
+@@ -3696,7 +3728,11 @@ void os::Bsd::check_signal_handler(int s
    struct sigaction act;
    if (os_sigaction == NULL) {
      // only trust the default sigaction, in case it has been interposed
diff --git a/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp
index f11a702523b..23dae6f6364 100644
--- a/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp
+++ b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp
@@ -1,33 +1,10 @@
-$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp,v 1.1 2015/02/20 09:38:00 tnn Exp $
+$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp,v 1.2 2019/07/25 12:00:08 tnn Exp $
 
-ARM: Substitute Linux atomic ops with NetBSD atomic ops
+match atomic op prototype
 
---- hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp.orig	2015-02-02 15:32:37.000000000 +0000
+--- hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp.orig	2019-07-18 21:55:16.000000000 +0000
 +++ hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp
-@@ -112,8 +112,13 @@ static inline int m68k_lock_test_and_set
-  *
-  */
- 
-+#ifdef __NetBSD__
-+#include <sys/atomic.h>
-+#define __kernel_cmpxchg(oldval, newval, ptr) ((unsigned int)(oldval) != atomic_cas_uint((volatile unsigned int*)(ptr), (unsigned int)(oldval), (unsigned int)(newval)))
-+#else
- typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
- #define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
-+#endif
- 
- 
- 
-@@ -189,7 +194,7 @@
- 
- inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
- #ifdef ARM
--  return arm_add_and_fetch(dest, add_value);
-+  return arm_add_and_fetch((volatile int*)dest, add_value);
- #else
- #ifdef M68K
-   return m68k_add_and_fetch(dest, add_value);
-@@ -246,7 +251,7 @@
+@@ -260,7 +260,7 @@ inline jint Atomic::xchg(jint exchange_v
  inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value,
                                   volatile intptr_t* dest) {
  #ifdef ARM
@@ -36,12 +13,3 @@ ARM: Substitute Linux atomic ops with NetBSD atomic ops
  #else
  #ifdef M68K
    return m68k_lock_test_and_set(dest, exchange_value);
-@@ -286,7 +291,7 @@
-                                     volatile intptr_t* dest,
-                                     intptr_t compare_value) {
- #ifdef ARM
--  return arm_compare_and_swap(dest, compare_value, exchange_value);
-+  return arm_compare_and_swap((volatile int*)dest, compare_value, exchange_value);
- #else
- #ifdef M68K
-   return m68k_compare_and_swap(dest, compare_value, exchange_value);
diff --git a/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp
deleted file mode 100644
index 3514e2d3686..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp,v 1.1 2015/02/20 09:38:00 tnn Exp $
-
-ARM: Substitute Linux atomic ops with NetBSD atomic ops
-
---- hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp.orig	2015-02-02 15:32:37.000000000 +0000
-+++ hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp
-@@ -37,8 +37,13 @@
-  * and gcc __sync_synchronize(); implementation does not use the kernel
-  * helper for all gcc versions so it is unreliable to use as well.
-  */
-+#ifdef __NetBSD__
-+#include <sys/atomic.h>
-+#define __kernel_dmb membar_sync
-+#else
- typedef void (__kernel_dmb_t) (void);
- #define __kernel_dmb (*(__kernel_dmb_t *) 0xffff0fa0)
-+#endif
- 
- #define FULL_MEM_BARRIER __kernel_dmb()
- #define READ_MEM_BARRIER __kernel_dmb()
diff --git a/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp
deleted file mode 100644
index 770660784f2..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp,v 1.2 2017/07/18 19:53:11 jmcneill Exp $
-
-Fix -Werror=return-local-addr with gcc.
-
-clang objects to redefining builtins.
-
---- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig	2017-04-27 09:45:07.000000000 +0000
-+++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -60,8 +60,7 @@
- #include "utilities/vmError.hpp"
- 
- address os::current_stack_pointer() {
--  address dummy = (address) &dummy;
--  return dummy;
-+  return (address) __builtin_frame_address(0);
- }
- 
- frame os::get_sender_for_C_frame(frame* fr) {
-@@ -446,21 +445,6 @@ extern "C" {
-   }
- };
- 
--/////////////////////////////////////////////////////////////////////////////
--// Implementations of atomic operations not supported by processors.
--//  -- http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Atomic-Builtins.html
--
--#ifndef _LP64
--extern "C" {
--  long long unsigned int __sync_val_compare_and_swap_8(
--    volatile void *ptr,
--    long long unsigned int oldval,
--    long long unsigned int newval) {
--    ShouldNotCallThis();
--  }
--};
--#endif // !_LP64
--
- #ifndef PRODUCT
- void os::verify_stack_alignment() {
- }
diff --git a/lang/openjdk8/patches/patch-jdk_make_gensrc_GensrcMisc.gmk b/lang/openjdk8/patches/patch-jdk_make_gensrc_GensrcMisc.gmk
new file mode 100644
index 00000000000..a49446ec2de
--- /dev/null
+++ b/lang/openjdk8/patches/patch-jdk_make_gensrc_GensrcMisc.gmk
@@ -0,0 +1,15 @@
+$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))