--- old/make/excludeSrc.make	2015-05-12 11:21:07.189282790 +0200
+++ new/make/excludeSrc.make	2015-05-12 11:21:07.028276020 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, 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
@@ -81,23 +81,33 @@
       CXXFLAGS += -DINCLUDE_ALL_GCS=0
       CFLAGS += -DINCLUDE_ALL_GCS=0
 
-      gc_impl := $(HS_COMMON_SRC)/share/vm/gc_implementation
-      gc_impl_alt := $(HS_ALT_SRC)/share/vm/gc_implementation
-      gc_subdirs := concurrentMarkSweep g1 parallelScavenge parNew
+      gc_dir := $(HS_COMMON_SRC)/share/vm/gc
+      gc_dir_alt := $(HS_ALT_SRC)/share/vm/gc
+      gc_subdirs := cms g1 parallel
       gc_exclude := $(foreach gc,$(gc_subdirs),				\
-		     $(notdir $(wildcard $(gc_impl)/$(gc)/*.cpp))	\
-		     $(notdir $(wildcard $(gc_impl_alt)/$(gc)/*.cpp)))
+		     $(notdir $(wildcard $(gc_dir)/$(gc)/*.cpp))	\
+		     $(notdir $(wildcard $(gc_dir_alt)/$(gc)/*.cpp)))
       Src_Files_EXCLUDE += $(gc_exclude)
 
-      # Exclude everything in $(gc_impl)/shared except the files listed
+      # Exclude everything in $(gc_dir)/shared except the files listed
       # in $(gc_shared_keep).
-      gc_shared_all := $(notdir $(wildcard $(gc_impl)/shared/*.cpp))
+      gc_shared_all := $(notdir $(wildcard $(gc_dir)/shared/*.cpp))
       gc_shared_keep :=							\
 	adaptiveSizePolicy.cpp						\
 	ageTable.cpp							\
+	allocTracer.cpp							\
+	barrierSet.cpp							\
+	blockOffsetTable.cpp						\
+	cardGeneration.cpp						\
+	cardTableModRefBS.cpp						\
+	cardTableRS.cpp							\
+	collectedHeap.cpp						\
 	collectorCounters.cpp						\
+	collectorPolicy.cpp						\
 	cSpaceCounters.cpp						\
+	gcCause.cpp							\
 	gcId.cpp							\
+	gcLocker.cpp							\
 	gcPolicyCounters.cpp						\
 	gcStats.cpp							\
 	gcTimer.cpp							\
@@ -105,11 +115,23 @@
 	gcTraceSend.cpp							\
 	gcTraceTime.cpp							\
 	gcUtil.cpp							\
+	genCollectedHeap.cpp						\
+	generation.cpp							\
 	generationCounters.cpp						\
-	markSweep.cpp							\
+	generationSpec.cpp						\
+	genOopClosures.cpp						\
+	genRemSet.cpp							\
 	objectCountEventSender.cpp					\
+	referencePolicy.cpp						\
+	referenceProcessor.cpp						\
+	referenceProcessorStats.cpp					\
+	space.cpp							\
 	spaceDecorator.cpp						\
-	vmGCOperations.cpp
+	strongRootsScope.cpp						\
+	taskqueue.cpp							\
+	threadLocalAllocBuffer.cpp					\
+	vmGCOperations.cpp						\
+	workgroup.cpp
       Src_Files_EXCLUDE += $(filter-out $(gc_shared_keep),$(gc_shared_all))
 
       # src/share/vm/services