Merge pull request #18382 from dylanjtuttle/enableWAEaarch64

Enable warnings as errors on Aarch64 in the JIT
eclipse-openj9 · Nov 2, 2023 · 1217913 · 1217913
2 parents 42ff412 + 4fa5446
commit 1217913
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/buildenv/jenkins/variables/defaults.yml b/buildenv/jenkins/variables/defaults.yml
@@ -401,7 +401,7 @@ aarch64_mac:
     8: 'macosx-aarch64-normal-server-release'
     11: 'macosx-aarch64-normal-server-release'
   extra_configure_options:
-    all: '--disable-warnings-as-errors --with-noncompressedrefs'
+    all: '--with-noncompressedrefs'
   openjdk_reference_repo: '/Users/jenkins/openjdk_cache'
   node_labels:
     build: 'ci.role.build && hw.arch.aarch64 && sw.os.mac'

diff --git a/runtime/compiler/CMakeLists.txt b/runtime/compiler/CMakeLists.txt
@@ -328,7 +328,7 @@ omr_stringify(J9_CXXFLAGS_STR ${J9_SHAREDFLAGS} ${J9_CXXFLAGS})
 set(CMAKE_CXX_FLAGS "${J9_CXXFLAGS_STR}")
 set(CMAKE_C_FLAGS "${J9_CFLAGS_STR}")
 
-if(OMR_ARCH_X86 OR OMR_ARCH_S390)
+if(OMR_ARCH_X86 OR OMR_ARCH_S390 OR OMR_ARCH_AARCH64)
 	set(OMR_WARNINGS_AS_ERRORS ON)
 	set(OMR_ENHANCED_WARNINGS OFF)
 else()