From ce40d635b900299670113d51d9f4028a742aac60 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Wed, 20 May 2015 21:05:25 +0000 Subject: 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 --- java/openjdk6/files/patch-set | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'java/openjdk6/files/patch-set') 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 @@ -- cgit v1.2.3