Additional changes for z/OS build

keithc-ca · May 4, 2018 · 61be8d8 · 61be8d8
1 parent 724acb5
commit 61be8d8
Show file tree

Hide file tree

Showing 22 changed files with 1,375 additions and 43 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -22,3 +22,4 @@ make/data/lsrdata/language-subtag-registry.txt git-encoding=iso8859-1 working-tr
 *.png git-encoding=BINARY working-tree-encoding=BINARY
 *.gif git-encoding=BINARY working-tree-encoding=BINARY
 *.zip git-encoding=BINARY working-tree-encoding=BINARY
+*.icu git-encoding=BINARY working-tree-encoding=BINARY
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
@@ -144,6 +144,7 @@ endif
 	generate-j9jcl-sources \
 	run-preprocessors-j9 \
 	stage-j9 \
+	test-stage-j9 \
 	stage-openj9-tools \
 	build-openj9-tools \
 	#
@@ -320,7 +321,8 @@ build-openj9-tools : stage-openj9-tools
 		BOOT_JDK=$(BOOT_JDK) JAVA_HOME=$(BOOT_JDK) lib/jpp.jar \
 	)
 
-stage-j9 : stage-openj9-tools
+STAGE_J9_DONEFILE := $(OUTPUTDIR)/vm/stage-j9.done
+$(STAGE_J9_DONEFILE): 
 	@$(ECHO) Staging OpenJ9 debugtools in $(OUTPUTDIR)/vm
 	$(call openj9_copy_tree,$(OUTPUTDIR)/vm/debugtools,$(OPENJ9_TOPDIR)/debugtools)
 
@@ -333,6 +335,14 @@ stage-j9 : stage-openj9-tools
 	@$(ECHO) Staging OpenJ9 OMR in $(OUTPUTDIR)/vm
 	$(call openj9_copy_tree,$(OUTPUTDIR)/vm/omr,$(OPENJ9OMR_TOPDIR))
 
+	@$(TOUCH) $@
+
+stage-j9 : \
+		$(OPENJ9_STAGED_BUILDSPECS) \
+		stage-openj9-tools \
+		$(STAGE_J9_DONEFILE) 
+	@$(ECHO) YYYYYYYY Staging OpenJ9 debugtools in $(OUTPUTDIR)/vm
+
 OPENJ9_VERSION_VARS := \
 	COMPILER_VERSION_STRING \
 	J9JDK_EXT_NAME \

diff --git a/closed/src/java.base/share/classes/com/ibm/jvm/io/ConsoleInputStream.java b/closed/src/java.base/share/classes/com/ibm/jvm/io/ConsoleInputStream.java