comparison src/share/vm/runtime/vm_operations.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 6b2d8d20ecbd 78bbf4d43a14
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
1 /* 1 /*
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2014, 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.
37 #include "runtime/thread.inline.hpp" 37 #include "runtime/thread.inline.hpp"
38 #include "runtime/vm_operations.hpp" 38 #include "runtime/vm_operations.hpp"
39 #include "services/threadService.hpp" 39 #include "services/threadService.hpp"
40 #include "trace/tracing.hpp" 40 #include "trace/tracing.hpp"
41 41
42 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
43
42 #define VM_OP_NAME_INITIALIZE(name) #name, 44 #define VM_OP_NAME_INITIALIZE(name) #name,
43 45
44 const char* VM_Operation::_names[VM_Operation::VMOp_Terminating] = \ 46 const char* VM_Operation::_names[VM_Operation::VMOp_Terminating] = \
45 { VM_OPS_DO(VM_OP_NAME_INITIALIZE) }; 47 { VM_OPS_DO(VM_OP_NAME_INITIALIZE) };
46 48