# HG changeset patch
# User ysuenaga
# Date 1432906184 -32400
# Node ID 42c0a86317426cb787bebf4e289e4fed75f145e1
# Parent  62df92c92d331af70a173f068f79f25c76457b43
8081475: 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

diff -r 62df92c92d33 -r 42c0a8631742 make/linux/makefiles/dtrace.make
--- a/make/linux/makefiles/dtrace.make	Fri May 29 11:02:11 2015 +0200
+++ 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