comparison src/share/vm/runtime/init.cpp @ 12057:58fc8e2b7b6d

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 10 Oct 2013 17:22:25 +0200
parents b9a918201d47 740e263c80c6
children 7848fc12602b
comparison
equal deleted inserted replaced
12041:7e5cf369559f 12057:58fc8e2b7b6d
1 /* 1 /*
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
93 jint init_globals() { 93 jint init_globals() {
94 HandleMark hm; 94 HandleMark hm;
95 management_init(); 95 management_init();
96 bytecodes_init(); 96 bytecodes_init();
97 classLoader_init(); 97 classLoader_init();
98 Metaspace::global_initialize(); // must be before codeCache
99 codeCache_init(); 98 codeCache_init();
100 VM_Version_init(); 99 VM_Version_init();
101 os_init_globals(); 100 os_init_globals();
102 stubRoutines_init1(); 101 stubRoutines_init1();
103 jint status = universe_init(); // dependent on codeCache_init and 102 jint status = universe_init(); // dependent on codeCache_init and