diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-05-20 21:05:25 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-05-20 21:05:25 +0000 |
| commit | ce40d635b900299670113d51d9f4028a742aac60 (patch) | |
| tree | 70fdae593aee77409d6be9fd10b531084bff3830 /java/openjdk6/files/patch-set | |
| parent | - Update to 1.2.4 [1] (diff) | |
Fix build without precompiled headers and apply r384056 to java/openjdk6.
http://bugs.java.com/bugdatabase/view_bug.do?bug_id=7154517
Obtained from: OpenJDK project [1]
MFH: 2015Q2
Notes
Notes:
svn path=/head/; revision=386893
Diffstat (limited to 'java/openjdk6/files/patch-set')
| -rw-r--r-- | java/openjdk6/files/patch-set | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set index 48b18a0000d1..36f82d84bd80 100644 --- a/java/openjdk6/files/patch-set +++ b/java/openjdk6/files/patch-set @@ -2525,6 +2525,16 @@ #endif // PRODUCT } else { assert(_real_start_word == NULL && _real_end_word == NULL, "invariant"); +--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp ++++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp +@@ -25,6 +25,7 @@ + #ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP + #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP + ++#include "gc_implementation/parallelScavenge/psOldGen.hpp" + #include "gc_implementation/parallelScavenge/psPromotionManager.hpp" + #include "gc_implementation/parallelScavenge/psScavenge.hpp" + --- hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp +++ hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp @@ -144,9 +144,9 @@ |