diff options
Diffstat (limited to 'community/openjdk13/gcc10-compilation-fix.patch')
| -rw-r--r-- | community/openjdk13/gcc10-compilation-fix.patch | 108 |
1 files changed, 0 insertions, 108 deletions
diff --git a/community/openjdk13/gcc10-compilation-fix.patch b/community/openjdk13/gcc10-compilation-fix.patch deleted file mode 100644 index c13d92f581e..00000000000 --- a/community/openjdk13/gcc10-compilation-fix.patch +++ /dev/null @@ -1,108 +0,0 @@ -Subject: Fix build error with gcc >= 10.0 -Upstream: Yes -Upstream-Url: https://bugs.openjdk.java.net/browse/JDK-8235903 -Author: Simon Frankenberger <simon-alpine@fraho.eu> - -This is a backport of the fixes to make it compile with gcc10 again. - ---- old/src/java.base/unix/native/libjava/childproc.c -+++ new/src/java.base/unix/native/libjava/childproc.c -@@ -33,6 +33,7 @@ - - #include "childproc.h" - -+const char * const *parentPathv; - - ssize_t - restartableWrite(int fd, const void *buf, size_t count) ---- old/src/java.base/unix/native/libjava/childproc.h -+++ new/src/java.base/unix/native/libjava/childproc.h -@@ -118,7 +118,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); ---- old/src/java.security.jgss/share/native/libj2gss/NativeFunc.c -+++ new/src/java.security.jgss/share/native/libj2gss/NativeFunc.c -@@ -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"; ---- old/src/java.security.jgss/share/native/libj2gss/NativeFunc.h -+++ new/src/java.security.jgss/share/native/libj2gss/NativeFunc.h -@@ -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 ---- /dev/null -+++ new/src/jdk.sctp/unix/native/libsctp/Sctp.c -@@ -0,0 +1,34 @@ -+/* -+ * Copyright (c) 2009, 2019, 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 -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. Oracle designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Oracle in the LICENSE file that accompanied this code. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+#include "Sctp.h" -+ -+sctp_getladdrs_func* nio_sctp_getladdrs; -+sctp_freeladdrs_func* nio_sctp_freeladdrs; -+sctp_getpaddrs_func* nio_sctp_getpaddrs; -+sctp_freepaddrs_func* nio_sctp_freepaddrs; -+sctp_bindx_func* nio_sctp_bindx; -+sctp_peeloff_func* nio_sctp_peeloff; -+ ---- old/src/jdk.sctp/unix/native/libsctp/Sctp.h -+++ new/src/jdk.sctp/unix/native/libsctp/Sctp.h -@@ -322,12 +322,12 @@ - - #endif /* __linux__ */ - --sctp_getladdrs_func* nio_sctp_getladdrs; --sctp_freeladdrs_func* nio_sctp_freeladdrs; --sctp_getpaddrs_func* nio_sctp_getpaddrs; --sctp_freepaddrs_func* nio_sctp_freepaddrs; --sctp_bindx_func* nio_sctp_bindx; --sctp_peeloff_func* nio_sctp_peeloff; -+extern sctp_getladdrs_func* nio_sctp_getladdrs; -+extern sctp_freeladdrs_func* nio_sctp_freeladdrs; -+extern sctp_getpaddrs_func* nio_sctp_getpaddrs; -+extern sctp_freepaddrs_func* nio_sctp_freepaddrs; -+extern sctp_bindx_func* nio_sctp_bindx; -+extern sctp_peeloff_func* nio_sctp_peeloff; - - jboolean loadSocketExtensionFuncs(JNIEnv* env); - |