src/share/vm/runtime/globals.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 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) 1997, 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.
*** 401,413 ****
  #endif
  
      st->cr();
  
    } else if (!is_bool() && !is_ccstr()) {
- 
-     if (printRanges) {
- 
        st->print("%9s %-50s ", _type, _name);
  
        CommandLineFlagRangeList::print(_name, st, true);
  
        st->print(" %-20s", " ");
--- 401,410 ----
*** 418,429 ****
          st->print("%s", _doc);
        }
  #endif
  
        st->cr();
- 
-     }
    }
  }
  
  void Flag::print_kind(outputStream* st) {
    struct Data {
--- 415,424 ----
*** 1253,1264 ****
    assert(Arguments::check_vm_args_consistency(), "Some flag settings conflict");
  }
  
  #endif // PRODUCT
  
- #define ONLY_PRINT_PRODUCT_FLAGS
- 
  void CommandLineFlags::printFlags(outputStream* out, bool withComments, bool printRanges) {
    // Print the flags sorted by name
    // note: this method is called before the thread structure is in place
    //       which means resource allocation cannot be used.
  
--- 1248,1257 ----
*** 1279,1291 ****
      out->print_cr("[Global flags ranges]");
    }
  
    for (size_t i = 0; i < length; i++) {
      if (array[i]->is_unlocked()) {
- #ifdef ONLY_PRINT_PRODUCT_FLAGS
-       if (!array[i]->is_notproduct() && !array[i]->is_develop())
- #endif // ONLY_PRINT_PRODUCT_FLAGS
        array[i]->print_on(out, withComments, printRanges);
      }
    }
    FREE_C_HEAP_ARRAY(Flag*, array);
  }
--- 1272,1281 ----