Mercurial > hg > truffle
comparison src/share/vm/prims/jvmtiEventController.cpp @ 17937:78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
8043029: Change 8037816 breaks HS build with older GCC versions which don't support diagnostic pragmas
8043164: Format warning in traceStream.hpp
Summary: Backport of main fix + two corrections, enables clang compilation, turns on format attributes, corrects/mutes warnings
Reviewed-by: kvn, coleenp, iveresov, twisti
author | drchase |
---|---|
date | Thu, 22 May 2014 15:52:41 -0400 |
parents | 55fb97c4c58d |
children | 52b4284cb496 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2003, 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. |
35 #include "runtime/thread.hpp" | 35 #include "runtime/thread.hpp" |
36 #include "runtime/vframe.hpp" | 36 #include "runtime/vframe.hpp" |
37 #include "runtime/vframe_hp.hpp" | 37 #include "runtime/vframe_hp.hpp" |
38 #include "runtime/vmThread.hpp" | 38 #include "runtime/vmThread.hpp" |
39 #include "runtime/vm_operations.hpp" | 39 #include "runtime/vm_operations.hpp" |
40 | |
41 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
40 | 42 |
41 #ifdef JVMTI_TRACE | 43 #ifdef JVMTI_TRACE |
42 #define EC_TRACE(out) do { \ | 44 #define EC_TRACE(out) do { \ |
43 if (JvmtiTrace::trace_event_controller()) { \ | 45 if (JvmtiTrace::trace_event_controller()) { \ |
44 SafeResourceMark rm; \ | 46 SafeResourceMark rm; \ |