Attachment 218660 Details for Bug 250270 – Fix java/openjdk12 build with clang 11

[patch] Fix java/openjdk12 build with clang 11

java__openjdk12-fix-clang11-build-1.diff (text/plain), 7.77 KB, created by Dimitry Andric on 2020-10-11 10:57:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2020-10-11 10:57:41 UTC

Size: 7.77 KB

patch

obsolete

>Index: java/openjdk12/files/patch-changeset-57932
>===================================================================
>--- java/openjdk12/files/patch-changeset-57932	(nonexistent)
>+++ java/openjdk12/files/patch-changeset-57932	(working copy)
>@@ -0,0 +1,44 @@
>+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
>+
>
>Property changes on: java/openjdk12/files/patch-changeset-57932
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: java/openjdk12/files/patch-changeset-57994
>===================================================================
>--- java/openjdk12/files/patch-changeset-57994	(nonexistent)
>+++ java/openjdk12/files/patch-changeset-57994	(working copy)
>@@ -0,0 +1,43 @@
>+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);
>+
>
>Property changes on: java/openjdk12/files/patch-changeset-57994
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: java/openjdk12/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java
>===================================================================
>--- java/openjdk12/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java	(nonexistent)
>+++ java/openjdk12/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java	(working copy)
>@@ -0,0 +1,11 @@
>+--- 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.
>
>Property changes on: java/openjdk12/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: java/openjdk12/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c
>===================================================================
>--- java/openjdk12/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c	(nonexistent)
>+++ java/openjdk12/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c	(working copy)
>@@ -0,0 +1,15 @@
>+--- 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
>
>Property changes on: java/openjdk12/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 250270: 218660 | 218661 | 218662 | 218663