Fri, 28 Aug 2020 07:38:21 +0100
8251120: [8u] HotSpot build assumes ENABLE_JFR is set to either true or false
Summary: Only test for ENABLE_JFR being true, and assume undefined == false
Reviewed-by: neugens
1.1 --- a/make/aix/makefiles/buildtree.make Fri Aug 28 07:32:38 2020 +0100 1.2 +++ b/make/aix/makefiles/buildtree.make Fri Aug 28 07:38:21 2020 +0100 1.3 @@ -111,7 +111,7 @@ 1.4 endif 1.5 endif 1.6 1.7 -ifeq ($(ENABLE_JFR),false) 1.8 +ifneq ($(ENABLE_JFR),true) 1.9 ALWAYS_EXCLUDE_DIRS += -o -name jfr 1.10 endif 1.11
2.1 --- a/make/aix/makefiles/vm.make Fri Aug 28 07:32:38 2020 +0100 2.2 +++ b/make/aix/makefiles/vm.make Fri Aug 28 07:38:21 2020 +0100 2.3 @@ -147,7 +147,7 @@ 2.4 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo 2.5 LIBJVM_DIZ = lib$(JVM).diz 2.6 2.7 -ifeq ($(ENABLE_JFR),false) 2.8 +ifneq ($(ENABLE_JFR),true) 2.9 EXCLUDE_JFR_PATHS:= -o -name jfr -prune 2.10 endif 2.11
3.1 --- a/make/bsd/makefiles/buildtree.make Fri Aug 28 07:32:38 2020 +0100 3.2 +++ b/make/bsd/makefiles/buildtree.make Fri Aug 28 07:38:21 2020 +0100 3.3 @@ -113,7 +113,7 @@ 3.4 endif 3.5 endif 3.6 3.7 -ifeq ($(ENABLE_JFR),false) 3.8 +ifneq ($(ENABLE_JFR),true) 3.9 ALWAYS_EXCLUDE_DIRS += -o -name jfr 3.10 endif 3.11
4.1 --- a/make/bsd/makefiles/vm.make Fri Aug 28 07:32:38 2020 +0100 4.2 +++ b/make/bsd/makefiles/vm.make Fri Aug 28 07:38:21 2020 +0100 4.3 @@ -165,7 +165,7 @@ 4.4 LIBJVM_DIZ = lib$(JVM).diz 4.5 endif 4.6 4.7 -ifeq ($(ENABLE_JFR),false) 4.8 +ifneq ($(ENABLE_JFR),true) 4.9 EXCLUDE_JFR_PATHS:= -o -name jfr -prune 4.10 endif 4.11 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
5.1 --- a/make/linux/makefiles/buildtree.make Fri Aug 28 07:32:38 2020 +0100 5.2 +++ b/make/linux/makefiles/buildtree.make Fri Aug 28 07:38:21 2020 +0100 5.3 @@ -112,7 +112,7 @@ 5.4 endif 5.5 endif 5.6 5.7 -ifeq ($(ENABLE_JFR),false) 5.8 +ifneq ($(ENABLE_JFR),true) 5.9 ALWAYS_EXCLUDE_DIRS += -o -name jfr 5.10 endif 5.11
6.1 --- a/make/linux/makefiles/vm.make Fri Aug 28 07:32:38 2020 +0100 6.2 +++ b/make/linux/makefiles/vm.make Fri Aug 28 07:38:21 2020 +0100 6.3 @@ -150,7 +150,7 @@ 6.4 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo 6.5 LIBJVM_DIZ = lib$(JVM).diz 6.6 6.7 -ifeq ($(ENABLE_JFR),false) 6.8 +ifneq ($(ENABLE_JFR),true) 6.9 EXCLUDE_JFR_PATHS:= -o -name jfr -prune 6.10 endif 6.11 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
7.1 --- a/make/solaris/makefiles/buildtree.make Fri Aug 28 07:32:38 2020 +0100 7.2 +++ b/make/solaris/makefiles/buildtree.make Fri Aug 28 07:38:21 2020 +0100 7.3 @@ -103,7 +103,7 @@ 7.4 endif 7.5 endif 7.6 7.7 -ifeq ($(ENABLE_JFR),false) 7.8 +ifneq ($(ENABLE_JFR),true) 7.9 ALWAYS_EXCLUDE_DIRS += -o -name jfr 7.10 endif 7.11
8.1 --- a/make/solaris/makefiles/vm.make Fri Aug 28 07:32:38 2020 +0100 8.2 +++ b/make/solaris/makefiles/vm.make Fri Aug 28 07:38:21 2020 +0100 8.3 @@ -164,7 +164,7 @@ 8.4 8.5 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo 8.6 LIBJVM_DIZ = lib$(JVM).diz 8.7 -ifeq ($(ENABLE_JFR),false) 8.8 +ifneq ($(ENABLE_JFR),true) 8.9 EXCLUDE_JFR_PATHS:= -o -name jfr -prune 8.10 endif 8.11 SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt