Add a port of OpenJDK 14

6 files changed, 64 insertions, 0 deletions

diff --git a/java/openjdk14/files/cacerts b/java/openjdk14/files/cacerts
new file mode 100644
index 000000000000..c07b7abaf5ef
--- /dev/null
+++ b/java/openjdk14/files/cacerts
diff --git a/java/openjdk14/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp b/java/openjdk14/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp
new file mode 100644
index 000000000000..1722d87b9665
--- /dev/null
+++ b/java/openjdk14/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp
@@ -0,0 +1,11 @@
+--- src/hotspot/cpu/ppc/vm_version_ppc.hpp.orig	2019-10-16 11:31:09.000000000 -0700
++++ src/hotspot/cpu/ppc/vm_version_ppc.hpp	2019-10-23 12:54:06.972903000 -0700
+@@ -108,7 +108,7 @@
+   static bool has_lqarx()   { return (_features & lqarx_m) != 0; }
+   static bool has_vcipher() { return (_features & vcipher_m) != 0; }
+   static bool has_vpmsumb() { return (_features & vpmsumb_m) != 0; }
+-  static bool has_mfdscr()  { return (_features & mfdscr_m) != 0; }
++  static bool has_mfdscr()  { return false; }
+   static bool has_vsx()     { return (_features & vsx_m) != 0; }
+   static bool has_ldbrx()   { return (_features & ldbrx_m) != 0; }
+   static bool has_stdbrx()  { return (_features & stdbrx_m) != 0; }
diff --git a/java/openjdk14/files/patch-configure b/java/openjdk14/files/patch-configure
new file mode 100644
index 000000000000..59daa4ff854f
--- /dev/null
+++ b/java/openjdk14/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig	2019-03-12 12:38:39.648907000 -0700
++++ configure	2019-03-12 12:39:04.275572000 -0700
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!%%LOCALBASE%%/bin/bash
+ #
+ # Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+@@ -32,4 +32,4 @@
+ # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c.
+ # This trick is needed to get autoconf to co-operate properly.
+ # The ${-:+-$-} construction passes on bash options.
+-bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
++%%LOCALBASE%%/bin/bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
diff --git a/java/openjdk14/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk14/files/patch-make_autoconf_flags-cflags.m4
new file mode 100644
index 000000000000..5156c18515da
--- /dev/null
+++ b/java/openjdk14/files/patch-make_autoconf_flags-cflags.m4
@@ -0,0 +1,13 @@
+--- make/autoconf/flags-cflags.m4.orig	2020-01-08 09:12:31 UTC
++++ make/autoconf/flags-cflags.m4
+@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
+         # for all archs except arm and ppc, prevent gcc to omit frame pointer
+         $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
+       fi
++    elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then
++        if test "x$FLAGS_CPU" = xppc64; then
++            $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5"
++        fi
+     fi
+ 
+   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
diff --git a/java/openjdk14/files/patch-make_autoconf_libraries.m4 b/java/openjdk14/files/patch-make_autoconf_libraries.m4
new file mode 100644
index 000000000000..0911464a6522
--- /dev/null
+++ b/java/openjdk14/files/patch-make_autoconf_libraries.m4
@@ -0,0 +1,15 @@
+--- make/autoconf/libraries.m4~	2019-08-12 19:10:36.292217000 -0700
++++ make/autoconf/libraries.m4	2019-08-12 19:18:15.523606000 -0700
+@@ -188,9 +188,9 @@
+       ICONV_LDFLAGS="-L/usr/local/lib"
+       ICONV_LIBS=-liconv
+     elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then
+-      ICONV_CFLAGS=-DLIBICONV_PLUG
+-      ICONV_LDFLAGS=
+-      ICONV_LIBS=
++      ICONV_CFLAGS=%%ICONV_CFLAGS%%
++      ICONV_LDFLAGS=%%ICONV_LDFLAGS%%
++      ICONV_LIBS=%%ICONV_LIBS%%
+     else
+       ICONV_CFLAGS=
+       ICONV_LDFLAGS=
diff --git a/java/openjdk14/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk14/files/patch-src_hotspot_os_bsd_os__bsd.cpp
new file mode 100644
index 000000000000..8be2abe3388f
--- /dev/null
+++ b/java/openjdk14/files/patch-src_hotspot_os_bsd_os__bsd.cpp
@@ -0,0 +1,11 @@
+--- src/hotspot/os/bsd/os_bsd.cpp.orig	2019-03-28 21:47:08.000000000 -0700
++++ src/hotspot/os/bsd/os_bsd.cpp	2019-03-28 23:08:55.590922000 -0700
+@@ -361,7 +361,7 @@
+     #elif defined(__NetBSD__)
+       #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib"
+     #else
+-      #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib"
++      #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib"
+     #endif
+   #else
+     #define DEFAULT_LIBPATH OVERRIDE_LIBPATH