Merge pull request #3253 from 0dvictor/spec

Move Concurrent Scavenge to x86-64_cmprssptrs spec
eclipse-openj9 · Oct 15, 2018 · d8a1d7e · d8a1d7e
2 parents b03cae1 + bd8814b
commit d8a1d7e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 267 deletions.
diff --git a/buildspecs/linux_x86-64_cmprssptrs_cs.spec b/buildspecs/linux_x86-64_cmprssptrs_cs.spec
diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_x86.mk b/runtime/gc_glue_java/configure_includes/configure_linux_x86.mk
@@ -37,6 +37,7 @@ ifeq (linux_x86-64_cmprssptrs, $(SPEC))
 		--enable-OMR_GC_COMPRESSED_POINTERS \
 		--enable-OMR_GC_IDLE_HEAP_MANAGER \
 		--enable-OMR_GC_TLH_PREFETCH_FTA \
+		--enable-OMR_GC_CONCURRENT_SCAVENGER \
 		--enable-OMR_INTERP_COMPRESSED_OBJECT_HEADER \
 		--enable-OMR_INTERP_SMALL_MONITOR_SLOT \
 		--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
@@ -117,21 +118,6 @@ ifeq (linux_x86-64_cmprssptrs_purec, $(SPEC))
 		--enable-OMR_PORT_NUMA_SUPPORT
 endif
 
-ifeq (linux_x86-64_cmprssptrs_cs, $(SPEC))
-	CONFIGURE_ARGS += \
-		--enable-OMRTHREAD_LIB_UNIX \
-		--enable-OMR_ARCH_X86 \
-		--enable-OMR_ENV_DATA64 \
-		--enable-OMR_ENV_LITTLE_ENDIAN \
-		--enable-OMR_GC_COMPRESSED_POINTERS \
-		--enable-OMR_GC_TLH_PREFETCH_FTA \
-		--enable-OMR_GC_CONCURRENT_SCAVENGER \
-		--enable-OMR_INTERP_COMPRESSED_OBJECT_HEADER \
-		--enable-OMR_INTERP_SMALL_MONITOR_SLOT \
-		--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
-		--enable-OMR_PORT_NUMA_SUPPORT
-endif
-
 ifeq (linux_x86-64_purec, $(SPEC))
 	CONFIGURE_ARGS += \
 		--enable-OMRTHREAD_LIB_UNIX \