diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2021-02-05 04:04:53 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2021-02-05 04:04:53 +0000 |
| commit | d9f4cebe4485ae50ef878b84324d66f234a4ceb3 (patch) | |
| tree | 2cedf71d9c2fcafba2a96204d9aedc4f5ed3f966 /java/openjdk12/files/patch-changeset-57994 | |
| parent | devel/lab: update to 0.19.0 (diff) | |
Fix build with Clang 11.
https://github.com/battleblow/openjdk-jdk12u/commit/9e8e504992f95cc36c6dcd6e6f57ac18b58e0db5
https://github.com/battleblow/openjdk-jdk12u/commit/c525150ace8816c503ccc618ea5559d06c99bbcb
https://github.com/battleblow/openjdk-jdk12u/commit/dc2d99a20d0eea8d79cb31960cb693b2a4a39a4b
PR: 250270
Notes
Notes:
svn path=/head/; revision=564084
Diffstat (limited to '')
| -rw-r--r-- | java/openjdk12/files/patch-changeset-57994 | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/java/openjdk12/files/patch-changeset-57994 b/java/openjdk12/files/patch-changeset-57994 new file mode 100644 index 000000000000..8e6dc348c532 --- /dev/null +++ b/java/openjdk12/files/patch-changeset-57994 @@ -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); + |