src/share/vm/runtime/globals_extension.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2015, Oracle and/or its affiliates. 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2016, Oracle and/or its affiliates. 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.
*** 288,297 ****
--- 288,303 ----
  
  #define FLAG_SET_DEFAULT(name, value) ((name) = (value))
  
  #define FLAG_SET_CMDLINE(type, name, value) (CommandLineFlagsEx::type##AtPut(FLAG_MEMBER_WITH_TYPE(name,type), (type)(value), Flag::COMMAND_LINE))
  #define FLAG_SET_ERGO(type, name, value)    (CommandLineFlagsEx::type##AtPut(FLAG_MEMBER_WITH_TYPE(name,type), (type)(value), Flag::ERGONOMIC))
+ #define FLAG_SET_ERGO_IF_DEFAULT(type, name, value) \
+   do {                                              \
+     if (FLAG_IS_DEFAULT(name)) {                    \
+       FLAG_SET_ERGO(type, name, value);             \
+     }                                               \
+   } while (0)
  
  // Can't put the following in CommandLineFlags because
  // of a circular dependency on the enum definition.
  class CommandLineFlagsEx : CommandLineFlags {
   public: