Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/linux/makefiles/zeroshark.make	Thu Jul 11 09:26:04 2019 -0400
     1.2 +++ b/make/linux/makefiles/zeroshark.make	Tue Sep 03 06:41:37 2019 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
     1.7  # Copyright 2007, 2008 Red Hat, Inc.
     1.8  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.9  #
    1.10 @@ -25,8 +25,16 @@
    1.11  
    1.12  # Setup common to Zero (non-Shark) and Shark versions of VM
    1.13  
    1.14 -# override this from the main file because some version of llvm do not like -Wundef
    1.15 -WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wunused-function -Wunused-value
    1.16 +# Some versions of llvm do not like -Wundef
    1.17 +ifeq ($(JVM_VARIANT_ZEROSHARK), true)
    1.18 +  WARNING_FLAGS += -Wno-undef
    1.19 +endif
    1.20 +# Suppress some warning flags that are normally turned on for hotspot,
    1.21 +# because some of the zero code has not been updated accordingly.
    1.22 +WARNING_FLAGS += -Wno-return-type \
    1.23 +  -Wno-format-nonliteral -Wno-format-security \
    1.24 +  -Wno-maybe-uninitialized
    1.25 + 
    1.26  
    1.27  # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to
    1.28  # the compiler so as to be able to produce optimized objects
    1.29 @@ -48,5 +56,3 @@
    1.30  ifeq ($(ARCH_DATA_MODEL), 64)
    1.31    CFLAGS += -D_LP64=1
    1.32  endif
    1.33 -
    1.34 -OPT_CFLAGS/compactingPermGenGen.o = -O1

     2.1 --- a/src/share/vm/runtime/java.cpp	Thu Jul 11 09:26:04 2019 -0400
     2.2 +++ b/src/share/vm/runtime/java.cpp	Tue Sep 03 06:41:37 2019 +0100
     2.3 @@ -45,6 +45,7 @@
     2.4  #include "runtime/arguments.hpp"
     2.5  #include "runtime/biasedLocking.hpp"
     2.6  #include "runtime/compilationPolicy.hpp"
     2.7 +#include "runtime/deoptimization.hpp"
     2.8  #include "runtime/fprofiler.hpp"
     2.9  #include "runtime/init.hpp"
    2.10  #include "runtime/interfaceSupport.hpp"