Mercurial > hg > truffle
comparison src/share/vm/code/nmethod.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 | e0a77b91da68 |
children | 52b4284cb496 fd81a5764900 |
comparison
equal
deleted
inserted
replaced
17935:7384f6a12fc1 | 17937:78bbf4d43a14 |
---|---|
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. |
43 #include "utilities/events.hpp" | 43 #include "utilities/events.hpp" |
44 #include "utilities/xmlstream.hpp" | 44 #include "utilities/xmlstream.hpp" |
45 #ifdef SHARK | 45 #ifdef SHARK |
46 #include "shark/sharkCompiler.hpp" | 46 #include "shark/sharkCompiler.hpp" |
47 #endif | 47 #endif |
48 | |
49 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
48 | 50 |
49 #ifdef DTRACE_ENABLED | 51 #ifdef DTRACE_ENABLED |
50 | 52 |
51 // Only bother with this argument setup if dtrace is available | 53 // Only bother with this argument setup if dtrace is available |
52 | 54 |