Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/runtime/arguments.cpp	Wed Jan 08 08:34:02 2014 +0100
     1.2 +++ b/src/share/vm/runtime/arguments.cpp	Tue Oct 14 12:09:33 2014 -0400
     1.3 @@ -3617,6 +3617,8 @@
     1.4    bool settings_file_specified = false;
     1.5    bool needs_hotspotrc_warning = false;
     1.6  
     1.7 +  ArgumentsExt::process_options(args);
     1.8 +
     1.9    const char* flags_file;
    1.10    int index;
    1.11    for (index = 0; index < args->nOptions; index++) {

     2.1 --- a/src/share/vm/runtime/arguments_ext.hpp	Wed Jan 08 08:34:02 2014 +0100
     2.2 +++ b/src/share/vm/runtime/arguments_ext.hpp	Tue Oct 14 12:09:33 2014 -0400
     2.3 @@ -34,6 +34,7 @@
     2.4    static inline bool check_gc_consistency_user();
     2.5    static inline bool check_gc_consistency_ergo();
     2.6    static inline bool check_vm_args_consistency();
     2.7 +  static        void process_options(const JavaVMInitArgs* args) {}
     2.8  };
     2.9  
    2.10  void ArgumentsExt::select_gc_ergonomically() {

     3.1 --- a/src/share/vm/runtime/globals.cpp	Wed Jan 08 08:34:02 2014 +0100
     3.2 +++ b/src/share/vm/runtime/globals.cpp	Tue Oct 14 12:09:33 2014 -0400
     3.3 @@ -243,6 +243,11 @@
     3.4    return is_unlocked_ext();
     3.5  }
     3.6  
     3.7 +void Flag::unlock_diagnostic() {
     3.8 +  assert(is_diagnostic(), "sanity");
     3.9 +  _flags = Flags(_flags & ~KIND_DIAGNOSTIC);
    3.10 +}
    3.11 +
    3.12  // Get custom message for this locked flag, or return NULL if
    3.13  // none is available.
    3.14  void Flag::get_locked_message(char* buf, int buflen) const {

     4.1 --- a/src/share/vm/runtime/globals.hpp	Wed Jan 08 08:34:02 2014 +0100
     4.2 +++ b/src/share/vm/runtime/globals.hpp	Tue Oct 14 12:09:33 2014 -0400
     4.3 @@ -313,6 +313,8 @@
     4.4    bool is_writeable_ext() const;
     4.5    bool is_external_ext() const;
     4.6  
     4.7 +  void unlock_diagnostic();
     4.8 +
     4.9    void get_locked_message(char*, int) const;
    4.10    void get_locked_message_ext(char*, int) const;
    4.11