cmbuhler · XuechunHou · Feb 27, 2020 · Mar 26, 2020 · Mar 31, 2020 · Mar 31, 2020
diff --git a/buildenv/jenkins/variables/defaults.yml b/buildenv/jenkins/variables/defaults.yml
@@ -132,7 +132,7 @@ jitserver:
 # OpenSSL
 #========================================#
 openssl:
-  extra_getsource_options: '--openssl-version=1.1.1e'
+  extra_getsource_options: '--openssl-version=1.1.1f'
   extra_configure_options: '--with-openssl=fetched'
 #========================================#
 # OpenSSL Bundling

diff --git a/runtime/bcutil/jimageintf.c b/runtime/bcutil/jimageintf.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2017 IBM Corp. and others
+ * Copyright (c) 2015, 2020 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
@@ -320,7 +320,7 @@ jimageFindResource(J9JImageIntf *jimageIntf, UDATA handle, const char *moduleNam
 
 	if (jimageIntf->libJImageHandle) {
 		JImageFile *jimage = (JImageFile *)handle;
-		JImageLocationRef *locationRef = (JImageLocationRef *)j9mem_allocate_memory(sizeof(JImageLocationRef), J9MEM_CATEGORY_CLASSES);;
+		JImageLocationRef *locationRef = (JImageLocationRef *)j9mem_allocate_memory(sizeof(JImageLocationRef), J9MEM_CATEGORY_CLASSES);
 
 		if (NULL != locationRef) {
 			*locationRef = libJImageFindResource(jimage, moduleName, JIMAGE_VERSION_NUMBER, name, (jlong *)size);

diff --git a/runtime/bcutil/test/dyntest/misc_tests.cpp b/runtime/bcutil/test/dyntest/misc_tests.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2017 IBM Corp. and others
+ * Copyright (c) 2001, 2020 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
@@ -95,7 +95,7 @@ testGetNextStackMapFrame(J9PortLibrary *portLib, const char *classFileName)
 			UDATA *frame = NULL;
 			UDATA *prevFrame = NULL;
 			U_16 stackFrameIndex = 0;
-			U_16 stackFrameCount = GET_BE_U16((((U_8*)stackMap)+sizeof(U_32)));;
+			U_16 stackFrameCount = GET_BE_U16((((U_8 *)stackMap) + sizeof(U_32)));
 			/* get the first stack frame */
 			frame = getNextStackMapFrame(stackMap, frame);
 			while(stackFrameIndex < stackFrameCount) {

diff --git a/runtime/cmake/caches/aix_ppc-64.cmake b/runtime/cmake/caches/aix_ppc-64.cmake
@@ -29,6 +29,7 @@ set(J9VM_ENV_SHARED_LIBS_CALLEE_GLOBAL_TABLE_SETUP OFF CACHE BOOL "")
 set(J9VM_ENV_SHARED_LIBS_USE_GLOBAL_TABLE ON CACHE BOOL "")
 
 set(OMR_GC_TLH_PREFETCH_FTA OFF CACHE BOOL "")
+set(J9VM_JIT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")
 set(J9VM_PORT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")
 set(J9VM_MODULE_CODEGEN_PPC ON CACHE BOOL "")
 set(J9VM_GC_IDLE_HEAP_MANAGER OFF CACHE BOOL "")

diff --git a/runtime/cmake/caches/linux_ppc-64_le_gcc.cmake b/runtime/cmake/caches/linux_ppc-64_le_gcc.cmake
@@ -31,6 +31,7 @@ set(J9VM_ENV_USE_GCC ON CACHE BOOL "")
 
 set(OMR_GC_IDLE_HEAP_MANAGER OFF CACHE BOOL "")
 set(OMR_GC_TLH_PREFETCH_FTA OFF CACHE BOOL "")
+set(J9VM_JIT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")
 set(J9VM_PORT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")
 set(J9VM_MODULE_CODEGEN_PPC ON CACHE BOOL "")
 set(J9VM_MODULE_THRTRACE ON CACHE BOOL "")

diff --git a/runtime/cmake/platform.cmake b/runtime/cmake/platform.cmake
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2017, 2019 IBM Corp. and others
+# Copyright (c) 2017, 2020 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
@@ -20,57 +20,18 @@
 # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
 ################################################################################
 
+# Get OMR's platform config
 include(OmrPlatform)
-# Note: we need to inject WIN32 et al, as OMR no longer uses them
-if(OMR_OS_WINDOWS)
-    list(APPEND OMR_PLATFORM_DEFINITIONS
-        -DWIN32
-        -D_WIN32
-    )
-    if(OMR_ENV_DATA64)
-        list(APPEND OMR_PLATFORM_DEFINITIONS
-            -DWIN64
-            -D_WIN64
-        )
-    endif()
-endif()
-omr_platform_global_setup()
 
-if(OMR_TOOLCONFIG STREQUAL "gnu")
-    set(CMAKE_CXX_FLAGS " -g -fno-rtti -fno-exceptions ${CMAKE_CXX_FLAGS}")
-    set(CMAKE_C_FLAGS "-g ${CMAKE_C_FLAGS}")
-
-    # Raise an error if a shared library has any unresolved symbols.
-    # This flag isn't supported on OSX, but it has this behaviour by default
-    if(NOT OMR_OS_OSX)
-        set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,defs ${CMAKE_SHARED_LINKER_FLAGS}")
-    endif()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -O3 -fno-strict-aliasing")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -O3 -fno-strict-aliasing -fno-exceptions -fno-rtti -fno-threadsafe-statics")
-elseif(OMR_TOOLCONFIG STREQUAL "xlc")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -qalias=noansi")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -qalias=noansi -qnortti -qnoeh -qsuppress=1540-1087:1540-1088:1540-1090")
-    set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -qpic=large")
-endif()
+# Add our own platform specific config if we have any
+include("${CMAKE_CURRENT_LIST_DIR}/platform/os/${OMR_HOST_OS}.cmake" OPTIONAL)
+include("${CMAKE_CURRENT_LIST_DIR}/platform/arch/${OMR_HOST_ARCH}.cmake" OPTIONAL)
+include("${CMAKE_CURRENT_LIST_DIR}/platform/toolcfg/${OMR_TOOLCONFIG}.cmake" OPTIONAL)
 
-if(OMR_ARCH_POWER)
-    #TODO do based on toolchain stuff
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        add_definitions(-DOMR_ENV_GCC)
-    endif()
-    #TODO this is a hack
-    set(J9VM_JIT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")
-    set(J9VM_PORT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")
-endif()
 
-if(OMR_OS_AIX)
-    # Override cmake default of ".a" for shared libs on aix
-    set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
-endif()
+# Apply the combined platform config
+omr_platform_global_setup()
 
 if(NOT OMR_OS_OSX)
     add_definitions(-DIPv6_FUNCTION_SUPPORT)
 endif()
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1")
diff --git a/runtime/cmake/platform/arch/power.cmake b/runtime/cmake/platform/arch/power.cmake
@@ -0,0 +1,25 @@
+################################################################################
+# Copyright (c) 2020, 2020 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
+# distribution and is available at https://www.eclipse.org/legal/epl-2.0/
+# or the Apache License, Version 2.0 which accompanies this distribution and
+# is available at https://www.apache.org/licenses/LICENSE-2.0.
+#
+# This Source Code may also be made available under the following
+# Secondary Licenses when the conditions for such availability set
+# forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
+# General Public License, version 2 with the GNU Classpath
+# Exception [1] and GNU General Public License, version 2 with the
+# OpenJDK Assembly Exception [2].
+#
+# [1] https://www.gnu.org/software/classpath/license.html
+# [2] http://openjdk.java.net/legal/assembly-exception.html
+#
+# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+################################################################################
+
+if(OMR_TOOLCONFIG STREQUAL "GNU")
+    add_definitions(-DOMR_ENV_GCC)
+endif()
diff --git a/runtime/cmake/platform/os/aix.cmake b/runtime/cmake/platform/os/aix.cmake
@@ -0,0 +1,24 @@
+################################################################################
+# Copyright (c) 2020, 2020 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
+# distribution and is available at https://www.eclipse.org/legal/epl-2.0/
+# or the Apache License, Version 2.0 which accompanies this distribution and
+# is available at https://www.apache.org/licenses/LICENSE-2.0.
+#
+# This Source Code may also be made available under the following
+# Secondary Licenses when the conditions for such availability set
+# forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
+# General Public License, version 2 with the GNU Classpath
+# Exception [1] and GNU General Public License, version 2 with the
+# OpenJDK Assembly Exception [2].
+#
+# [1] https://www.gnu.org/software/classpath/license.html
+# [2] http://openjdk.java.net/legal/assembly-exception.html
+#
+# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+################################################################################
+
+# Override cmake default of ".a" for shared libs on aix
+set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
diff --git a/runtime/cmake/platform/os/win.cmake b/runtime/cmake/platform/os/win.cmake
@@ -0,0 +1,34 @@
+################################################################################
+# Copyright (c) 2020, 2020 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
+# distribution and is available at https://www.eclipse.org/legal/epl-2.0/
+# or the Apache License, Version 2.0 which accompanies this distribution and
+# is available at https://www.apache.org/licenses/LICENSE-2.0.
+#
+# This Source Code may also be made available under the following
+# Secondary Licenses when the conditions for such availability set
+# forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
+# General Public License, version 2 with the GNU Classpath
+# Exception [1] and GNU General Public License, version 2 with the
+# OpenJDK Assembly Exception [2].
+#
+# [1] https://www.gnu.org/software/classpath/license.html
+# [2] http://openjdk.java.net/legal/assembly-exception.html
+#
+# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+################################################################################
+
+# Note: we need to inject WIN32 et al, as OMR no longer uses them
+
+list(APPEND OMR_PLATFORM_DEFINITIONS
+    -DWIN32
+    -D_WIN32
+)
+if(OMR_ENV_DATA64)
+    list(APPEND OMR_PLATFORM_DEFINITIONS
+        -DWIN64
+        -D_WIN64
+    )
+endif()
diff --git a/runtime/cmake/platform/toolcfg/gnu.cmake b/runtime/cmake/platform/toolcfg/gnu.cmake
@@ -0,0 +1,39 @@
+################################################################################
+# Copyright (c) 2020, 2020 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
+# distribution and is available at https://www.eclipse.org/legal/epl-2.0/
+# or the Apache License, Version 2.0 which accompanies this distribution and
+# is available at https://www.apache.org/licenses/LICENSE-2.0.
+#
+# This Source Code may also be made available under the following
+# Secondary Licenses when the conditions for such availability set
+# forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
+# General Public License, version 2 with the GNU Classpath
+# Exception [1] and GNU General Public License, version 2 with the
+# OpenJDK Assembly Exception [2].
+#
+# [1] https://www.gnu.org/software/classpath/license.html
+# [2] http://openjdk.java.net/legal/assembly-exception.html
+#
+# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+################################################################################
+
+list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -O3 -g)
+
+# Add these
+list(APPEND OMR_PLATFORM_CXX_COMPILE_OPTIONS  -fno-threadsafe-statics)
+
+# OMR_PLATFORM_CXX_COMPILE_OPTIONS gets applied to the jit (which needs exceptions),
+# so we put these in the CMAKE_CXX_FLAGS instead
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
+
+# Raise an error if a shared library has any unresolved symbols.
+# This flag isn't supported on OSX, but it has this behaviour by default
+if(NOT OMR_OS_OSX)
+    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,defs ${CMAKE_SHARED_LINKER_FLAGS}")
+endif()
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1")
diff --git a/runtime/cmake/platform/toolcfg/xlc.cmake b/runtime/cmake/platform/toolcfg/xlc.cmake
@@ -0,0 +1,31 @@
+################################################################################
+# Copyright (c) 2020, 2020 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
+# distribution and is available at https://www.eclipse.org/legal/epl-2.0/
+# or the Apache License, Version 2.0 which accompanies this distribution and
+# is available at https://www.apache.org/licenses/LICENSE-2.0.
+#
+# This Source Code may also be made available under the following
+# Secondary Licenses when the conditions for such availability set
+# forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
+# General Public License, version 2 with the GNU Classpath
+# Exception [1] and GNU General Public License, version 2 with the
+# OpenJDK Assembly Exception [2].
+#
+# [1] https://www.gnu.org/software/classpath/license.html
+# [2] http://openjdk.java.net/legal/assembly-exception.html
+#
+# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+################################################################################
+
+list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -O3)
+
+list(APPEND OMR_PLATFORM_CXX_COMPILE_OPTIONS -qsuppress=1540-1087:1540-1088:1540-1090)
+
+# OMR_PLATFORM_CXX_COMPILE_OPTIONS gets applied to the jit (which needs exceptions),
+# so we put these in the CMAKE_CXX_FLAGS instead
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qnortti -qnoeh")
+
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -qpic=large")
diff --git a/runtime/compiler/aarch64/codegen/CallSnippet.cpp b/runtime/compiler/aarch64/codegen/CallSnippet.cpp
@@ -304,7 +304,7 @@ void
 TR_Debug::print(TR::FILE *pOutFile, TR::ARM64CallSnippet * snippet)
    {
    TR::Node            *callNode     = snippet->getNode();
-   TR::SymbolReference *glueRef      = _cg->getSymRef(snippet->getHelper());;
+   TR::SymbolReference *glueRef      = _cg->getSymRef(snippet->getHelper());
    TR::SymbolReference *methodSymRef = callNode->getSymbolReference();
    TR::MethodSymbol    *methodSymbol = methodSymRef->getSymbol()->castToMethodSymbol();
 

diff --git a/runtime/compiler/aarch64/runtime/ARM64RelocationTarget.cpp b/runtime/compiler/aarch64/runtime/ARM64RelocationTarget.cpp
@@ -35,7 +35,7 @@ void
 TR_ARM64RelocationTarget::storeCallTarget(uintptr_t callTarget, uint8_t *reloLocation)
    {
    // reloLocation points at the start of the call offset, so just store the uint8_t * at reloLocation
-   storePointer((uint8_t *)callTarget, reloLocation);;
+   storePointer((uint8_t *)callTarget, reloLocation);
    }
 
 uint32_t