Mercurial > hg > openjdk > jigsaw > hotspot
changeset 4261:9c7d0948523f
Merge
| author | jprovino |
|---|---|
| date | Fri, 15 Feb 2013 14:42:37 -0500 |
| parents | 1605eef8e11e (current diff) cf9a2071eeac (diff) |
| children | 1ba18258caa4 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/excludeSrc.make Thu Feb 14 11:08:58 2013 -0500 +++ b/make/excludeSrc.make Fri Feb 15 14:42:37 2013 -0500 @@ -78,7 +78,7 @@ Src_Files_EXCLUDE += \ cmsAdaptiveSizePolicy.cpp cmsCollectorPolicy.cpp \ - cmsGCAdaptivePolicyCounters.cpp cmsLockVerifier.cpp cmsPermGen.cpp compactibleFreeListSpace.cpp \ + cmsGCAdaptivePolicyCounters.cpp cmsLockVerifier.cpp compactibleFreeListSpace.cpp \ concurrentMarkSweepGeneration.cpp concurrentMarkSweepThread.cpp \ freeChunk.cpp adaptiveFreeList.cpp promotionInfo.cpp vmCMSOperations.cpp collectionSetChooser.cpp \ concurrentG1Refine.cpp concurrentG1RefineThread.cpp concurrentMark.cpp concurrentMarkThread.cpp \ @@ -91,11 +91,11 @@ gcTaskManager.cpp gcTaskThread.cpp objectStartArray.cpp parallelScavengeHeap.cpp parMarkBitMap.cpp \ pcTasks.cpp psAdaptiveSizePolicy.cpp psCompactionManager.cpp psGCAdaptivePolicyCounters.cpp \ psGenerationCounters.cpp psMarkSweep.cpp psMarkSweepDecorator.cpp psOldGen.cpp psParallelCompact.cpp \ - psPermGen.cpp psPromotionLAB.cpp psPromotionManager.cpp psScavenge.cpp psTasks.cpp psVirtualspace.cpp \ + psPromotionLAB.cpp psPromotionManager.cpp psScavenge.cpp psTasks.cpp psVirtualspace.cpp \ psYoungGen.cpp vmPSOperations.cpp asParNewGeneration.cpp parCardTableModRefBS.cpp \ parGCAllocBuffer.cpp parNewGeneration.cpp mutableSpace.cpp gSpaceCounters.cpp allocationStats.cpp \ spaceCounters.cpp gcAdaptivePolicyCounters.cpp mutableNUMASpace.cpp immutableSpace.cpp \ - immutableSpace.cpp g1MemoryPool.cpp psMemoryPool.cpp yieldWorkingGroup.cpp g1Log.cpp + immutableSpace.cpp g1MemoryPool.cpp psMemoryPool.cpp yieldingWorkGroup.cpp g1Log.cpp endif ifeq ($(INCLUDE_NMT), false)
--- a/src/share/vm/utilities/yieldingWorkgroup.cpp Thu Feb 14 11:08:58 2013 -0500 +++ b/src/share/vm/utilities/yieldingWorkgroup.cpp Fri Feb 15 14:42:37 2013 -0500 @@ -24,9 +24,7 @@ #include "precompiled.hpp" #include "utilities/macros.hpp" -#if INCLUDE_ALL_GCS #include "utilities/yieldingWorkgroup.hpp" -#endif // INCLUDE_ALL_GCS // Forward declaration of classes declared here.