comparison src/cpu/x86/vm/assembler_x86.cpp @ 8001:db9981fd3124

8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS Summary: Rename INCLUDE_ALTERNATE_GCS to INCLUDE_ALL_GCS and replace SERIALGC with INCLUDE_ALL_GCS. Reviewed-by: coleenp, stefank
author jprovino
date Wed, 23 Jan 2013 13:02:39 -0500
parents 038dd2875b94
children 8391fdd36e1f
comparison
equal deleted inserted replaced
7619:46e60405583b 8001:db9981fd3124
34 #include "runtime/interfaceSupport.hpp" 34 #include "runtime/interfaceSupport.hpp"
35 #include "runtime/objectMonitor.hpp" 35 #include "runtime/objectMonitor.hpp"
36 #include "runtime/os.hpp" 36 #include "runtime/os.hpp"
37 #include "runtime/sharedRuntime.hpp" 37 #include "runtime/sharedRuntime.hpp"
38 #include "runtime/stubRoutines.hpp" 38 #include "runtime/stubRoutines.hpp"
39 #ifndef SERIALGC 39 #include "utilities/macros.hpp"
40 #if INCLUDE_ALL_GCS
40 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 41 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
41 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" 42 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
42 #include "gc_implementation/g1/heapRegion.hpp" 43 #include "gc_implementation/g1/heapRegion.hpp"
43 #endif 44 #endif // INCLUDE_ALL_GCS
44 45
45 #ifdef PRODUCT 46 #ifdef PRODUCT
46 #define BLOCK_COMMENT(str) /* nothing */ 47 #define BLOCK_COMMENT(str) /* nothing */
47 #define STOP(error) stop(error) 48 #define STOP(error) stop(error)
48 #else 49 #else