changeset 5840:a694d681dba7 icedtea-2.5.6pre02

8081475, PR2494: SystemTap does not work when JDK is compiled with GCC 5 Summary: libjvm.so which is generated by GCC 5 does not have .note.stapsdt section as dtrace was disabled due to incorrect version check Reviewed-by: dholmes, coleenp
author ysuenaga
date Fri, 29 May 2015 22:29:44 +0900
parents dd477b47d006
children 73fd325ff54e
files make/linux/makefiles/dtrace.make
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/linux/makefiles/dtrace.make	Mon Jul 06 11:59:14 2015 +0100
+++ b/make/linux/makefiles/dtrace.make	Fri May 29 22:29:44 2015 +0900
@@ -31,8 +31,8 @@
 REASON = "This JDK does not support SDT probes"
 else
 
-# We need a recent GCC for the default
-ifeq "$(shell expr \( $(CC_VER_MAJOR) \>= 4 \) \& \( $(CC_VER_MINOR) \>= 4 \) )" "0"
+# We need a recent GCC for the default (4.4 or later)
+ifeq "$(shell expr \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 4 \) \) \| \( $(CC_VER_MAJOR) \>= 5 \) )" "0"
 REASON = "gcc version is too old"
 else