Requested changes from eclipse-omr#7447

and eclipse-omr#7480 Signed-off-by: midronij <[email protected]>
midronij · Nov 28, 2024 · 7615492 · 7615492
1 parent a593021
commit 7615492
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/compiler/p/codegen/PPCTableOfConstants.cpp b/compiler/p/codegen/PPCTableOfConstants.cpp
@@ -494,12 +494,12 @@ int32_t TR_PPCTableOfConstants::lookUp(TR::SymbolReference *symRef, TR::CodeGene
       }
 
    TR::StaticSymbol *sym = symRef->getSymbol()->castToStaticSymbol();
-   intptr_t        addr = (intptr_t)sym->getStaticAddress();
-   int32_t          nlen, tindex;
-   int8_t           local_buffer[1024];
-   int8_t          *name = local_buffer;
-   bool             isAddr = false;
-   intptr_t        myTag=0;
+   intptr_t          addr = (intptr_t)sym->getStaticAddress();
+   int32_t           nlen, tindex;
+   int8_t            local_buffer[1024];
+   int8_t           *name = local_buffer;
+   bool              isAddr = false;
+   intptr_t          myTag = 0;
 
    if (!symRef->isUnresolved() || symRef->getCPIndex()<0 || sym->isAddressOfClassObject() || sym->isConstObjectRef() || sym->isConst())
       {

diff --git a/compiler/runtime/Runtime.cpp b/compiler/runtime/Runtime.cpp
@@ -23,7 +23,7 @@
 
 TR_RuntimeHelperTable runtimeHelpers;
 
-#if (defined(__IBMCPP__) || defined(__IBMC__) || defined(__open_xl__) && !defined(MVS)) && !defined(LINUXPPC64)
+#if (defined(__IBMCPP__) || defined(__IBMC__) && !defined(__MVS__) || defined(__open_xl__)) && !defined(LINUXPPC64)
  #if defined(AIXPPC)
   #define JIT_HELPER(x) extern "C" void *x
  #else

diff --git a/port/CMakeLists.txt b/port/CMakeLists.txt
@@ -278,6 +278,10 @@ if(OMR_OS_WINDOWS)
 endif()
 
 if(OMR_OS_AIX)
+	if(CMAKE_C_COMPILER_IS_OPENXL)
+		list(APPEND OMR_C_WARNINGS_AS_ERROR_FLAG -Wno-implicit-function-declaration)
+		target_compile_options(omrport_obj PUBLIC -Wno-implicit-function-declaration)
+	endif()
 	#ifdef I5_VERSION
 		#ifeq (1,$(OMR_ENV_DATA64))
 			#vpath % $(PORT_SRCDIR)iseries64

diff --git a/port/unix/omrsignal.c b/port/unix/omrsignal.c
@@ -406,7 +406,6 @@ omrsig_protect(struct OMRPortLibrary *portLibrary, omrsig_protected_fn fn, void
 		 */
 		OMRCurrentSignal *currentSignal = omrthread_tls_get(thisThread, tlsKeyCurrentSignal);
 
-		#if !defined(__open_xl__)
 			/* setjmp/longjmp does not clear the mask setup by the OS when it delivers the signal. User sigsetjmp/siglongjmp(buf, 1) instead */
 			if (0 != sigsetjmp(thisRecord.returnBuf, 1)) {
 				/* the handler had long jumped back here -- reset the signal handler stack and currentSignal and return */
@@ -416,7 +415,6 @@ omrsig_protect(struct OMRPortLibrary *portLibrary, omrsig_protected_fn fn, void
 				Trc_PRT_signal_omrsignal_sig_protect_Exit_long_jumped_back_to_omrsig_protect(fn, fn_arg, handler, handler_arg, flags);
 				return OMRPORT_SIG_EXCEPTION_OCCURRED;
 			}
-		#endif
 	}
 
 	if (0 != omrthread_tls_set(thisThread, tlsKey, &thisRecord)) {