Add warnings as error and enhanced warnings flags for MASM and NASM

eclipse · Jun 15, 2021 · b3689e9 · b3689e9
1 parent 47f3045
commit b3689e9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/cmake/modules/OmrTargetSupport.cmake b/cmake/modules/OmrTargetSupport.cmake
@@ -79,6 +79,8 @@ function(omr_add_library name)
 				PRIVATE
 					$<$<COMPILE_LANGUAGE:C>:${OMR_C_WARNINGS_AS_ERROR_FLAG}>
 					$<$<COMPILE_LANGUAGE:CXX>:${OMR_CXX_WARNINGS_AS_ERROR_FLAG}>
+					$<$<COMPILE_LANGUAGE:MASM>:${OMR_MASM_WARNINGS_AS_ERROR_FLAG}>
+					$<$<COMPILE_LANGUAGE:NASM>:${OMR_NASM_WARNINGS_AS_ERROR_FLAG}>
 			)
 		endif()
 
@@ -87,6 +89,8 @@ function(omr_add_library name)
 				PRIVATE
 					$<$<COMPILE_LANGUAGE:C>:${OMR_C_ENHANCED_WARNINGS_FLAG}>
 					$<$<COMPILE_LANGUAGE:CXX>:${OMR_CXX_ENHANCED_WARNINGS_FLAG}>
+					$<$<COMPILE_LANGUAGE:MASM>:${OMR_MASM_ENHANCED_WARNINGS_FLAG}>
+					$<$<COMPILE_LANGUAGE:NASM>:${OMR_NASM_ENHANCED_WARNINGS_FLAG}>
 			)
 		endif()
 	endif()
@@ -119,6 +123,8 @@ function(omr_add_executable name)
 				PRIVATE
 					$<$<COMPILE_LANGUAGE:C>:${OMR_C_WARNINGS_AS_ERROR_FLAG}>
 					$<$<COMPILE_LANGUAGE:CXX>:${OMR_CXX_WARNINGS_AS_ERROR_FLAG}>
+					$<$<COMPILE_LANGUAGE:MASM>:${OMR_MASM_WARNINGS_AS_ERROR_FLAG}>
+					$<$<COMPILE_LANGUAGE:NASM>:${OMR_NASM_WARNINGS_AS_ERROR_FLAG}>
 			)
 		endif()
 
@@ -127,6 +133,8 @@ function(omr_add_executable name)
 				PRIVATE
 					$<$<COMPILE_LANGUAGE:C>:${OMR_C_ENHANCED_WARNINGS_FLAG}>
 					$<$<COMPILE_LANGUAGE:CXX>:${OMR_CXX_ENHANCED_WARNINGS_FLAG}>
+					$<$<COMPILE_LANGUAGE:MASM>:${OMR_MASM_ENHANCED_WARNINGS_FLAG}>
+					$<$<COMPILE_LANGUAGE:NASM>:${OMR_NASM_ENHANCED_WARNINGS_FLAG}>
 			)
 		endif()
 	endif()

diff --git a/cmake/modules/platform/toolcfg/gnu.cmake b/cmake/modules/platform/toolcfg/gnu.cmake
@@ -21,9 +21,13 @@
 
 set(OMR_C_WARNINGS_AS_ERROR_FLAG -Werror)
 set(OMR_CXX_WARNINGS_AS_ERROR_FLAG -Werror)
+set(OMR_MASM_WARNINGS_AS_ERROR_FLAG -Werror)
+set(OMR_NASM_WARNINGS_AS_ERROR_FLAG -Werror)
 
 set(OMR_C_ENHANCED_WARNINGS_FLAG -Wall)
 set(OMR_CXX_ENHANCED_WARNINGS_FLAG -Wall)
+set(OMR_MASM_ENHANCED_WARNINGS_FLAG -Wall)
+set(OMR_NASM_ENHANCED_WARNINGS_FLAG -Wall)
 
 # disable builtin strncpy buffer length check for components that use variable length
 # array fields at the end of structs

diff --git a/cmake/modules/platform/toolcfg/msvc.cmake b/cmake/modules/platform/toolcfg/msvc.cmake
@@ -23,9 +23,13 @@ include(OmrUtility)
 
 set(OMR_C_WARNINGS_AS_ERROR_FLAG /WX)
 set(OMR_CXX_WARNINGS_AS_ERROR_FLAG /WX)
+set(OMR_MASM_WARNINGS_AS_ERROR_FLAG /WX)
+set(OMR_NASM_WARNINGS_AS_ERROR_FLAG -Werror)
 
 set(OMR_C_ENHANCED_WARNINGS_FLAG /W3)
 set(OMR_CXX_ENHANCED_WARNINGS_FLAG /W3)
+set(OMR_MASM_ENHANCED_WARNINGS_FLAG /W3)
+set(OMR_NASM_ENHANCED_WARNINGS_FLAG -Wall)
 
 list(APPEND OMR_PLATFORM_COMPILE_OPTIONS
 	/GR-    # Disable RTTI