Mercurial > hg > jdk9-shenandoah > hotspot
changeset 9696:c030d25ae04e
8134898: Small fixes found during JVMCI work
Summary: Removed jre/ from jdk paths in makefiles. Add Thread::_unhandled_oops field for debug and fastdebug builds. Fix doc.
Reviewed-by: coleenp, bdelsart
| author | kvn |
|---|---|
| date | Wed, 02 Sep 2015 11:03:20 -0700 |
| parents | da1c9ea76ce5 |
| children | 82b61ad9f45f |
| files | make/Makefile make/bsd/makefiles/vm.make make/build.sh make/hotspot.script make/solaris/makefiles/buildtree.make make/solaris/makefiles/vm.make src/share/vm/adlc/Doc/Syntax.doc src/share/vm/runtime/thread.hpp |
| diffstat | 8 files changed, 19 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Makefile Wed Sep 02 13:23:59 2015 +0000 +++ b/make/Makefile Wed Sep 02 11:03:20 2015 -0700 @@ -633,9 +633,9 @@ update_jdk: export_product_jdk export_fastdebug_jdk test_jdk -copy_jdk: $(JDK_IMAGE_DIR)/jre/lib/rt.jar +copy_jdk: $(JDK_IMAGE_DIR)/bin/java -$(JDK_IMAGE_DIR)/jre/lib/rt.jar: +$(JDK_IMAGE_DIR)/bin/java: $(RM) -r $(JDK_IMAGE_DIR) $(MKDIR) -p $(JDK_IMAGE_DIR) ($(CD) $(JDK_IMPORT_PATH) && \
--- a/make/bsd/makefiles/vm.make Wed Sep 02 13:23:59 2015 +0000 +++ b/make/bsd/makefiles/vm.make Wed Sep 02 11:03:20 2015 -0700 @@ -131,7 +131,7 @@ # By default, link the *.o into the library, not the executable. LINK_INTO$(LINK_INTO) = LIBJVM -JDK_LIBDIR = $(JAVA_HOME)/jre/lib/$(LIBARCH) +JDK_LIBDIR = $(JAVA_HOME)/lib/$(LIBARCH) #---------------------------------------------------------------------- # jvm_db & dtrace
--- a/make/build.sh Wed Sep 02 13:23:59 2015 +0000 +++ b/make/build.sh Wed Sep 02 11:03:20 2015 -0700 @@ -49,7 +49,7 @@ # Just in case: JAVA_HOME=`( cd $JAVA_HOME; pwd )` -if [ "${ALT_BOOTDIR-}" = "" -o ! -d "${ALT_BOOTDIR-}" -o ! -d ${ALT_BOOTDIR-}/jre/lib/ ]; then +if [ "${ALT_BOOTDIR-}" = "" -o ! -d "${ALT_BOOTDIR-}" -o ! -d ${ALT_BOOTDIR-}/lib/ ]; then ALT_BOOTDIR=${JAVA_HOME} fi
--- a/make/hotspot.script Wed Sep 02 13:23:59 2015 +0000 +++ b/make/hotspot.script Wed Sep 02 11:03:20 2015 -0700 @@ -127,7 +127,7 @@ # o $JRE/lib/$ARCH # followed by the user's previous effective LD_LIBRARY_PATH, if # any. -JRE=$JDK/jre +JRE=$JDK JAVA_HOME=$JDK export JAVA_HOME
--- a/make/solaris/makefiles/buildtree.make Wed Sep 02 13:23:59 2015 +0000 +++ b/make/solaris/makefiles/buildtree.make Wed Sep 02 11:03:20 2015 -0700 @@ -270,6 +270,7 @@ echo "CP ?= cp"; \ echo "MV ?= mv"; \ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \ + echo "include \$$(GAMMADIR)/make/excludeSrc.make"; \ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \ ) > $@
--- a/make/solaris/makefiles/vm.make Wed Sep 02 13:23:59 2015 +0000 +++ b/make/solaris/makefiles/vm.make Wed Sep 02 11:03:20 2015 -0700 @@ -197,7 +197,7 @@ Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) Src_Dirs/ZERO := $(CORE_PATHS) -Src_Dirs/SHARK := $(CORE_PATHS) +Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) Src_Dirs := $(Src_Dirs/$(TYPE)) COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\* @@ -206,7 +206,7 @@ ZERO_SPECIFIC_FILES := zero # Always exclude these. -Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp +Src_Files_EXCLUDE += dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp # Exclude per type. Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
--- a/src/share/vm/adlc/Doc/Syntax.doc Wed Sep 02 13:23:59 2015 +0000 +++ b/src/share/vm/adlc/Doc/Syntax.doc Wed Sep 02 11:03:20 2015 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ the architecture of a processor, and is the input to the ADL Compiler. The ADL Compiler compiles an ADL file into code which is incorporated into the Optimizing Just In Time Compiler (OJIT) to generate efficient and correct code -for the target architecture. The ADL describes three bassic different types +for the target architecture. The ADL describes three basic different types of architectural features. It describes the instruction set (and associated operands) of the target architecture. It describes the register set of the target architecture along with relevant information for the register allocator.
--- a/src/share/vm/runtime/thread.hpp Wed Sep 02 13:23:59 2015 +0000 +++ b/src/share/vm/runtime/thread.hpp Wed Sep 02 11:03:20 2015 -0700 @@ -368,9 +368,17 @@ inline void clear_critical_native_unlock(); // Support for Unhandled Oop detection + // Add the field for both, fastdebug and debug, builds to keep + // Thread's fields layout the same. + // Note: CHECK_UNHANDLED_OOPS is defined only for fastdebug build. #ifdef CHECK_UNHANDLED_OOPS private: UnhandledOops* _unhandled_oops; +#elif defined(ASSERT) + private: + void* _unhandled_oops; +#endif +#ifdef CHECK_UNHANDLED_OOPS public: UnhandledOops* unhandled_oops() { return _unhandled_oops; } // Mark oop safe for gc. It may be stack allocated but won't move. @@ -383,12 +391,12 @@ } #endif // CHECK_UNHANDLED_OOPS + public: #ifndef PRODUCT bool skip_gcalot() { return _skip_gcalot; } void set_skip_gcalot(bool v) { _skip_gcalot = v; } #endif - public: // Installs a pending exception to be inserted later static void send_async_exception(oop thread_oop, oop java_throwable);