提交 80fbeefd 编写于 作者: L lfoltan

8047382: hotspot build failed with gcc version Red Hat 4.4.6-4.

Summary: Removed the Solaris specific conditionalization for casting to void * within calls to HS_DTRACE_PROBE* to enable successful compilation with gcc Red Hat 4.4.6-4.
Reviewed-by: hseigel, stefank
上级 d17d0958
...@@ -110,7 +110,7 @@ HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__end, ...@@ -110,7 +110,7 @@ HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__end,
len = name->utf8_length(); \ len = name->utf8_length(); \
} \ } \
HS_DTRACE_PROBE4(hotspot, class__initialization__##type, \ HS_DTRACE_PROBE4(hotspot, class__initialization__##type, \
data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type); \ data, len, (void *)(clss)->class_loader(), thread_type); \
} }
#define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \ #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \
...@@ -123,7 +123,7 @@ HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__end, ...@@ -123,7 +123,7 @@ HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__end,
len = name->utf8_length(); \ len = name->utf8_length(); \
} \ } \
HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \ HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \
data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type, wait); \ data, len, (void *)(clss)->class_loader(), thread_type, wait); \
} }
#else /* USDT2 */ #else /* USDT2 */
......
/* /*
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -52,7 +52,7 @@ HS_DTRACE_PROBE_DECL4(hotspot, class__unloaded, char*, int, oop, bool); ...@@ -52,7 +52,7 @@ HS_DTRACE_PROBE_DECL4(hotspot, class__unloaded, char*, int, oop, bool);
len = name->utf8_length(); \ len = name->utf8_length(); \
} \ } \
HS_DTRACE_PROBE4(hotspot, class__##type, \ HS_DTRACE_PROBE4(hotspot, class__##type, \
data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), (shared)); \ data, len, (void *)(clss)->class_loader(), (shared)); \
} }
#else /* USDT2 */ #else /* USDT2 */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册