From f516c6b70e8bfb18681c6a7c548ccb47ec06b0d3 Mon Sep 17 00:00:00 2001
From: Irwin D'Souza <dsouzai.gh@gmail.com>
Date: Mon, 12 Sep 2022 17:21:40 -0400
Subject: [PATCH 1/2] Update build instructions

The current build instructions results in a build break in the gc
component. This PR updates the build instructions to ensure that
OMR_GC_MODRON_SCAVENGER is enabled at build time.

Signed-off-by: Irwin D'Souza <dsouzai.gh@gmail.com>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2037f5b0754..00f8af9a035 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2016, 2021 IBM Corp. and others
+Copyright (c) 2016, 2022 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
@@ -145,7 +145,7 @@ source tree. For more detailed instructions please read [BuildingWithCMake.md](d
     cd build
 
     # Generate the build system using cmake
-    cmake ..
+    cmake -Wdev -C ../cmake/caches/Travis.cmake ..
 
     # Build (you can optionally compile in parallel by adding -j<N> to the make command)
     make

From d62849e5fa897bd1747ea517c3927c9488fdcf73 Mon Sep 17 00:00:00 2001
From: Irwin D'Souza <dsouzai.gh@gmail.com>
Date: Mon, 12 Sep 2022 17:22:35 -0400
Subject: [PATCH 2/2] Fix _FORTIFY_SOURCE warning treated as error

This commit adds -O3 to the CMakeLists.txt of the omrtrace component to
prevent the following warning treated as an error:

warning _FORTIFY_SOURCE requires compiling with optimization (-O)

Signed-off-by: Irwin D'Souza <dsouzai.gh@gmail.com>
---
 omrtrace/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/omrtrace/CMakeLists.txt b/omrtrace/CMakeLists.txt
index 63764710990..62999856e0a 100644
--- a/omrtrace/CMakeLists.txt
+++ b/omrtrace/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2017, 2020 IBM Corp. and others
+# Copyright (c) 2017, 2022 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
@@ -36,6 +36,9 @@ omr_add_library(omrtrace STATIC
 # to implement variable length structs
 if (OMR_STRNCPY_FORTIFY_OPTIONS)
 	target_compile_options(omrtrace PRIVATE ${OMR_STRNCPY_FORTIFY_OPTIONS})
+	if (OMR_OS_LINUX)
+		target_compile_options(omrtrace PRIVATE -O3)
+	endif()
 endif()
 
 target_link_libraries(omrtrace