RFR: 8064580 and 8064581: Move INCLUDE_CDS and INCLUDE_ALL_GCS to the end of the include lists

Stefan Karlsson stefan.karlsson at oracle.com
Wed Nov 12 12:39:07 UTC 2014


Hi all,

Please, review the following two cleanup patches to move the conditional 
include lines to the end of the include lists. The patches also add 
missing macros.hpp includes, that are needed when the INCLUDE_* defines 
are used. There are also a few minor cleanups near some usages of 
INCLUDE_ALL_GCS.

  http://cr.openjdk.java.net/~stefank/8064580/webrev.01 - Fix INCLUDE_CDS
  http://cr.openjdk.java.net/~stefank/8064581/webrev.01 - Fix 
INCLUDE_ALL_GCS

Some background to the sort order, the INCLUDE_* defines and macros.hpp:

The include lines where inserted and sorted in the includeDB removal 
patch. As part of that patch all includes that were guarded by #ifndef 
were put at the end of the include list. See:
  http://hg.openjdk.java.net/jdk9/jdk9/hotspot/rev/f95d63e2154a - 
6989984: Use standard include model for Hospot

Later the selective inclusion of parts like, for example, CDS and the 
non-serial GCs were changed and now we also rely on the defines present 
in macros.hpp. With that change it's now important that all conditional 
includes are added after the inclusion of macros.hpp. See:
  http://hg.openjdk.java.net/jdk9/jdk9/hotspot/rev/fb19af007ffc - 
7189254: Change makefiles for more flexibility to override defaults

thanks,
StefanK


More information about the hotspot-dev mailing list