Mon, 28 Nov 2011 14:58:31 +0100
7116081: USE_PRECOMPILED_HEADER=0 triggers a single threaded build of the JVM
Summary: Changed the conditional to see if the precompiled header has been specified. Also, removed the unused PrecompiledOption.
Reviewed-by: dholmes, brutisso
1.1 --- a/make/bsd/makefiles/gcc.make Mon Nov 28 10:19:26 2011 +0100 1.2 +++ b/make/bsd/makefiles/gcc.make Mon Nov 28 14:58:31 2011 +0100 1.3 @@ -86,7 +86,6 @@ 1.4 ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0" 1.5 # Allow the user to turn off precompiled headers from the command line. 1.6 ifneq ($(USE_PRECOMPILED_HEADER),0) 1.7 -USE_PRECOMPILED_HEADER=1 1.8 PRECOMPILED_HEADER_DIR=. 1.9 PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled/precompiled.hpp 1.10 PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch 1.11 @@ -216,7 +215,7 @@ 1.12 endif 1.13 1.14 # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. 1.15 -ifneq ($(USE_PRECOMPILED_HEADER),1) 1.16 +ifeq ($(USE_PRECOMPILED_HEADER),0) 1.17 CFLAGS += -DDONT_USE_PRECOMPILED_HEADER 1.18 endif 1.19
2.1 --- a/make/bsd/makefiles/top.make Mon Nov 28 10:19:26 2011 +0100 2.2 +++ b/make/bsd/makefiles/top.make Mon Nov 28 14:58:31 2011 +0100 2.3 @@ -47,12 +47,10 @@ 2.4 Plat_File = $(Platform_file) 2.5 CDG = cd $(GENERATED); 2.6 2.7 -ifdef USE_PRECOMPILED_HEADER 2.8 -PrecompiledOption = -DUSE_PRECOMPILED_HEADER 2.9 -UpdatePCH = $(MAKE) -f vm.make $(PRECOMPILED_HEADER) $(MFLAGS) 2.10 +ifneq ($(USE_PRECOMPILED_HEADER),0) 2.11 +UpdatePCH = $(MAKE) -f vm.make $(PRECOMPILED_HEADER) $(MFLAGS) 2.12 else 2.13 -UpdatePCH = \# precompiled header is not used 2.14 -PrecompiledOption = 2.15 +UpdatePCH = \# precompiled header is not used 2.16 endif 2.17 2.18 Cached_plat = $(GENERATED)/platform.current
3.1 --- a/make/linux/makefiles/gcc.make Mon Nov 28 10:19:26 2011 +0100 3.2 +++ b/make/linux/makefiles/gcc.make Mon Nov 28 14:58:31 2011 +0100 3.3 @@ -50,7 +50,6 @@ 3.4 ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0" 3.5 # Allow the user to turn off precompiled headers from the command line. 3.6 ifneq ($(USE_PRECOMPILED_HEADER),0) 3.7 -USE_PRECOMPILED_HEADER=1 3.8 PRECOMPILED_HEADER_DIR=. 3.9 PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled/precompiled.hpp 3.10 PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch 3.11 @@ -165,7 +164,7 @@ 3.12 endif 3.13 3.14 # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. 3.15 -ifneq ($(USE_PRECOMPILED_HEADER),1) 3.16 +ifeq ($(USE_PRECOMPILED_HEADER),0) 3.17 CFLAGS += -DDONT_USE_PRECOMPILED_HEADER 3.18 endif 3.19
4.1 --- a/make/linux/makefiles/top.make Mon Nov 28 10:19:26 2011 +0100 4.2 +++ b/make/linux/makefiles/top.make Mon Nov 28 14:58:31 2011 +0100 4.3 @@ -47,12 +47,10 @@ 4.4 Plat_File = $(Platform_file) 4.5 CDG = cd $(GENERATED); 4.6 4.7 -ifdef USE_PRECOMPILED_HEADER 4.8 -PrecompiledOption = -DUSE_PRECOMPILED_HEADER 4.9 -UpdatePCH = $(MAKE) -f vm.make $(PRECOMPILED_HEADER) $(MFLAGS) 4.10 +ifneq ($(USE_PRECOMPILED_HEADER),0) 4.11 +UpdatePCH = $(MAKE) -f vm.make $(PRECOMPILED_HEADER) $(MFLAGS) 4.12 else 4.13 -UpdatePCH = \# precompiled header is not used 4.14 -PrecompiledOption = 4.15 +UpdatePCH = \# precompiled header is not used 4.16 endif 4.17 4.18 Cached_plat = $(GENERATED)/platform.current
5.1 --- a/make/solaris/makefiles/gcc.make Mon Nov 28 10:19:26 2011 +0100 5.2 +++ b/make/solaris/makefiles/gcc.make Mon Nov 28 14:58:31 2011 +0100 5.3 @@ -49,7 +49,6 @@ 5.4 ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0" 5.5 # Allow the user to turn off precompiled headers from the command line. 5.6 ifneq ($(USE_PRECOMPILED_HEADER),0) 5.7 -USE_PRECOMPILED_HEADER=1 5.8 PRECOMPILED_HEADER_DIR=. 5.9 PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled/precompiled.hpp 5.10 PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch 5.11 @@ -142,7 +141,7 @@ 5.12 endif 5.13 5.14 # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. 5.15 -ifneq ($(USE_PRECOMPILED_HEADER),1) 5.16 +ifeq ($(USE_PRECOMPILED_HEADER),0) 5.17 CFLAGS += -DDONT_USE_PRECOMPILED_HEADER 5.18 endif 5.19