--- old/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp	2018-04-05 23:15:27.626044344 +0200
+++ new/src/hotspot/cpu/sparc/memset_with_concurrent_readers_sparc.cpp	2018-04-05 23:15:27.414044351 +0200
@@ -31,8 +31,6 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 
-#if INCLUDE_ALL_GCS
-
 // An implementation of memset, for use when there may be concurrent
 // readers of the region being stored into.
 //
@@ -156,5 +154,3 @@
   // Fill any partial word suffix.  Also the prefix if size < BytesPerWord.
   fill_subword(to, end, value);
 }
-
-#endif // INCLUDE_ALL_GCS
--- old/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp	2018-04-05 23:15:27.974044332 +0200
+++ new/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp	2018-04-05 23:15:27.762044339 +0200
@@ -30,9 +30,6 @@
 #include <stddef.h>
 #include <string.h>
 
-// Only used by concurrent collectors.
-#if INCLUDE_ALL_GCS
-
 // Fill a block of memory with value, like memset, but with the
 // understanding that there may be concurrent readers of that memory.
 void memset_with_concurrent_readers(void* to, int value, size_t size);
@@ -50,6 +47,4 @@
 
 #endif // End of target dispatch.
 
-#endif // INCLUDE_ALL_GCS
-
 #endif // SRC_SHARE_VM_GC_SHARED_MEMSETWITHCONCURRENTREADERS_HPP