Mercurial > hg > arm32-8

changeset 7346:6f31df24cec0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author lfoltan
date Thu, 16 Apr 2015 09:03:33 -0400
parents 713dfbf84b10
children 4390345de45c
files src/share/vm/oops/instanceKlass.cpp src/share/vm/services/classLoadingService.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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 */
 
--- 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 */