Mercurial > hg > openjdk > jdk9 > hotspot
changeset 12287:132a72c78207 jdk-9+147
Merge
author | lana |
---|---|
date | Wed, 23 Nov 2016 19:15:01 +0000 |
parents | 1ae8e92ed3e4 (current diff) fe25e12bd841 (diff) |
children | fcfe55dc547c 8e63061ea915 |
files | |
diffstat | 3 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/gensrc/GensrcJvmti.gmk Wed Nov 23 16:16:34 2016 +0000 +++ b/make/gensrc/GensrcJvmti.gmk Wed Nov 23 19:15:01 2016 +0000 @@ -130,8 +130,6 @@ TARGETS += $(JVMTI_OUTPUTDIR)/jvmtiEnvRecommended.cpp ################################################################################ -# Disable copy of jvmti.h from hotspot until this has been cleared up. The file -# is currently being copied from the jdk repository. See JDK-8167078. # Copy jvmti.h to include dir # The file is the same regardless of jvm variant. Only let one do the copy.
--- a/make/lib/CompileLibjsig.gmk Wed Nov 23 16:16:34 2016 +0000 +++ b/make/lib/CompileLibjsig.gmk Wed Nov 23 19:15:01 2016 +0000 @@ -129,7 +129,7 @@ ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true) $(LIB_OUTPUTDIR)/$1/$(LIBRARY_PREFIX)jsig.diz: \ $(LIB_OUTPUTDIR)/$1/$(LIBRARY_PREFIX)jsig$(DEBUG_INFO_SUFFIX) - $(CD) $$(@D) && $(ZIP) -q -y $$@ $$(basename $$(@F))$(DEBUG_INFO_SUFFIX) + $(CD) $$(@D) && $(ZIPEXE) -q -y $$@ $$(basename $$(@F))$(DEBUG_INFO_SUFFIX) TARGETS += $(LIB_OUTPUTDIR)/$1/$(LIBRARY_PREFIX)jsig.diz endif
--- a/test/Makefile Wed Nov 23 16:16:34 2016 +0000 +++ b/test/Makefile Wed Nov 23 19:15:01 2016 +0000 @@ -50,7 +50,7 @@ UNAME = uname UNIQ = uniq WC = wc -ZIP = zip +ZIPEXE = zip define NEWLINE @@ -213,7 +213,7 @@ ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \ && $(CD) $(ABS_TEST_OUTPUT_DIR) \ && $(CHMOD) -R a+r . \ - && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . ) + && $(ZIPEXE) -q -r $(ARCHIVE_BUNDLE) . ) # important results files SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport/text/summary.txt") @@ -327,7 +327,7 @@ else ifeq ($(shell expr $(CONCURRENCY) \> 12), 1) CONCURRENCY := 12 endif -else +else CONCURRENCY := 1 endif JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY)