diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-11-20 04:37:20 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-11-20 04:37:20 +0000 |
| commit | bb0779699475b72a8d68d657c074a11c4f0a471d (patch) | |
| tree | 2be08f0d99ebd017b6e48d6a1d3be3fbd11511ea /java/openjdk8/files/patch-bsd | |
| parent | - Add license and cleanup patch file. (diff) | |
- Add an empty directory to plist to fix staging.
- Fix build for 8.x on amd64. [1]
- Use tar(1) to extract all distfiles. [2]
PR: 194988 [1]
Submitted by: Mikhail T. (mi at aldan dot algebra dot com) [2]
Notes
Notes:
svn path=/head/; revision=372834
Diffstat (limited to '')
| -rw-r--r-- | java/openjdk8/files/patch-bsd | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/java/openjdk8/files/patch-bsd b/java/openjdk8/files/patch-bsd index 968b6b09425e..2982ee0c218a 100644 --- a/java/openjdk8/files/patch-bsd +++ b/java/openjdk8/files/patch-bsd @@ -2780,6 +2780,17 @@ os::current_process_id(), os::current_process_id()); os::fork_and_exec(buf); +--- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2014-11-19 14:08:52.000000000 -0500 ++++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2014-11-19 14:10:18.000000000 -0500 +@@ -1242,7 +1242,7 @@ + // Helper backtrace functions to store bci|version together. + static inline int merge_bci_and_version(int bci, int version) { + // only store u2 for version, checking for overflow. +- if (version > USHRT_MAX || version < 0) version = MAX_VERSION; ++ if (version > (int)USHRT_MAX || version < 0) version = MAX_VERSION; + assert((jushort)bci == bci, "bci should be short"); + return build_int_from_shorts(version, bci); + } --- ./hotspot/src/share/vm/opto/node.cpp Mon Sep 08 12:35:01 2014 -0700 +++ ./hotspot/src/share/vm/opto/node.cpp Wed Nov 05 15:01:44 2014 -0800 @@ -286,6 +286,10 @@ |