--- a/src/hotspot/share/runtime/init.cpp	Wed Sep 04 13:06:44 2019 +0200
+++ b/src/hotspot/share/runtime/init.cpp	Wed Sep 04 13:07:15 2019 +0200
@@ -62,7 +62,6 @@
 void compilationPolicy_init();
 void codeCache_init();
 void VM_Version_init();
-void os_init_globals();        // depends on VM_Version_init, before universe_init
 void stubRoutines_init1();
 jint universe_init();          // depends on codeCache_init and stubRoutines_init
 // depends on universe_init, must be before interpreter_init (currently only on SPARC)
@@ -114,7 +113,6 @@
   compilationPolicy_init();
   codeCache_init();
   VM_Version_init();
-  os_init_globals();
   stubRoutines_init1();
   jint status = universe_init();  // dependent on codeCache_init and
                                   // stubRoutines_init1 and metaspace_init.

--- a/src/hotspot/share/runtime/os.cpp	Wed Sep 04 13:06:44 2019 +0200
+++ b/src/hotspot/share/runtime/os.cpp	Wed Sep 04 13:07:15 2019 +0200
@@ -88,12 +88,6 @@
 
 DEBUG_ONLY(bool os::_mutex_init_done = false;)
 
-void os_init_globals() {
-  // Called from init_globals().
-  // See Threads::create_vm() in thread.cpp, and init.cpp.
-  os::init_globals();
-}
-
 static time_t get_timezone(const struct tm* time_struct) {
 #if defined(_ALLBSD_SOURCE)
   return time_struct->tm_gmtoff;

--- a/src/hotspot/share/runtime/os.hpp	Wed Sep 04 13:06:44 2019 +0200
+++ b/src/hotspot/share/runtime/os.hpp	Wed Sep 04 13:07:15 2019 +0200
@@ -167,9 +167,6 @@
                                                // before VM ergonomics processing.
   static jint init_2(void);                    // Called after command line parsing
                                                // and VM ergonomics processing
-  static void init_globals(void) {             // Called from init_globals() in init.cpp
-    init_globals_ext();
-  }
 
   // unset environment variable
   static bool unsetenv(const char* name);
@@ -832,9 +829,6 @@
   // support for mapping non-volatile memory using MAP_SYNC
   static bool supports_map_sync();
 
-  // Extensions
-#include "runtime/os_ext.hpp"
-
  public:
   class CrashProtectionCallback : public StackObj {
   public:

--- a/src/hotspot/share/runtime/os_ext.hpp	Wed Sep 04 13:06:44 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2011, 2019, 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.
- *
- * 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.
- *
- */
-
-#ifndef SHARE_RUNTIME_OS_EXT_HPP
-#define SHARE_RUNTIME_OS_EXT_HPP
-
-public:
-  static void init_globals_ext() {} // Run from init_globals().
-                                    // See os.hpp/cpp and init.cpp.
-
- private:
-
-#endif // SHARE_RUNTIME_OS_EXT_HPP