--- a/src/hotspot/share/gc/epsilon/epsilon_globals.cpp Thu Apr 26 18:46:01 2018 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, Red Hat, Inc. 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "gc/epsilon/epsilon_globals.hpp"
-
-EPSILON_FLAGS(MATERIALIZE_DEVELOPER_FLAG, \
- MATERIALIZE_PD_DEVELOPER_FLAG, \
- MATERIALIZE_PRODUCT_FLAG, \
- MATERIALIZE_PD_PRODUCT_FLAG, \
- MATERIALIZE_DIAGNOSTIC_FLAG, \
- MATERIALIZE_PD_DIAGNOSTIC_FLAG, \
- MATERIALIZE_EXPERIMENTAL_FLAG, \
- MATERIALIZE_NOTPRODUCT_FLAG, \
- MATERIALIZE_MANAGEABLE_FLAG, \
- MATERIALIZE_PRODUCT_RW_FLAG, \
- IGNORE_RANGE, \
- IGNORE_CONSTRAINT, \
- IGNORE_WRITEABLE)
--- a/src/hotspot/share/gc/epsilon/epsilon_globals.hpp Thu Apr 26 18:46:01 2018 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilon_globals.hpp Thu Apr 26 18:55:05 2018 +0200
@@ -30,19 +30,20 @@
// Defines all globals flags used by the Epsilon GC.
//
-#define EPSILON_FLAGS(develop, \
- develop_pd, \
- product, \
- product_pd, \
- diagnostic, \
- diagnostic_pd, \
- experimental, \
- notproduct, \
- manageable, \
- product_rw, \
- range, \
- constraint, \
- writeable) \
+#define GC_EPSILON_FLAGS(develop, \
+ develop_pd, \
+ product, \
+ product_pd, \
+ diagnostic, \
+ diagnostic_pd, \
+ experimental, \
+ notproduct, \
+ manageable, \
+ product_rw, \
+ lp64_product, \
+ range, \
+ constraint, \
+ writeable) \
\
experimental(size_t, EpsilonPrintHeapStep, 100, \
"Print heap occupancy stats with this number of steps. " \
@@ -66,18 +67,4 @@
"at the potential expense of memory waste.") \
range(1, max_intx)
-EPSILON_FLAGS(DECLARE_DEVELOPER_FLAG, \
- DECLARE_PD_DEVELOPER_FLAG, \
- DECLARE_PRODUCT_FLAG, \
- DECLARE_PD_PRODUCT_FLAG, \
- DECLARE_DIAGNOSTIC_FLAG, \
- DECLARE_PD_DIAGNOSTIC_FLAG, \
- DECLARE_EXPERIMENTAL_FLAG, \
- DECLARE_NOTPRODUCT_FLAG, \
- DECLARE_MANAGEABLE_FLAG, \
- DECLARE_PRODUCT_RW_FLAG, \
- IGNORE_RANGE, \
- IGNORE_CONSTRAINT, \
- IGNORE_WRITEABLE)
-
#endif // SHARE_VM_GC_EPSILON_GLOBALS_HPP
--- a/src/hotspot/share/gc/shared/gc_globals.hpp Thu Apr 26 18:46:01 2018 +0200
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp Thu Apr 26 18:55:05 2018 +0200
@@ -29,6 +29,7 @@
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
#include "gc/cms/cms_globals.hpp"
+#include "gc/epsilon/epsilon_globals.hpp"
#include "gc/g1/g1_globals.hpp"
#include "gc/parallel/parallel_globals.hpp"
#endif
@@ -64,6 +65,22 @@
constraint, \
writeable)) \
\
+ ALL_GCS_ONLY(GC_EPSILON_FLAGS( \
+ develop, \
+ develop_pd, \
+ product, \
+ product_pd, \
+ diagnostic, \
+ diagnostic_pd, \
+ experimental, \
+ notproduct, \
+ manageable, \
+ product_rw, \
+ lp64_product, \
+ range, \
+ constraint, \
+ writeable)) \
+ \
ALL_GCS_ONLY(GC_G1_FLAGS( \
develop, \
develop_pd, \