diff options
| author | andrew <unknown> | 2019-09-03 06:41:37 +0100 |
|---|---|---|
| committer | bell-sw <liberica@bell-sw.com> | 2019-10-23 16:22:27 +0300 |
| commit | e9a754db0d944b540d017b24e47145abeb40bf0a (patch) | |
| tree | 0c5d7899ac2ab9ddaa354e5984428bf55813956b | |
| parent | 807e718b7912681e89cb883923407b025f607417 (diff) | |
| download | jdk8u_hotspot-e9a754db0d944b540d017b24e47145abeb40bf0a.tar.gz | |
8141570: Fix Zero interpreter build for --disable-precompiled-headers
Summary: Prepare Zero build for backport of JDK-8062808.
Reviewed-by: sgehwolf
| -rw-r--r-- | make/linux/makefiles/zeroshark.make | 16 | ||||
| -rw-r--r-- | src/share/vm/runtime/java.cpp | 1 |
2 files changed, 12 insertions, 5 deletions
diff --git a/make/linux/makefiles/zeroshark.make b/make/linux/makefiles/zeroshark.make index 4480740e0..de1fcb353 100644 --- a/make/linux/makefiles/zeroshark.make +++ b/make/linux/makefiles/zeroshark.make @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. # Copyright 2007, 2008 Red Hat, Inc. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -25,8 +25,16 @@ # Setup common to Zero (non-Shark) and Shark versions of VM -# override this from the main file because some version of llvm do not like -Wundef -WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wunused-function -Wunused-value +# Some versions of llvm do not like -Wundef +ifeq ($(JVM_VARIANT_ZEROSHARK), true) + WARNING_FLAGS += -Wno-undef +endif +# Suppress some warning flags that are normally turned on for hotspot, +# because some of the zero code has not been updated accordingly. +WARNING_FLAGS += -Wno-return-type \ + -Wno-format-nonliteral -Wno-format-security \ + -Wno-maybe-uninitialized + # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to # the compiler so as to be able to produce optimized objects @@ -48,5 +56,3 @@ endif ifeq ($(ARCH_DATA_MODEL), 64) CFLAGS += -D_LP64=1 endif - -OPT_CFLAGS/compactingPermGenGen.o = -O1 diff --git a/src/share/vm/runtime/java.cpp b/src/share/vm/runtime/java.cpp index faec9bae9..721f74321 100644 --- a/src/share/vm/runtime/java.cpp +++ b/src/share/vm/runtime/java.cpp @@ -45,6 +45,7 @@ #include "runtime/arguments.hpp" #include "runtime/biasedLocking.hpp" #include "runtime/compilationPolicy.hpp" +#include "runtime/deoptimization.hpp" #include "runtime/fprofiler.hpp" #include "runtime/init.hpp" #include "runtime/interfaceSupport.hpp" |