diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2021-02-05 04:06:54 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2021-02-05 04:06:54 +0000 |
| commit | 31ae652e5ff58a4158ac30f1edc43345bdd50833 (patch) | |
| tree | abeb12e0fd86d8807521abb7605e78e505c8d139 /java/openjdk14/files/patch-changeset-57994 | |
| parent | Fix build with Clang 11. (diff) | |
Fix build with Clang 11.
https://github.com/battleblow/jdk14u/commit/11c638e62d57229828810b7fbdd1bb143808d5a3
https://github.com/battleblow/jdk14u/commit/a01e80aa36522ce709ee301afac057f649a1c472
https://github.com/battleblow/jdk14u/commit/0874ad9af5058d3dc9381e7d80745b8a3b1c5b6d
PR: 250270
Notes
Notes:
svn path=/head/; revision=564085
Diffstat (limited to 'java/openjdk14/files/patch-changeset-57994')
| -rw-r--r-- | java/openjdk14/files/patch-changeset-57994 | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/java/openjdk14/files/patch-changeset-57994 b/java/openjdk14/files/patch-changeset-57994 new file mode 100644 index 000000000000..94ce2e99756b --- /dev/null +++ b/java/openjdk14/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, 2019, 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); + |