# HG changeset patch # User lfoltan # Date 1429189413 14400 # Node ID 6f31df24cec0c61e78510ec956439ab9bfb55df7 # Parent 713dfbf84b10d3f7db87a279cb3424e7616b2e51 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 diff -r 713dfbf84b10 -r 6f31df24cec0 src/share/vm/oops/instanceKlass.cpp --- a/src/share/vm/oops/instanceKlass.cpp Fri Jan 16 09:40:13 2015 +0100 +++ b/src/share/vm/oops/instanceKlass.cpp Thu Apr 16 09:03:33 2015 -0400 @@ -110,7 +110,7 @@ len = name->utf8_length(); \ } \ 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) \ @@ -123,7 +123,7 @@ len = name->utf8_length(); \ } \ 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 */ diff -r 713dfbf84b10 -r 6f31df24cec0 src/share/vm/services/classLoadingService.cpp --- a/src/share/vm/services/classLoadingService.cpp Fri Jan 16 09:40:13 2015 +0100 +++ b/src/share/vm/services/classLoadingService.cpp Thu Apr 16 09:03:33 2015 -0400 @@ -1,5 +1,5 @@ /* - * 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. * * This code is free software; you can redistribute it and/or modify it @@ -52,7 +52,7 @@ len = name->utf8_length(); \ } \ HS_DTRACE_PROBE4(hotspot, class__##type, \ - data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), (shared)); \ + data, len, (void *)(clss)->class_loader(), (shared)); \ } #else /* USDT2 */