Update compiler options for migrating z/OS compiles to new levels

* runtimes/automation#293

Signed-off-by: Joe deKoning <joe_dekoning@ca.ibm.com>

Author: jdekonin

buildspecs/zos_390-64.spec

@@ -57,7 +57,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<property name="graph_req.aux0" value=""/>
 		<property name="graph_req.aux1" value=""/>
 		<property name="graph_req.build" value="{$common.req.build.java9$}"/>
-		<property name="graph_req.build2" value="{$common.req.build.java8$}"/>
+		<property name="graph_req.build2" value="{$common.req.build.java8.8.70+$}"/>
 		<property name="graph_req.machine" value="{$machine_mapping.zos$}"/>
 		<property name="graph_req.machine.test" value="{$spec.property.graph_req.machine$}"/>
 		<property name="graph_req.os" value="{$machine_mapping.zos$}"/>

buildspecs/zos_390-64_cmprssptrs.spec

@@ -58,7 +58,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<property name="graph_req.aux0" value=""/>
 		<property name="graph_req.aux1" value=""/>
 		<property name="graph_req.build" value="{$common.req.build.java9$}"/>
-		<property name="graph_req.build2" value="{$common.req.build.java8$}"/>
+		<property name="graph_req.build2" value="{$common.req.build.java8.8.70+$}"/>
 		<property name="graph_req.machine" value="{$machine_mapping.zos$}"/>
 		<property name="graph_req.machine.test" value="{$spec.property.graph_req.machine$}"/>
 		<property name="graph_req.os" value="{$machine_mapping.zos$}"/>

buildspecs/zos_390.spec

@@ -57,7 +57,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<property name="graph_req.aux0" value=""/>
 		<property name="graph_req.aux1" value=""/>
 		<property name="graph_req.build" value="{$common.req.build.java9$}"/>
-		<property name="graph_req.build2" value="{$common.req.build.java8$}"/>
+		<property name="graph_req.build2" value="{$common.req.build.java8.8.70+$}"/>
 		<property name="graph_req.machine" value="{$machine_mapping.zos$}"/>
 		<property name="graph_req.machine.test" value="{$spec.property.graph_req.machine$}"/>
 		<property name="graph_req.os" value="{$machine_mapping.zos$}"/>

runtime/cmake/caches/zos_390-64.cmake

@@ -32,9 +32,9 @@ set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> <INCLUDES> -o <
 set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> <INCLUDES> -o <OBJECT> -c <SOURCE>" CACHE STRING "")
 
 if(JAVA_SPEC_VERSION EQUAL 8)
-	set(OMR_ZOS_COMPILE_TARGET "zOSV1R13" CACHE STRING "")
-	set(OMR_ZOS_COMPILE_ARCHITECTURE 7 CACHE STRING "")
-	set(OMR_ZOS_COMPILE_TUNE 10 CACHE STRING "")
+	set(OMR_ZOS_COMPILE_TARGET "zOSV2R2" CACHE STRING "")
+	set(OMR_ZOS_COMPILE_ARCHITECTURE 10 CACHE STRING "")
+	set(OMR_ZOS_COMPILE_TUNE 13 CACHE STRING "")
 else()
 	set(OMR_ZOS_COMPILE_TARGET "zOSV2R3" CACHE STRING "")
 	set(OMR_ZOS_COMPILE_ARCHITECTURE 10 CACHE STRING "")

runtime/compiler/build/toolcfg/zos-xlc/common.mk

@@ -33,9 +33,9 @@ EXESUFF=
 LIBPREFIX=lib
 DEPSUFF=.depend.mk
 ifeq ($(VERSION_MAJOR),8)
-    ARCHLEVEL=8
-    TGTLEVEL=zOSV1R13
-    TUNELEVEL?=10
+    ARCHLEVEL=10
+    TGTLEVEL=zOSV2R2
+    TUNELEVEL?=13
 else
     ARCHLEVEL=10
     TGTLEVEL=zOSV2R3

runtime/gc_glue_java/configure_includes/configure_zos_390.mk.ftl

@@ -44,10 +44,10 @@ ifeq (zos_390-64_cmprssptrs, $(SPEC))
 		OMR_GC_POINTER_MODE=compressed
 ifeq (8,$(VERSION_MAJOR))
 	CONFIGURE_ARGS += \
