mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-26 06:14:49 +02:00
6997456: Not possible to build just compiler2
Fix the compiler error. Allow to build just c2 specifying FORCE_TIERED=0 on the command line. Reviewed-by: never, kvn
This commit is contained in:
parent
b64a0fd5a4
commit
c3d3f0f262
4 changed files with 12 additions and 6 deletions
|
@ -62,7 +62,9 @@ endif
|
||||||
include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
|
include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
|
||||||
|
|
||||||
ifndef CC_INTERP
|
ifndef CC_INTERP
|
||||||
FORCE_TIERED=1
|
ifndef FORCE_TIERED
|
||||||
|
FORCE_TIERED=1
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef LP64
|
ifdef LP64
|
||||||
|
@ -254,7 +256,7 @@ $(SUBDIRS_TIERED): $(BUILDTREE_MAKE)
|
||||||
$(BUILDTREE) VARIANT=tiered
|
$(BUILDTREE) VARIANT=tiered
|
||||||
|
|
||||||
$(SUBDIRS_C2): $(BUILDTREE_MAKE)
|
$(SUBDIRS_C2): $(BUILDTREE_MAKE)
|
||||||
ifdef FORCE_TIERED
|
ifeq ($(FORCE_TIERED),1)
|
||||||
$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
|
$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
|
||||||
$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1
|
$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1
|
||||||
else
|
else
|
||||||
|
|
|
@ -53,7 +53,9 @@ endif
|
||||||
include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
|
include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
|
||||||
|
|
||||||
ifndef CC_INTERP
|
ifndef CC_INTERP
|
||||||
FORCE_TIERED=1
|
ifndef FORCE_TIERED
|
||||||
|
FORCE_TIERED=1
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef LP64
|
ifdef LP64
|
||||||
|
@ -210,7 +212,7 @@ $(SUBDIRS_TIERED): $(BUILDTREE_MAKE)
|
||||||
$(BUILDTREE) VARIANT=tiered
|
$(BUILDTREE) VARIANT=tiered
|
||||||
|
|
||||||
$(SUBDIRS_C2): $(BUILDTREE_MAKE)
|
$(SUBDIRS_C2): $(BUILDTREE_MAKE)
|
||||||
ifdef FORCE_TIERED
|
ifeq ($(FORCE_TIERED),1)
|
||||||
$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
|
$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
|
||||||
$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1
|
$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1
|
||||||
else
|
else
|
||||||
|
|
|
@ -74,9 +74,11 @@ BUILDARCH=ia64
|
||||||
|
|
||||||
!if "$(BUILDARCH)" != "ia64"
|
!if "$(BUILDARCH)" != "ia64"
|
||||||
!ifndef CC_INTERP
|
!ifndef CC_INTERP
|
||||||
|
!ifndef FORCE_TIERED
|
||||||
FORCE_TIERED=1
|
FORCE_TIERED=1
|
||||||
!endif
|
!endif
|
||||||
!endif
|
!endif
|
||||||
|
!endif
|
||||||
|
|
||||||
!if "$(BUILDARCH)" == "amd64"
|
!if "$(BUILDARCH)" == "amd64"
|
||||||
Platform_arch=x86
|
Platform_arch=x86
|
||||||
|
@ -100,7 +102,7 @@ VARIANT_TEXT=Core
|
||||||
!if "$(Variant)" == "compiler1"
|
!if "$(Variant)" == "compiler1"
|
||||||
VARIANT_TEXT=Client
|
VARIANT_TEXT=Client
|
||||||
!elseif "$(Variant)" == "compiler2"
|
!elseif "$(Variant)" == "compiler2"
|
||||||
!ifdef FORCE_TIERED
|
!if "$(FORCE_TIERED)" == "1"
|
||||||
VARIANT_TEXT=Server
|
VARIANT_TEXT=Server
|
||||||
realVariant=tiered
|
realVariant=tiered
|
||||||
!else
|
!else
|
||||||
|
|
|
@ -198,7 +198,7 @@ void print_statistics() {
|
||||||
if (CountCompiledCalls) {
|
if (CountCompiledCalls) {
|
||||||
print_method_invocation_histogram();
|
print_method_invocation_histogram();
|
||||||
}
|
}
|
||||||
if (ProfileInterpreter || C1UpdateMethodData) {
|
if (ProfileInterpreter COMPILER1_PRESENT(|| C1UpdateMethodData)) {
|
||||||
print_method_profiling_data();
|
print_method_profiling_data();
|
||||||
}
|
}
|
||||||
if (TimeCompiler) {
|
if (TimeCompiler) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue