diff options
Diffstat (limited to 'java/openjdk12/files')
15 files changed, 0 insertions, 292 deletions
diff --git a/java/openjdk12/files/cacerts b/java/openjdk12/files/cacerts Binary files differdeleted file mode 100644 index c07b7abaf5ef..000000000000 --- a/java/openjdk12/files/cacerts +++ /dev/null diff --git a/java/openjdk12/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp b/java/openjdk12/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp deleted file mode 100644 index 1722d87b9665..000000000000 --- a/java/openjdk12/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/openjdk12/files/patch-10-af5c725b b/java/openjdk12/files/patch-10-af5c725b deleted file mode 100644 index 0e4ec063a266..000000000000 --- a/java/openjdk12/files/patch-10-af5c725b +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk -index 8de519fc606..221e9455960 100644 ---- make/common/MakeBase.gmk -+++ make/common/MakeBase.gmk -@@ -525,15 +525,16 @@ DependOnVariableFileName = \ - # Param 2 - (optional) name of file to store value in - DependOnVariableHelper = \ - $(strip \ -- $(eval -include $(call DependOnVariableFileName, $1, $2)) \ -+ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \ -+ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \ - $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\ -- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \ -+ $(call MakeDir, $(dir $($1_filename))) \ - $(if $(findstring $(LOG_LEVEL), trace), \ - $(info NewVariable $1: >$(strip $($1))<) \ - $(info OldVariable $1: >$(strip $($1_old))<)) \ - $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \ -- $(call DependOnVariableFileName, $1, $2))) \ -- $(call DependOnVariableFileName, $1, $2) \ -+ $($1_filename))) \ -+ $($1_filename) \ - ) - - # Main macro diff --git a/java/openjdk12/files/patch-changeset-57932 b/java/openjdk12/files/patch-changeset-57932 deleted file mode 100644 index 12acff8b6c8d..000000000000 --- a/java/openjdk12/files/patch-changeset-57932 +++ /dev/null @@ -1,44 +0,0 @@ -changeset: 57932:9e54ea7d9cd9 -user: qpzhang -date: Wed Feb 05 20:31:09 2020 +0800 -summary: 8238388: libj2gss/NativeFunc.o "multiple definition" link errors with GCC10 - -diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.c ---- src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 10:45:39 2020 +0100 -+++ src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 20:31:09 2020 +0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2005, 2020, 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 -@@ -27,6 +27,9 @@ - #include <stdlib.h> - #include "NativeFunc.h" - -+/* global GSS function table */ -+GSS_FUNCTION_TABLE_PTR ftab; -+ - /* standard GSS method names (ordering is from mapfile) */ - static const char RELEASE_NAME[] = "gss_release_name"; - static const char IMPORT_NAME[] = "gss_import_name"; -diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.h ---- src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 10:45:39 2020 +0100 -+++ src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 20:31:09 2020 +0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2005, 2020, 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 -@@ -277,6 +277,6 @@ - typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; - - /* global GSS function table */ --GSS_FUNCTION_TABLE_PTR ftab; -+extern GSS_FUNCTION_TABLE_PTR ftab; - - #endif - diff --git a/java/openjdk12/files/patch-changeset-57994 b/java/openjdk12/files/patch-changeset-57994 deleted file mode 100644 index 8e6dc348c532..000000000000 --- a/java/openjdk12/files/patch-changeset-57994 +++ /dev/null @@ -1,43 +0,0 @@ -changeset: 57994:6925fca95959 -user: qpzhang -date: Tue Feb 04 21:27:10 2020 +0800 -summary: 8238380: java.base/unix/native/libjava/childproc.c "multiple definition" link errors with GCC10 - -diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.c ---- src/java.base/unix/native/libjava/childproc.c Tue Feb 11 11:17:37 2020 +0800 -+++ src/java.base/unix/native/libjava/childproc.c Tue Feb 04 21:27:10 2020 +0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2013, 2020, 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 -@@ -34,6 +34,7 @@ - - #include "childproc.h" - -+const char * const *parentPathv; - - ssize_t - restartableWrite(int fd, const void *buf, size_t count) -diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.h ---- src/java.base/unix/native/libjava/childproc.h Tue Feb 11 11:17:37 2020 +0800 -+++ src/java.base/unix/native/libjava/childproc.h Tue Feb 04 21:27:10 2020 +0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2013, 2020, 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 -@@ -126,7 +126,7 @@ - * The cached and split version of the JDK's effective PATH. - * (We don't support putenv("PATH=...") in native code) - */ --const char * const *parentPathv; -+extern const char * const *parentPathv; - - ssize_t restartableWrite(int fd, const void *buf, size_t count); - int restartableDup2(int fd_from, int fd_to); - diff --git a/java/openjdk12/files/patch-commit-34ae46e2bca b/java/openjdk12/files/patch-commit-34ae46e2bca deleted file mode 100644 index 3b70042a5487..000000000000 --- a/java/openjdk12/files/patch-commit-34ae46e2bca +++ /dev/null @@ -1,23 +0,0 @@ -commit 34ae46e2bca691f989d4d84129baf545ff8a7469 -Author: Andrew Haley <aph@openjdk.org> -Date: Thu Mar 19 14:53:57 2020 +0000 - - 8241296: Segfault in JNIHandleBlock::oops_do() - - Reviewed-by: stefank - -diff --git src/hotspot/share/runtime/thread.cpp src/hotspot/share/runtime/thread.cpp -index b93e70a0353..b1571f2d594 100644 ---- src/hotspot/share/runtime/thread.cpp -+++ src/hotspot/share/runtime/thread.cpp -@@ -888,7 +888,9 @@ bool Thread::claim_par_threads_do(uintx claim_token) { - } - - void Thread::oops_do(OopClosure* f, CodeBlobClosure* cf) { -- active_handles()->oops_do(f); -+ if (active_handles() != NULL) { -+ active_handles()->oops_do(f); -+ } - // Do oop for ThreadShadow - f->do_oop((oop*)&_pending_exception); - handle_area()->oops_do(f); diff --git a/java/openjdk12/files/patch-commit-c484d890428 b/java/openjdk12/files/patch-commit-c484d890428 deleted file mode 100644 index 39ac7a7e8e46..000000000000 --- a/java/openjdk12/files/patch-commit-c484d890428 +++ /dev/null @@ -1,23 +0,0 @@ -commit c484d8904285652246c3af212a4211b9a8955149 -Author: Thomas Stuefe <stuefe@openjdk.org> -Date: Tue Mar 16 05:49:01 2021 +0000 - - 8263557: Possible NULL dereference in Arena::destruct_contents() - - Reviewed-by: kbarrett, coleenp - -diff --git src/hotspot/share/memory/arena.cpp src/hotspot/share/memory/arena.cpp -index 8388f68c359..16059bed9be 100644 ---- src/hotspot/share/memory/arena.cpp -+++ src/hotspot/share/memory/arena.cpp -@@ -310,7 +310,9 @@ void Arena::destruct_contents() { - // reset size before chop to avoid a rare racing condition - // that can have total arena memory exceed total chunk memory - set_size_in_bytes(0); -- _first->chop(); -+ if (_first != NULL) { -+ _first->chop(); -+ } - reset(); - } - diff --git a/java/openjdk12/files/patch-configure b/java/openjdk12/files/patch-configure deleted file mode 100644 index 59daa4ff854f..000000000000 --- a/java/openjdk12/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- 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/openjdk12/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 deleted file mode 100644 index 1d298469523c..000000000000 --- a/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 +++ /dev/null @@ -1,17 +0,0 @@ ---- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC -+++ make/autoconf/flags-cflags.m4 -@@ -770,6 +770,14 @@ 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" -+ elif test "x$FLAGS_CPU" = xppc64le; then -+ # Little endian machine uses ELFv2 ABI. -+ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. -+ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power8" -+ fi - fi - - elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then diff --git a/java/openjdk12/files/patch-make_autoconf_libraries.m4 b/java/openjdk12/files/patch-make_autoconf_libraries.m4 deleted file mode 100644 index 0911464a6522..000000000000 --- a/java/openjdk12/files/patch-make_autoconf_libraries.m4 +++ /dev/null @@ -1,15 +0,0 @@ ---- 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/openjdk12/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp b/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp deleted file mode 100644 index f8b55399d8ca..000000000000 --- a/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp.orig 2021-03-15 12:55:40 UTC -+++ src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp -@@ -27,13 +27,13 @@ - #define OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP - - #if defined(VM_LITTLE_ENDIAN) --#include <byteswap.h> -+#include <sys/endian.h> - - // Efficient swapping of data bytes from Java byte - // ordering to native byte ordering and vice versa. --inline u2 Bytes::swap_u2(u2 x) { return bswap_16(x); } --inline u4 Bytes::swap_u4(u4 x) { return bswap_32(x); } --inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); } -+inline u2 Bytes::swap_u2(u2 x) { return bswap16(x); } -+inline u4 Bytes::swap_u4(u4 x) { return bswap32(x); } -+inline u8 Bytes::swap_u8(u8 x) { return bswap64(x); } - #endif // VM_LITTLE_ENDIAN - - #endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP diff --git a/java/openjdk12/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk12/files/patch-src_hotspot_os_bsd_os__bsd.cpp deleted file mode 100644 index 8be2abe3388f..000000000000 --- a/java/openjdk12/files/patch-src_hotspot_os_bsd_os__bsd.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/java/openjdk12/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java b/java/openjdk12/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java deleted file mode 100644 index 4f3913a95410..000000000000 --- a/java/openjdk12/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java +++ /dev/null @@ -1,11 +0,0 @@ ---- src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java.orig 2020-04-17 22:35:42 UTC -+++ src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java -@@ -529,7 +529,7 @@ static native String XSetLocaleModifiers(String modifi - display Specifies the connection to the X server. - onoff Specifies a Boolean value that indicates whether to enable or disable synchronization. - */ -- static native int XSynchronize(long display, boolean onoff); -+ static native long XSynchronize(long display, boolean onoff); - - /** - * Extracts an X event that can be processed in a secondary loop. diff --git a/java/openjdk12/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c b/java/openjdk12/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c deleted file mode 100644 index b4d602993ab9..000000000000 --- a/java/openjdk12/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c.orig 2020-04-17 22:35:42 UTC -+++ src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c -@@ -2180,10 +2180,10 @@ Java_sun_awt_X11_XlibWrapper_copyLongArray(JNIEnv *env - } - } - --JNIEXPORT jint JNICALL -+JNIEXPORT jlong JNICALL - Java_sun_awt_X11_XlibWrapper_XSynchronize(JNIEnv *env, jclass clazz, jlong display, jboolean onoff) - { -- return (jint) XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False)); -+ return ptr_to_jlong(XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False))); - } - - JNIEXPORT jboolean JNICALL diff --git a/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c b/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c deleted file mode 100644 index 8f4b50cad0b7..000000000000 --- a/java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.c.orig 2021-03-15 13:24:28 UTC -+++ src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.c -@@ -42,7 +42,7 @@ - #include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h" - #endif - --#ifdef ppc64 -+#if defined(ppc64) || defined(ppc64le) - #include "sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext.h" - #endif - -@@ -326,7 +326,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debu - #if defined(sparc) || defined(sparcv9) - #define NPRGREG sun_jvm_hotspot_debugger_sparc_SPARCThreadContext_NPRGREG - #endif --#ifdef ppc64 -+#if defined(ppc64) || defined(ppc64le) - #define NPRGREG sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext_NPRGREG - #endif - #ifdef aarch64 |