changeset 6802:8e9e7fd8463e

8029304: JFR broken in 7u train for JDK Linux for ARM or OpenJDK Reviewed-by: collins, dholmes, tbell
author erikj
date Wed, 04 Dec 2013 09:45:05 -0800
parents e425ee7e2c58
children 923dd08818f3
files make/com/oracle/Makefile make/common/Release.gmk
diffstat 2 files changed, 5 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/make/com/oracle/Makefile	Wed Nov 27 11:22:01 2013 +0000
+++ b/make/com/oracle/Makefile	Wed Dec 04 09:45:05 2013 -0800
@@ -30,22 +30,8 @@
 #SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
 include $(BUILDDIR)/common/Defs.gmk
 
-JFR_SRCDIRS_EXIST := $(shell \
-  if [ -d $(CLOSED_SHARE_SRC)/native/oracle/jfr ] ; then \
-    echo true; \
-  else \
-    echo false; \
-  fi)
-
-JFR =
-ifndef OPENJDK
-  ifndef JAVASE_EMBEDDED
-    ifeq ($(JFR_SRCDIRS_EXIST), true)
-      ifneq (${ARCH},arm)
-        JFR = jfr
-      endif
-    endif
-  endif
+ifeq ($(BUILD_JFR), true)
+  JFR = jfr
 endif
 
 # build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds
--- a/make/common/Release.gmk	Wed Nov 27 11:22:01 2013 +0000
+++ b/make/common/Release.gmk	Wed Dec 04 09:45:05 2013 -0800
@@ -402,25 +402,9 @@
 	sun/tools/jinfo         \
 	sun/tools/jmap
 
-JFR_SRCDIRS_EXIST := $(shell \
-  if [ -d $(CLOSED_SHARE_SRC)/classes/com/oracle/jrockit/jfr ] ; then \
-   echo true; \
-  else \
-   echo false; \
-  fi)
-
-BUILD_JFR=
-ifndef OPENJDK
-ifndef JAVASE_EMBEDDED
-ifeq ($(JFR_SRCDIRS_EXIST), true)
-BUILD_JFR=true
-endif
-endif
-endif
-
 # classes that go into jfr.jar
 JFR_CLASSES_DIRS=
-ifdef BUILD_JFR
+ifeq ($(BUILD_JFR), true)
 JFR_CLASSES_DIRS= \
 	com/oracle/jrockit/jfr \
 	oracle/jrockit/jfr \
@@ -629,7 +613,7 @@
 	$(ECHO) "sun/tools/jstack/" >> $@
 	$(ECHO) "sun/tools/jinfo/" >> $@
 	$(ECHO) "sun/tools/jmap/" >> $@
-ifdef BUILD_JFR
+ifeq ($(BUILD_JFR), true)
 	$(ECHO) "com/oracle/jrockit/jfr/" >> $@
 	$(ECHO) "com/oracle/jrockit/jfr/client/" >> $@
 	$(ECHO) "com/oracle/jrockit/jfr/management/" >> $@
@@ -668,7 +652,7 @@
 
 # Create jfr.jar
 JFR_JAR=
-ifdef BUILD_JFR
+ifeq ($(BUILD_JFR), true)
 JFR_JAR=$(ABS_TEMPDIR)/jfr-orig.jar
 $(JFR_JAR): $(OTHER_JAR_MANIFEST_FILE)
 	$(prep-target)