CMake: Remove ASM-ZOS

zos specific asm dialect serves no purpose. Signed-off-by: Devin Nakamura <devinn@ca.ibm.com>
eclipse · Apr 1, 2021 · 4f64d57 · 4f64d57
1 parent 5839d6e
commit 4f64d57
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 88 deletions.
diff --git a/cmake/modules/CMakeASM-ZOSInformation.cmake b/cmake/modules/CMakeASM-ZOSInformation.cmake
diff --git a/cmake/modules/CMakeDetermineASM-ZOSCompiler.cmake b/cmake/modules/CMakeDetermineASM-ZOSCompiler.cmake
diff --git a/cmake/modules/CMakeTestASM-ZOSCompiler.cmake b/cmake/modules/CMakeTestASM-ZOSCompiler.cmake
diff --git a/cmake/modules/OmrPlatform.cmake b/cmake/modules/OmrPlatform.cmake
@@ -30,9 +30,7 @@ include(OmrUtility)
 
 omr_detect_system_information()
 
-if(NOT OMR_OS_ZOS)
-	enable_language(ASM)
-endif()
+enable_language(ASM)
 
 # pick up OS info
 include(platform/os/${OMR_HOST_OS})

diff --git a/cmake/modules/platform/os/zos.cmake b/cmake/modules/platform/os/zos.cmake
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2017, 2020 IBM Corp. and others
+# Copyright (c) 2017, 2021 IBM Corp. and others
 #
 # This program and the accompanying materials are made available under
 # the terms of the Eclipse Public License 2.0 which accompanies this
@@ -52,11 +52,6 @@ install(TARGETS omr_ascii omr_ebcdic
 )
 
 macro(omr_os_global_setup)
-	# TODO: Move this out and after platform config.
-	enable_language(ASM-ZOS)
-
-	omr_append_flags(CMAKE_ASM-ZOS_FLAGS ${OMR_PLATFORM_COMPILE_OPTIONS})
-
 	# TODO below is a chunk of the original makefile which still needs to be ported
 	# # This is the first option applied to the C++ linking command.
 	# # It is not applied to the C linking command.