Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jdekonin wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −28
Draft

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildspecs/zos_390-64.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$}"/>
Expand Down
2 changes: 1 addition & 1 deletion buildspecs/zos_390-64_cmprssptrs.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$}"/>
Expand Down
2 changes: 1 addition & 1 deletion buildspecs/zos_390.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$}"/>
Expand Down
6 changes: 3 additions & 3 deletions runtime/cmake/caches/zos_390-64.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
6 changes: 3 additions & 3 deletions runtime/compiler/build/toolcfg/zos-xlc/common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ EXESUFF=
LIBPREFIX=lib
DEPSUFF=.depend.mk
ifeq ($(VERSION_MAJOR),8)
ARCHLEVEL=8
TGTLEVEL=zOSV1R13
TUNELEVEL?=10
ARCHLEVEL=10
TGTLEVEL=zOSV2R3
TUNELEVEL?=13
else
ARCHLEVEL=10
TGTLEVEL=zOSV2R3
Expand Down
24 changes: 12 additions & 12 deletions runtime/gc_glue_java/configure_includes/configure_zos_390.mk.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=zOSV2R3 \
OMR_ZOS_LINK_COMPAT=ZOSV2R3
else
CONFIGURE_ARGS += \
OMR_ZOS_COMPILE_ARCHITECTURE=10 \
Expand All @@ -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=zOSV2R3 \
OMR_ZOS_LINK_COMPAT=ZOSV2R3
else
CONFIGURE_ARGS += \
OMR_ZOS_COMPILE_ARCHITECTURE=10 \
Expand All @@ -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=zOSV2R3 \
OMR_ZOS_LINK_COMPAT=ZOSV2R3
endif
endif

Expand Down
10 changes: 3 additions & 7 deletions runtime/makelib/targets.mk.zos.inc.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=ZOSV2R3
else
UMA_OPTIMIZATION_FLAGS = -O3 -Wc,"ARCH(10)" -Wc,"TUNE(12)"
UMA_OPTIMIZATION_LINKER_FLAGS = -Wl,compat=ZOSV2R3
Expand All @@ -74,11 +74,7 @@ UMA_ZOS_FLAGS += -DJ9ZOS390 -DLONGLONG -DJ9VM_TIERED_CODE_CACHE -D_ALL_SOURCE -D
UMA_ZOS_FLAGS += -I$(OMR_DIR)/util/a2e/headers $(UMA_OPTIMIZATION_FLAGS) $(UMA_OPTIMIZATION_LINKER_FLAGS) \
-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)"
else
UMA_ZOS_FLAGS += -Wc,"TARGET(zOSV2R3)"
endif
UMA_ZOS_FLAGS += -Wc,"TARGET(zOSV2R3)"
UMA_ZOS_FLAGS += -Wc,list,offset
ifdef j9vm_env_data64
UMA_ZOS_FLAGS += -DJ9ZOS39064 -Wc,lp64 -Wa,"SYSPARM(BIT64)"
Expand Down