-		OMR_ZOS_COMPILE_ARCHITECTURE=8 \
-		OMR_ZOS_COMPILE_TUNE=10 \
-		OMR_ZOS_COMPILE_TARGET=zOSV1R13 \
-		OMR_ZOS_LINK_COMPAT=ZOSV1R13
+		OMR_ZOS_COMPILE_ARCHITECTURE=10 \
+		OMR_ZOS_COMPILE_TUNE=13 \
+		OMR_ZOS_COMPILE_TARGET=zOSV2R2 \
+		OMR_ZOS_LINK_COMPAT=ZOSV2R2
 else
 	CONFIGURE_ARGS += \
 		OMR_ZOS_COMPILE_ARCHITECTURE=10 \
@@ -68,10 +68,10 @@ ifeq (zos_390-64, $(SPEC))
 		OMR_GC_POINTER_MODE=full
 ifeq (8,$(VERSION_MAJOR))
 	CONFIGURE_ARGS += \
-		OMR_ZOS_COMPILE_ARCHITECTURE=8 \
-		OMR_ZOS_COMPILE_TUNE=10 \
-		OMR_ZOS_COMPILE_TARGET=zOSV1R13 \
-		OMR_ZOS_LINK_COMPAT=ZOSV1R13
+		OMR_ZOS_COMPILE_ARCHITECTURE=10 \
+		OMR_ZOS_COMPILE_TUNE=13 \
+		OMR_ZOS_COMPILE_TARGET=zOSV2R2 \
+		OMR_ZOS_LINK_COMPAT=ZOSV2R2
 else
 	CONFIGURE_ARGS += \
 		OMR_ZOS_COMPILE_ARCHITECTURE=10 \
@@ -90,10 +90,10 @@ ifeq (zos_390, $(SPEC))
 		OMR_GC_POINTER_MODE=full
 ifeq (8,$(VERSION_MAJOR))
 	CONFIGURE_ARGS += \
-		OMR_ZOS_COMPILE_ARCHITECTURE=8 \
-		OMR_ZOS_COMPILE_TUNE=10 \
-		OMR_ZOS_COMPILE_TARGET=zOSV1R13 \
-		OMR_ZOS_LINK_COMPAT=ZOSV1R13
+		OMR_ZOS_COMPILE_ARCHITECTURE=10 \
+		OMR_ZOS_COMPILE_TUNE=13 \
+		OMR_ZOS_COMPILE_TARGET=zOSV2R2 \
+		OMR_ZOS_LINK_COMPAT=ZOSV2R2
 endif
 endif
 

runtime/makelib/targets.mk.zos.inc.ftl

@@ -54,8 +54,8 @@ $(UMA_EXETARGET) : $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES)
 
 ifndef UMA_DO_NOT_OPTIMIZE_CCODE
   ifeq ($(VERSION_MAJOR),8)
-    UMA_OPTIMIZATION_FLAGS = -O3 -Wc,"ARCH(8)" -Wc,"TUNE(10)"
-    UMA_OPTIMIZATION_LINKER_FLAGS = -Wl,compat=ZOSV1R13
+    UMA_OPTIMIZATION_FLAGS = -O3 -Wc,"ARCH(10)" -Wc,"TUNE(13)"
+    UMA_OPTIMIZATION_LINKER_FLAGS = -Wl,compat=ZOSV2R2
   else
     UMA_OPTIMIZATION_FLAGS = -O3 -Wc,"ARCH(10)" -Wc,"TUNE(12)"
     UMA_OPTIMIZATION_LINKER_FLAGS = -Wl,compat=ZOSV2R3
@@ -75,7 +75,7 @@ UMA_ZOS_FLAGS += -I$(OMR_DIR)/util/a2e/headers $(UMA_OPTIMIZATION_FLAGS) $(UMA_O
 	-Wc,"convlit(ISO8859-1),xplink,rostring,FLOAT(IEEE,FOLD,AFP),enum(4)" -Wa,goff -Wc,NOANSIALIAS -Wc,"inline(auto,noreport,600,5000)"
 UMA_ZOS_FLAGS += -Wc,"SERVICE(j${uma.buildinfo.build_date})"
 ifeq ($(VERSION_MAJOR),8)
-  UMA_ZOS_FLAGS += -Wc,"TARGET(zOSV1R13)"
+  UMA_ZOS_FLAGS += -Wc,"TARGET(zOSV2R2)"
 else
   UMA_ZOS_FLAGS += -Wc,"TARGET(zOSV2R3)"
 endif